1 files changed, 6 insertions, 10 deletions
diff --git a/java/core/src/test/java/com/google/protobuf/ServiceTest.java b/java/core/src/test/java/com/google/protobuf/ServiceTest.java
index b895ad8d..1e583329 100644
--- a/java/core/src/test/java/com/google/protobuf/ServiceTest.java
+++ b/java/core/src/test/java/com/google/protobuf/ServiceTest.java
@@ -41,7 +41,6 @@ import protobuf_unittest.UnittestProto.FooRequest;
 import protobuf_unittest.UnittestProto.FooResponse;
 import protobuf_unittest.UnittestProto.TestAllTypes;
 import protobuf_unittest.UnittestProto.TestService;
-
 import java.util.HashSet;
 import java.util.Set;
 import junit.framework.TestCase;
@@ -270,30 +269,27 @@ public class ServiceTest extends TestCase {
   }
 
 
-
   // =================================================================
 
   /**
-   * wrapsCallback() is an EasyMock argument predicate.  wrapsCallback(c)
-   * matches a callback if calling that callback causes c to be called.
-   * In other words, c wraps the given callback.
+   * wrapsCallback() is an EasyMock argument predicate. wrapsCallback(c) matches a callback if
+   * calling that callback causes c to be called. In other words, c wraps the given callback.
    */
-  private <Type extends Message> RpcCallback<Type> wrapsCallback(
-      MockCallback<?> callback) {
+  private <T extends Message> RpcCallback<T> wrapsCallback(MockCallback<?> callback) {
     EasyMock.reportMatcher(new WrapsCallback(callback));
     return null;
   }
 
   /** The parameter to wrapsCallback() must be a MockCallback. */
-  private static class MockCallback<Type extends Message>
-      implements RpcCallback<Type> {
+  private static class MockCallback<T extends Message> implements RpcCallback<T> {
     private boolean called = false;
 
     public boolean isCalled() { return called; }
 
     public void reset() { called = false; }
+
     @Override
-    public void run(Type message) {
+    public void run(T message) {
       called = true; }
   }