From 7779b4fddf128f14b90a81b12367d8e6d192fff5 Mon Sep 17 00:00:00 2001 From: nmittler Date: Thu, 30 Apr 2015 12:06:43 -0700 Subject: [PATCH] Cleaning up some warnings. --- .../java/io/grpc/auth/ClientAuthInterceptorTests.java | 7 ++----- .../java/io/grpc/benchmarks/netty/AbstractBenchmark.java | 6 +++--- core/src/main/java/io/grpc/Status.java | 4 ++-- core/src/test/java/io/grpc/SharedResourceHolderTest.java | 4 ++-- .../transport/netty/GoAwayClosedStreamException.java | 1 + .../grpc/transport/okhttp/OkHttpReadableBufferTest.java | 3 +++ stub/src/main/java/io/grpc/stub/Calls.java | 4 ++-- stub/src/main/java/io/grpc/stub/MetadataUtils.java | 1 - stub/src/test/java/io/grpc/stub/CallsTest.java | 9 +++------ 9 files changed, 18 insertions(+), 21 deletions(-) diff --git a/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java b/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java index 7ba9152b8f..7578f3fe1f 100644 --- a/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java +++ b/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java @@ -102,7 +102,6 @@ public class ClientAuthInterceptorTests { } @Test - @SuppressWarnings("unchecked") public void testCopyCredentialToHeaders() throws IOException { ListMultimap values = LinkedListMultimap.create(); values.put("Authorization", "token1"); @@ -110,7 +109,7 @@ public class ClientAuthInterceptorTests { values.put("Extra-Authorization", "token3"); values.put("Extra-Authorization", "token4"); when(credentials.getRequestMetadata()).thenReturn(Multimaps.asMap(values)); - Call interceptedCall = interceptor.interceptCall(descriptor, channel); + Call interceptedCall = interceptor.interceptCall(descriptor, channel); Metadata.Headers headers = new Metadata.Headers(); interceptedCall.start(listener, headers); verify(call).start(listener, headers); @@ -124,10 +123,9 @@ public class ClientAuthInterceptorTests { } @Test - @SuppressWarnings("unchecked") public void testCredentialsThrows() throws IOException { when(credentials.getRequestMetadata()).thenThrow(new IOException("Broken")); - Call interceptedCall = interceptor.interceptCall(descriptor, channel); + Call interceptedCall = interceptor.interceptCall(descriptor, channel); Metadata.Headers headers = new Metadata.Headers(); interceptedCall.start(listener, headers); ArgumentCaptor statusCaptor = ArgumentCaptor.forClass(Status.class); @@ -139,7 +137,6 @@ public class ClientAuthInterceptorTests { } @Test - @SuppressWarnings("unchecked") public void testWithOAuth2Credential() throws IOException { final AccessToken token = new AccessToken("allyourbase", new Date(Long.MAX_VALUE)); final OAuth2Credentials oAuth2Credentials = new OAuth2Credentials() { diff --git a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java b/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java index a0f1a01d98..500280d204 100644 --- a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java +++ b/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java @@ -93,7 +93,7 @@ public abstract class AbstractBenchmark { protected ServerImpl server; protected ByteBuf request; protected ByteBuf response; - protected MethodDescriptor unaryMethod; + protected MethodDescriptor unaryMethod; protected ChannelImpl[] channels; public AbstractBenchmark() { @@ -215,9 +215,9 @@ public abstract class AbstractBenchmark { final AtomicBoolean done) { for (final ChannelImpl channel : channels) { for (int i = 0; i < callsPerChannel; i++) { - StreamObserver observer = new StreamObserver() { + StreamObserver observer = new StreamObserver() { @Override - public void onValue(Object value) { + public void onValue(ByteBuf value) { counter.incrementAndGet(); } diff --git a/core/src/main/java/io/grpc/Status.java b/core/src/main/java/io/grpc/Status.java index 73a6d8e736..8da9ba59fb 100644 --- a/core/src/main/java/io/grpc/Status.java +++ b/core/src/main/java/io/grpc/Status.java @@ -452,7 +452,7 @@ public final class Status { * Exception thrown by implementations while managing an operation. */ public static class OperationException extends Exception { - + private static final long serialVersionUID = -660954903976144640L; private final Status status; public OperationException(Status status) { @@ -469,7 +469,7 @@ public final class Status { * Runtime exception thrown by implementations while managing an operation. */ public static class OperationRuntimeException extends RuntimeException { - + private static final long serialVersionUID = 1950934672280720624L; private final Status status; public OperationRuntimeException(Status status) { diff --git a/core/src/test/java/io/grpc/SharedResourceHolderTest.java b/core/src/test/java/io/grpc/SharedResourceHolderTest.java index 0cb587339e..f6fa0729ff 100644 --- a/core/src/test/java/io/grpc/SharedResourceHolderTest.java +++ b/core/src/test/java/io/grpc/SharedResourceHolderTest.java @@ -196,9 +196,9 @@ public class SharedResourceHolderTest { public ScheduledExecutorService createScheduledExecutor() { ScheduledExecutorService mockExecutor = mock(ScheduledExecutorService.class); when(mockExecutor.schedule(any(Runnable.class), anyLong(), any(TimeUnit.class))).thenAnswer( - new Answer() { + new Answer>() { @Override - public Object answer(InvocationOnMock invocation) { + public MockScheduledFuture answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); Runnable command = (Runnable) args[0]; long delay = (Long) args[1]; diff --git a/netty/src/main/java/io/grpc/transport/netty/GoAwayClosedStreamException.java b/netty/src/main/java/io/grpc/transport/netty/GoAwayClosedStreamException.java index 304b102a3e..481ff8d480 100644 --- a/netty/src/main/java/io/grpc/transport/netty/GoAwayClosedStreamException.java +++ b/netty/src/main/java/io/grpc/transport/netty/GoAwayClosedStreamException.java @@ -34,6 +34,7 @@ package io.grpc.transport.netty; import io.netty.buffer.ByteBuf; class GoAwayClosedStreamException extends Exception { + private static final long serialVersionUID = 1326785622777291198L; private final int lastStreamId; private final long errorCode; private final ByteBuf debugData; diff --git a/okhttp/src/test/java/io/grpc/transport/okhttp/OkHttpReadableBufferTest.java b/okhttp/src/test/java/io/grpc/transport/okhttp/OkHttpReadableBufferTest.java index 5cabfe98ad..5d0a916647 100644 --- a/okhttp/src/test/java/io/grpc/transport/okhttp/OkHttpReadableBufferTest.java +++ b/okhttp/src/test/java/io/grpc/transport/okhttp/OkHttpReadableBufferTest.java @@ -33,7 +33,9 @@ package io.grpc.transport.okhttp; import io.grpc.transport.ReadableBuffer; import io.grpc.transport.ReadableBufferTestBase; + import okio.Buffer; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +49,7 @@ public class OkHttpReadableBufferTest extends ReadableBufferTestBase { private OkHttpReadableBuffer buffer; + @SuppressWarnings("resource") @Before public void setup() { buffer = new OkHttpReadableBuffer(new Buffer().writeUtf8(msg)); diff --git a/stub/src/main/java/io/grpc/stub/Calls.java b/stub/src/main/java/io/grpc/stub/Calls.java index a62c21ef45..eddedf9b6d 100644 --- a/stub/src/main/java/io/grpc/stub/Calls.java +++ b/stub/src/main/java/io/grpc/stub/Calls.java @@ -327,9 +327,9 @@ public class Calls { } private static class GrpcFuture extends AbstractFuture { - private final Call call; + private final Call call; - GrpcFuture(Call call) { + GrpcFuture(Call call) { this.call = call; } diff --git a/stub/src/main/java/io/grpc/stub/MetadataUtils.java b/stub/src/main/java/io/grpc/stub/MetadataUtils.java index 0230132830..d6a9341fda 100644 --- a/stub/src/main/java/io/grpc/stub/MetadataUtils.java +++ b/stub/src/main/java/io/grpc/stub/MetadataUtils.java @@ -108,7 +108,6 @@ public class MetadataUtils { * @param trailersCapture to record the last received trailers * @return an implementation of the channel with captures installed. */ - @SuppressWarnings("unchecked") public static ClientInterceptor newCaptureMetadataInterceptor( final AtomicReference headersCapture, final AtomicReference trailersCapture) { diff --git a/stub/src/test/java/io/grpc/stub/CallsTest.java b/stub/src/test/java/io/grpc/stub/CallsTest.java index 2e81e90d01..a810ae405f 100644 --- a/stub/src/test/java/io/grpc/stub/CallsTest.java +++ b/stub/src/test/java/io/grpc/stub/CallsTest.java @@ -65,11 +65,10 @@ public class CallsTest { MockitoAnnotations.initMocks(this); } - @SuppressWarnings("unchecked") @Test public void unaryFutureCallSuccess() throws Exception { Integer req = 2; ListenableFuture future = Calls.unaryFutureCall(call, req); - ArgumentCaptor listenerCaptor = ArgumentCaptor.forClass(Call.Listener.class); + ArgumentCaptor> listenerCaptor = ArgumentCaptor.forClass(null); verify(call).start(listenerCaptor.capture(), any(Metadata.Headers.class)); Call.Listener listener = listenerCaptor.getValue(); verify(call).sendPayload(req); @@ -79,11 +78,10 @@ public class CallsTest { assertEquals("bar", future.get()); } - @SuppressWarnings("unchecked") @Test public void unaryFutureCallFailed() throws Exception { Integer req = 2; ListenableFuture future = Calls.unaryFutureCall(call, req); - ArgumentCaptor listenerCaptor = ArgumentCaptor.forClass(Call.Listener.class); + ArgumentCaptor> listenerCaptor = ArgumentCaptor.forClass(null); verify(call).start(listenerCaptor.capture(), any(Metadata.Headers.class)); Call.Listener listener = listenerCaptor.getValue(); listener.onClose(Status.INVALID_ARGUMENT, new Metadata.Trailers()); @@ -96,11 +94,10 @@ public class CallsTest { } } - @SuppressWarnings("unchecked") @Test public void unaryFutureCallCancelled() throws Exception { Integer req = 2; ListenableFuture future = Calls.unaryFutureCall(call, req); - ArgumentCaptor listenerCaptor = ArgumentCaptor.forClass(Call.Listener.class); + ArgumentCaptor> listenerCaptor = ArgumentCaptor.forClass(null); verify(call).start(listenerCaptor.capture(), any(Metadata.Headers.class)); Call.Listener listener = listenerCaptor.getValue(); future.cancel(true);