all: remove java6 type args

Author: carl-mastrangelo

alts/src/main/java/io/grpc/alts/internal/AltsHandshakerStub.java

@@ -29,7 +29,7 @@ class AltsHandshakerStub {
   private final StreamObserver<HandshakerResp> reader = new Reader();
   private final StreamObserver<HandshakerReq> writer;
   private final ArrayBlockingQueue<Optional<HandshakerResp>> responseQueue =
-      new ArrayBlockingQueue<Optional<HandshakerResp>>(1);
+      new ArrayBlockingQueue<>(1);
   private final AtomicReference<String> exceptionMessage = new AtomicReference<>();
 
   AltsHandshakerStub(HandshakerServiceStub serviceStub) {

alts/src/main/java/io/grpc/alts/internal/AltsTsiHandshaker.java

@@ -99,7 +99,7 @@ public boolean processBytesFromPeer(ByteBuffer bytes) throws GeneralSecurityExce
   @Override
   public TsiPeer extractPeer() throws GeneralSecurityException {
     Preconditions.checkState(!isInProgress(), "Handshake is not complete.");
-    List<TsiPeer.Property<?>> peerProperties = new ArrayList<TsiPeer.Property<?>>();
+    List<TsiPeer.Property<?>> peerProperties = new ArrayList<>();
     peerProperties.add(
         new TsiPeer.StringProperty(
             TSI_SERVICE_ACCOUNT_PEER_PROPERTY,

alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java

@@ -210,7 +210,7 @@ public void operationComplete(ChannelFuture future) throws Exception {
 
     // Capture the protected data written to the wire.
     assertEquals(1, channel.outboundMessages().size());
-    ByteBuf protectedData = channel.<ByteBuf>readOutbound();
+    ByteBuf protectedData = channel.readOutbound();
     assertEquals(message.length(), writeCount.get());
 
     // Read the protected message at the server and verify it matches the original message.
@@ -276,7 +276,7 @@ public void accept(ByteBuf buf) {
     // Read the protected message at the client and verify that it matches the original message.
     assertEquals(1, channel.inboundMessages().size());
 
-    ByteBuf receivedData1 = channel.<ByteBuf>readInbound();
+    ByteBuf receivedData1 = channel.readInbound();
     int receivedLen1 = receivedData1.readableBytes();
     byte[] receivedBytes = new byte[receivedLen1];
     receivedData1.readBytes(receivedBytes, 0, receivedLen1);
@@ -364,7 +364,7 @@ public void peerPropagated() throws Exception {
   private void doHandshake() throws Exception {
     // Capture the client frame and add to the server.
     assertEquals(1, channel.outboundMessages().size());
-    ByteBuf clientFrame = channel.<ByteBuf>readOutbound();
+    ByteBuf clientFrame = channel.readOutbound();
     assertTrue(serverHandshaker.processBytesFromPeer(clientFrame));
 
     // Get the server response handshake frames.
@@ -374,7 +374,7 @@ private void doHandshake() throws Exception {
 
     // Capture the next client frame and add to the server.
     assertEquals(1, channel.outboundMessages().size());
-    clientFrame = channel.<ByteBuf>readOutbound();
+    clientFrame = channel.readOutbound();
     assertTrue(serverHandshaker.processBytesFromPeer(clientFrame));
 
     // Get the server response handshake frames.

auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java

@@ -221,7 +221,7 @@ public void credentialsReturnNullMetadata() throws Exception {
     ListMultimap<String, String> values = LinkedListMultimap.create();
     values.put("Authorization", "token1");
     when(credentials.getRequestMetadata(eq(expectedUri)))
-        .thenReturn(null, Multimaps.<String, String>asMap(values), null);
+        .thenReturn(null, Multimaps.asMap(values), null);
 
     GoogleAuthLibraryCallCredentials callCredentials =
         new GoogleAuthLibraryCallCredentials(credentials);

benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java

@@ -432,7 +432,7 @@ protected CountDownLatch startStreamingCalls(int callsPerChannel, final AtomicLo
         final ClientCall<ByteBuf, ByteBuf> streamingCall =
             channel.newCall(pingPongMethod, CALL_OPTIONS);
         final AtomicReference<StreamObserver<ByteBuf>> requestObserverRef =
-            new AtomicReference<StreamObserver<ByteBuf>>();
+            new AtomicReference<>();
         final AtomicBoolean ignoreMessages = new AtomicBoolean();
         StreamObserver<ByteBuf> requestObserver = ClientCalls.asyncBidiStreamingCall(
             streamingCall,
@@ -486,7 +486,7 @@ protected CountDownLatch startFlowControlledStreamingCalls(int callsPerChannel,
         final ClientCall<ByteBuf, ByteBuf> streamingCall =
             channel.newCall(flowControlledStreaming, CALL_OPTIONS);
         final AtomicReference<StreamObserver<ByteBuf>> requestObserverRef =
-            new AtomicReference<StreamObserver<ByteBuf>>();
+            new AtomicReference<>();
         final AtomicBoolean ignoreMessages = new AtomicBoolean();
         StreamObserver<ByteBuf> requestObserver = ClientCalls.asyncBidiStreamingCall(
             streamingCall,

benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadClient.java

@@ -379,7 +379,7 @@ public void run() {
       while (!shutdown) {
         maxOutstanding.acquireUninterruptibly();
         final AtomicReference<StreamObserver<Messages.SimpleRequest>> requestObserver =
-            new AtomicReference<StreamObserver<Messages.SimpleRequest>>();
+            new AtomicReference<>();
         requestObserver.set(stub.streamingCall(
             new StreamObserver<Messages.SimpleResponse>() {
               long now = System.nanoTime();

benchmarks/src/main/java/io/grpc/benchmarks/qps/AbstractConfigurationBuilder.java

@@ -109,7 +109,7 @@ protected interface Param {
   public final T build(String[] args) {
     T config = newConfiguration();
     Map<String, Param> paramMap = getParamMap();
-    Set<String> appliedParams = new TreeSet<String>(CASE_INSENSITIVE_ORDER);
+    Set<String> appliedParams = new TreeSet<>(CASE_INSENSITIVE_ORDER);
 
     for (String arg : args) {
       if (!arg.startsWith("--")) {
@@ -197,7 +197,7 @@ public final void printUsage() {
   protected abstract T build0(T config);
 
   private Map<String, Param> getParamMap() {
-    Map<String, Param> map = new TreeMap<String, Param>(CASE_INSENSITIVE_ORDER);
+    Map<String, Param> map = new TreeMap<>(CASE_INSENSITIVE_ORDER);
     for (Param param : getParams()) {
       map.put(param.getName(), param);
     }

benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncClient.java

@@ -122,7 +122,7 @@ private List<Histogram> doBenchmark(SimpleRequest req,
                                       long endTime) throws Exception {
     // Initiate the concurrent calls
     List<Future<Histogram>> futures =
-        new ArrayList<Future<Histogram>>(config.outstandingRpcsPerChannel);
+        new ArrayList<>(config.outstandingRpcsPerChannel);
     for (int i = 0; i < config.channels; i++) {
       for (int j = 0; j < config.outstandingRpcsPerChannel; j++) {
         Channel channel = channels.get(i);

benchmarks/src/test/java/io/grpc/benchmarks/driver/LoadWorkerTest.java

@@ -59,7 +59,7 @@ public void setup() throws Exception {
     worker.start();
     channel = NettyChannelBuilder.forAddress("localhost", port).usePlaintext().build();
     workerServiceStub = WorkerServiceGrpc.newStub(channel);
-    marksQueue = new LinkedBlockingQueue<Stats.ClientStats>();
+    marksQueue = new LinkedBlockingQueue<>();
   }
 
   @Test

context/src/jmh/java/io/grpc/ReadBenchmark.java

@@ -33,7 +33,7 @@ public class ReadBenchmark {
 
   @State(Scope.Benchmark)
   public static class ContextState {
-    List<Context.Key<Object>> keys = new ArrayList<Context.Key<Object>>();
+    List<Context.Key<Object>> keys = new ArrayList<>();
     List<Context> contexts = new ArrayList<>();
 
     @Setup

context/src/main/java/io/grpc/Context.java

@@ -100,7 +100,7 @@ public class Context {
   private static final Logger log = Logger.getLogger(Context.class.getName());
 
   private static final PersistentHashArrayMappedTrie<Key<?>, Object> EMPTY_ENTRIES =
-      new PersistentHashArrayMappedTrie<Key<?>, Object>();
+      new PersistentHashArrayMappedTrie<>();
 
   // Long chains of contexts are suspicious and usually indicate a misuse of Context.
   // The threshold is arbitrarily chosen.
@@ -120,7 +120,7 @@ public class Context {
   // much easier to avoid circular loading since there can still be references to Context as long as
   // they don't depend on storage, like key() and currentContextExecutor(). It also makes it easier
   // to handle exceptions.
-  private static final AtomicReference<Storage> storage = new AtomicReference<Storage>();
+  private static final AtomicReference<Storage> storage = new AtomicReference<>();
 
   // For testing
   static Storage storage() {
@@ -159,15 +159,15 @@ private static Storage createStorage() {
    * the name is intended for debugging purposes and does not impact behavior.
    */
   public static <T> Key<T> key(String name) {
-    return new Key<T>(name);
+    return new Key<>(name);
   }
 
   /**
    * Create a {@link Key} with the given debug name and default value. Multiple different keys may
    * have the same name; the name is intended for debugging purposes and does not impact behavior.
    */
   public static <T> Key<T> keyWithDefault(String name, T defaultValue) {
-    return new Key<T>(name, defaultValue);
+    return new Key<>(name, defaultValue);
   }
 
   /**

context/src/main/java/io/grpc/PersistentHashArrayMappedTrie.java

@@ -62,9 +62,9 @@ public V get(K key) {
    */
   public PersistentHashArrayMappedTrie<K,V> put(K key, V value) {
     if (root == null) {
-      return new PersistentHashArrayMappedTrie<K,V>(new Leaf<K,V>(key, value));
+      return new PersistentHashArrayMappedTrie<>(new Leaf<>(key, value));
     } else {
-      return new PersistentHashArrayMappedTrie<K,V>(root.put(key, value, key.hashCode(), 0));
+      return new PersistentHashArrayMappedTrie<>(root.put(key, value, key.hashCode(), 0));
     }
   }
 
@@ -99,13 +99,13 @@ public Node<K,V> put(K key, V value, int hash, int bitsConsumed) {
       if (thisHash != hash) {
         // Insert
         return CompressedIndex.combine(
-            new Leaf<K,V>(key, value), hash, this, thisHash, bitsConsumed);
+            new Leaf<>(key, value), hash, this, thisHash, bitsConsumed);
       } else if (this.key == key) {
         // Replace
-        return new Leaf<K,V>(key, value);
+        return new Leaf<>(key, value);
       } else {
         // Hash collision
-        return new CollisionLeaf<K,V>(this.key, this.value, key, value);
+        return new CollisionLeaf<>(this.key, this.value, key, value);
       }
     }
 
@@ -158,21 +158,21 @@ public Node<K,V> put(K key, V value, int hash, int bitsConsumed) {
       if (thisHash != hash) {
         // Insert
         return CompressedIndex.combine(
-            new Leaf<K,V>(key, value), hash, this, thisHash, bitsConsumed);
+            new Leaf<>(key, value), hash, this, thisHash, bitsConsumed);
       } else if ((keyIndex = indexOfKey(key)) != -1) {
         // Replace
         K[] newKeys = Arrays.copyOf(keys, keys.length);
         V[] newValues = Arrays.copyOf(values, keys.length);
         newKeys[keyIndex] = key;
         newValues[keyIndex] = value;
-        return new CollisionLeaf<K,V>(newKeys, newValues);
+        return new CollisionLeaf<>(newKeys, newValues);
       } else {
         // Yet another hash collision
         K[] newKeys = Arrays.copyOf(keys, keys.length + 1);
         V[] newValues = Arrays.copyOf(values, keys.length + 1);
         newKeys[keys.length] = key;
         newValues[keys.length] = value;
-        return new CollisionLeaf<K,V>(newKeys, newValues);
+        return new CollisionLeaf<>(newKeys, newValues);
       }
     }
 
@@ -238,14 +238,14 @@ public Node<K,V> put(K key, V value, int hash, int bitsConsumed) {
         @SuppressWarnings("unchecked")
         Node<K,V>[] newValues = (Node<K,V>[]) new Node<?,?>[values.length + 1];
         System.arraycopy(values, 0, newValues, 0, compressedIndex);
-        newValues[compressedIndex] = new Leaf<K,V>(key, value);
+        newValues[compressedIndex] = new Leaf<>(key, value);
         System.arraycopy(
             values,
             compressedIndex,
             newValues,
             compressedIndex + 1,
             values.length - compressedIndex);
-        return new CompressedIndex<K,V>(newBitmap, newValues, size() + 1);
+        return new CompressedIndex<>(newBitmap, newValues, size() + 1);
       } else {
         // Replace
         Node<K,V>[] newValues = Arrays.copyOf(values, values.length);
@@ -254,7 +254,7 @@ public Node<K,V> put(K key, V value, int hash, int bitsConsumed) {
         int newSize = size();
         newSize += newValues[compressedIndex].size();
         newSize -= values[compressedIndex].size();
-        return new CompressedIndex<K,V>(bitmap, newValues, newSize);
+        return new CompressedIndex<>(bitmap, newValues, newSize);
       }
     }
 
@@ -267,7 +267,7 @@ static <K,V> Node<K,V> combine(
         Node<K,V> node = combine(node1, hash1, node2, hash2, bitsConsumed + BITS);
         @SuppressWarnings("unchecked")
         Node<K,V>[] values = (Node<K,V>[]) new Node<?,?>[] {node};
-        return new CompressedIndex<K,V>(indexBit1, values, node.size());
+        return new CompressedIndex<>(indexBit1, values, node.size());
       } else {
         // Make node1 the smallest
         if (uncompressedIndex(hash1, bitsConsumed) > uncompressedIndex(hash2, bitsConsumed)) {
@@ -277,7 +277,7 @@ static <K,V> Node<K,V> combine(
         }
         @SuppressWarnings("unchecked")
         Node<K,V>[] values = (Node<K,V>[]) new Node<?,?>[] {node1, node2};
-        return new CompressedIndex<K,V>(indexBit1 | indexBit2, values, node1.size() + node2.size());
+        return new CompressedIndex<>(indexBit1 | indexBit2, values, node1.size() + node2.size());
       }
     }
 

context/src/main/java/io/grpc/ThreadLocalContextStorage.java

@@ -29,7 +29,7 @@ final class ThreadLocalContextStorage extends Context.Storage {
    * Currently bound context.
    */
   // VisibleForTesting
-  static final ThreadLocal<Context> localContext = new ThreadLocal<Context>();
+  static final ThreadLocal<Context> localContext = new ThreadLocal<>();
 
   @Override
   public Context doAttach(Context toAttach) {

context/src/test/java/io/grpc/ContextTest.java

@@ -166,7 +166,7 @@ public void attachingNonCurrentReturnsCurrent() {
 
   @Test
   public void detachingNonCurrentLogsSevereMessage() {
-    final AtomicReference<LogRecord> logRef = new AtomicReference<LogRecord>();
+    final AtomicReference<LogRecord> logRef = new AtomicReference<>();
     Handler handler = new Handler() {
       @Override
       public void publish(LogRecord record) {
@@ -284,24 +284,24 @@ public void cancelled(Context context) {
     }
 
     Context.CancellableContext base = Context.current().withCancellation();
-    final AtomicReference<Context> observed1 = new AtomicReference<Context>();
+    final AtomicReference<Context> observed1 = new AtomicReference<>();
     base.addListener(new SetContextCancellationListener(observed1), MoreExecutors.directExecutor());
-    final AtomicReference<Context> observed2 = new AtomicReference<Context>();
+    final AtomicReference<Context> observed2 = new AtomicReference<>();
     base.addListener(new SetContextCancellationListener(observed2), MoreExecutors.directExecutor());
     assertNull(observed1.get());
     assertNull(observed2.get());
     base.cancel(null);
     assertSame(base, observed1.get());
     assertSame(base, observed2.get());
 
-    final AtomicReference<Context> observed3 = new AtomicReference<Context>();
+    final AtomicReference<Context> observed3 = new AtomicReference<>();
     base.addListener(new SetContextCancellationListener(observed3), MoreExecutors.directExecutor());
     assertSame(base, observed3.get());
   }
 
   @Test
   public void exceptionOfExecutorDoesntThrow() {
-    final AtomicReference<Throwable> loggedThrowable = new AtomicReference<Throwable>();
+    final AtomicReference<Throwable> loggedThrowable = new AtomicReference<>();
     Handler logHandler = new Handler() {
       @Override
       public void publish(LogRecord record) {
@@ -325,7 +325,7 @@ public void flush() {}
     logger.addHandler(logHandler);
     try {
       Context.CancellableContext base = Context.current().withCancellation();
-      final AtomicReference<Runnable> observed1 = new AtomicReference<Runnable>();
+      final AtomicReference<Runnable> observed1 = new AtomicReference<>();
       final Error err = new Error();
       base.addListener(cancellationListener, new Executor() {
         @Override
@@ -342,7 +342,7 @@ public void execute(Runnable runnable) {
 
       final Error err2 = new Error();
       loggedThrowable.set(null);
-      final AtomicReference<Runnable> observed2 = new AtomicReference<Runnable>();
+      final AtomicReference<Runnable> observed2 = new AtomicReference<>();
       base.addListener(cancellationListener, new Executor() {
         @Override
         public void execute(Runnable runnable) {
@@ -596,7 +596,7 @@ public void earlierParentDeadlineTakesPrecedenceOverLaterChildDeadline() throws
     assertSame(parent.getDeadline(), sooner);
     assertSame(child.getDeadline(), sooner);
     final CountDownLatch latch = new CountDownLatch(1);
-    final AtomicReference<Exception> error = new AtomicReference<Exception>();
+    final AtomicReference<Exception> error = new AtomicReference<>();
     child.addListener(new Context.CancellationListener() {
       @Override
       public void cancelled(Context context) {
@@ -709,7 +709,7 @@ public void cancellationCancelsScheduledTask() {
   }
 
   private static class QueuedExecutor implements Executor {
-    private final Queue<Runnable> runnables = new ArrayDeque<Runnable>();
+    private final Queue<Runnable> runnables = new ArrayDeque<>();
 
     @Override
     public void execute(Runnable r) {
@@ -939,7 +939,7 @@ public void cancellableContext_closeCancelsWithNullCause() throws Exception {
 
   @Test
   public void errorWhenAncestryLengthLong() {
-    final AtomicReference<LogRecord> logRef = new AtomicReference<LogRecord>();
+    final AtomicReference<LogRecord> logRef = new AtomicReference<>();
     Handler handler = new Handler() {
       @Override
       public void publish(LogRecord record) {