grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core/stub: fix lint warnings

This commit is contained in:
ZHANG Dapeng 2018-05-02 10:37:32 -07:00 committed by GitHub
parent 3a11a1f8b2
commit d50c191aca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/grpc/internal/ClientCallImpl.java
View File

@ -81,7 +81,7 @@ final class ClientCallImpl<ReqT, RespT> extends ClientCall<ReqT, RespT> {
private boolean halfCloseCalled; private boolean halfCloseCalled;
private final ClientTransportProvider clientTransportProvider; private final ClientTransportProvider clientTransportProvider;
private final CancellationListener cancellationListener = new ContextCancellationListener(); private final CancellationListener cancellationListener = new ContextCancellationListener();
private ScheduledExecutorService deadlineCancellationExecutor; private final ScheduledExecutorService deadlineCancellationExecutor;
private boolean fullStreamDecompression; private boolean fullStreamDecompression;
private DecompressorRegistry decompressorRegistry = DecompressorRegistry.getDefaultInstance(); private DecompressorRegistry decompressorRegistry = DecompressorRegistry.getDefaultInstance();
private CompressorRegistry compressorRegistry = CompressorRegistry.getDefaultInstance(); private CompressorRegistry compressorRegistry = CompressorRegistry.getDefaultInstance();

14
core/src/main/java/io/grpc/internal/ServiceConfigUtil.java
View File

@ -278,20 +278,6 @@ public final class ServiceConfigUtil {
String.format("value %s for key %s in %s is not object", value, key, obj)); String.format("value %s for key %s in %s is not object", value, key, obj));
} }
/**
* Gets an object from a list of objects for the given index.
*/
@SuppressWarnings("unchecked")
private static Map<String, Object> getObject(List<Object> list, int i) {
assert i >= 0 && i < list.size();
Object value = checkNotNull(list.get(i), "idx %s in %s is null", i, list);
if (value instanceof Map) {
return (Map<String, Object>) value;
}
throw new ClassCastException(
String.format("value %s for idx %d in %s is not a map", value, i, list));
}
/** /**
* Gets a double from an object for the given key. * Gets a double from an object for the given key.
*/ */

10
core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java
View File

@ -464,7 +464,7 @@ public class RoundRobinLoadBalancerTest {
verify(mockArgs, atLeast(4)).getHeaders(); verify(mockArgs, atLeast(4)).getHeaders();
assertNotNull(loadBalancer.getStickinessMapForTest()); assertNotNull(loadBalancer.getStickinessMapForTest());
assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(1); assertThat(loadBalancer.getStickinessMapForTest()).hasSize(1);
} }
@Test @Test
@ -506,7 +506,7 @@ public class RoundRobinLoadBalancerTest {
verify(mockArgs, atLeast(4)).getHeaders(); verify(mockArgs, atLeast(4)).getHeaders();
assertNotNull(loadBalancer.getStickinessMapForTest()); assertNotNull(loadBalancer.getStickinessMapForTest());
assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(2); assertThat(loadBalancer.getStickinessMapForTest()).hasSize(2);
} }
@Test @Test
@ -556,7 +556,7 @@ public class RoundRobinLoadBalancerTest {
verify(mockArgs, atLeast(3)).getHeaders(); verify(mockArgs, atLeast(3)).getHeaders();
assertNotNull(loadBalancer.getStickinessMapForTest()); assertNotNull(loadBalancer.getStickinessMapForTest());
assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(1); assertThat(loadBalancer.getStickinessMapForTest()).hasSize(1);
} }
@Test @Test
@ -610,7 +610,7 @@ public class RoundRobinLoadBalancerTest {
verify(mockArgs, atLeast(3)).getHeaders(); verify(mockArgs, atLeast(3)).getHeaders();
assertNotNull(loadBalancer.getStickinessMapForTest()); assertNotNull(loadBalancer.getStickinessMapForTest());
assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(2); assertThat(loadBalancer.getStickinessMapForTest()).hasSize(2);
} }
@Test @Test
@ -644,7 +644,7 @@ public class RoundRobinLoadBalancerTest {
assertNull(loadBalancer.getStickinessMapForTest().get("my-sticky-value").value); assertNull(loadBalancer.getStickinessMapForTest().get("my-sticky-value").value);
assertEquals(sc2, picker.pickSubchannel(mockArgs).getSubchannel()); assertEquals(sc2, picker.pickSubchannel(mockArgs).getSubchannel());
assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(1); assertThat(loadBalancer.getStickinessMapForTest()).hasSize(1);
verify(mockArgs, atLeast(2)).getHeaders(); verify(mockArgs, atLeast(2)).getHeaders();
} }

1
stub/src/main/java/io/grpc/stub/ClientCalls.java
View File

@ -493,6 +493,7 @@ public final class ClientCalls {
return super.setException(throwable); return super.setException(throwable);
} }
@SuppressWarnings("MissingOverride") // Add @Override once Java 6 support is dropped
protected String pendingToString() { protected String pendingToString() {
return MoreObjects.toStringHelper(this).add("clientCall", call).toString(); return MoreObjects.toStringHelper(this).add("clientCall", call).toString();
} }