Skip to content

Commit 4ff8d40

Browse files
committed
Fix: formatting
1 parent 4cfc0c6 commit 4ff8d40

6 files changed

Lines changed: 2 additions & 23 deletions

File tree

api/src/main/java/io/grpc/MetricRecorder.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
*/
2727
@Internal
2828
public interface MetricRecorder {
29-
30-
3129
/**
3230
* Adds a value for a double-precision counter metric instrument.
3331
*
@@ -178,6 +176,4 @@ interface Registration extends AutoCloseable {
178176
@Override
179177
void close();
180178
}
181-
182-
183179
}

api/src/main/java/io/grpc/Server.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,4 @@ public List<ServerServiceDefinition> getMutableServices() {
178178
* @since 1.0.0
179179
*/
180180
public abstract void awaitTermination() throws InterruptedException;
181-
182181
}

core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ public String getPolicyName() {
303303
private ArgumentCaptor<ClientStreamListener> streamListenerCaptor =
304304
ArgumentCaptor.forClass(ClientStreamListener.class);
305305

306-
307306
private void createChannel(ClientInterceptor... interceptors) {
308307
createChannel(false, interceptors);
309308
}

core/src/test/java/io/grpc/internal/MetricRecorderImplTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package io.grpc.internal;
1818

19-
2019
import static org.junit.Assert.assertThrows;
2120
import static org.mockito.ArgumentMatchers.any;
2221
import static org.mockito.ArgumentMatchers.anyList;
@@ -327,6 +326,4 @@ public void recordLongGaugeMismatchedOptionalLabelValues() {
327326
callbackCaptor.getValue().run();
328327
registration.close();
329328
}
330-
331-
332329
}

xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3009,7 +3009,7 @@ public void start_passesChannelConfiguratorToClientPoolFactory() {
30093009
metricRecorder,
30103010
args);
30113011

3012-
// Start the resolver (this triggers the factory call)
3012+
// Start the resolver
30133013
resolver.start(mockListener);
30143014

30153015
assertThat(xdsClientPoolFactory.savedChannelConfigurator).isSameInstanceAs(channelConfigurator);

xds/src/test/java/io/grpc/xds/XdsServerTestHelper.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,7 @@ public XdsClient returnObject(Object object) {
187187
public ObjectPool<XdsClient> getOrCreate(
188188
String target, BootstrapInfo bootstrapInfo, MetricRecorder metricRecorder,
189189
ChannelConfigurator channelConfigurator) {
190-
this.savedBootstrapInfo = bootstrapInfo;
191-
return new ObjectPool<XdsClient>() {
192-
@Override
193-
public XdsClient getObject() {
194-
return xdsClient;
195-
}
196-
197-
@Override
198-
public XdsClient returnObject(Object object) {
199-
xdsClient.shutdown();
200-
return null;
201-
}
202-
};
190+
return getOrCreate(target, bootstrapInfo, metricRecorder);
203191
}
204192

205193
@Override

0 commit comments

Comments
 (0)