Add missing Generic param to Answers

ejona86 · ejona86 · commit e72332ce5dac · 2015-08-14T14:53:11.000-07:00
diff --git a/core/src/test/java/io/grpc/internal/MessageDeframerTest.java b/core/src/test/java/io/grpc/internal/MessageDeframerTest.java
@@ -190,9 +190,9 @@ public void compressed() {
 
   @Test
   public void deliverIsReentrantSafe() {
-    doAnswer(new Answer() {
+    doAnswer(new Answer<Void>() {
       @Override
-      public Object answer(InvocationOnMock invocation) throws Throwable {
+      public Void answer(InvocationOnMock invocation) throws Throwable {
         deframer.request(1);
         return null;
       }
diff --git a/netty/src/main/java/io/grpc/netty/RequestMessagesCommand.java b/netty/src/main/java/io/grpc/netty/RequestMessagesCommand.java
@@ -39,7 +39,7 @@
 class RequestMessagesCommand {
 
   private final int numMessages;
-  private final AbstractStream stream;
+  private final AbstractStream<Integer> stream;
 
   public RequestMessagesCommand(AbstractStream<Integer> stream, int numMessages) {
     this.numMessages = numMessages;
diff --git a/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java
@@ -148,7 +148,7 @@ public void setUp() throws Exception {
     handler.startWriteQueue(channel);
     writeQueue = handler.getWriteQueue();
     // Delegate writes on the channel to the handler
-    doAnswer(new Answer() {
+    doAnswer(new Answer<Object>() {
       @Override
       public Object answer(InvocationOnMock invocation) throws Throwable {
         handler.write(ctx, invocation.getArguments()[0],
diff --git a/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java b/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java
@@ -333,7 +333,7 @@ public void setHttp2StreamShouldNotifyReady() {
   @Override
   protected NettyClientStream createStream() {
     when(handler.getWriteQueue()).thenReturn(writeQueue);
-    doAnswer(new Answer() {
+    doAnswer(new Answer<Object>() {
       @Override
       public Object answer(InvocationOnMock invocation) throws Throwable {
         if (future.isDone()) {
diff --git a/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java
@@ -135,14 +135,14 @@ public void setUp() throws Exception {
     mockContext();
     mockFuture(true);
     // Delegate writes on the channel to the handler
-    doAnswer(new Answer() {
+    doAnswer(new Answer<Object>() {
       @Override
       public Object answer(InvocationOnMock invocation) throws Throwable {
         handler.write(ctx, invocation.getArguments()[0], promise);
         return future;
       }
     }).when(channel).write(any());
-    doAnswer(new Answer() {
+    doAnswer(new Answer<Object>() {
       @Override
       public Object answer(InvocationOnMock invocation) throws Throwable {
         handler.write(ctx, invocation.getArguments()[0],
diff --git a/netty/src/test/java/io/grpc/netty/NettyServerStreamTest.java b/netty/src/test/java/io/grpc/netty/NettyServerStreamTest.java
@@ -244,7 +244,7 @@ public void cancelStreamShouldSucceed() {
   @Override
   protected NettyServerStream createStream() {
     when(handler.getWriteQueue()).thenReturn(writeQueue);
-    doAnswer(new Answer() {
+    doAnswer(new Answer<Object>() {
       @Override
       public Object answer(InvocationOnMock invocation) throws Throwable {
         if (future.isDone()) {
