From 3a39b81cf54b3e93b06f8b7375f2bcbf0f712612 Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Mon, 4 Feb 2019 10:03:50 -0800 Subject: [PATCH] all: remove java6 type args --- .../alts/internal/AltsHandshakerStub.java | 2 +- .../grpc/alts/internal/AltsTsiHandshaker.java | 2 +- .../internal/AltsProtocolNegotiatorTest.java | 8 +-- .../GoogleAuthLibraryCallCredentialsTest.java | 2 +- .../benchmarks/netty/AbstractBenchmark.java | 4 +- .../io/grpc/benchmarks/driver/LoadClient.java | 2 +- .../qps/AbstractConfigurationBuilder.java | 4 +- .../io/grpc/benchmarks/qps/AsyncClient.java | 2 +- .../benchmarks/driver/LoadWorkerTest.java | 2 +- .../src/jmh/java/io/grpc/ReadBenchmark.java | 2 +- context/src/main/java/io/grpc/Context.java | 8 +-- .../grpc/PersistentHashArrayMappedTrie.java | 26 +++++----- .../io/grpc/ThreadLocalContextStorage.java | 2 +- .../src/test/java/io/grpc/ContextTest.java | 20 ++++---- .../PersistentHashArrayMappedTrieTest.java | 24 ++++----- .../java/io/grpc/CallOptionsBenchmark.java | 4 +- .../internal/StatsTraceContextBenchmark.java | 2 +- core/src/main/java/io/grpc/Attributes.java | 6 +-- core/src/main/java/io/grpc/CallOptions.java | 8 +-- .../main/java/io/grpc/CompressorRegistry.java | 2 +- core/src/main/java/io/grpc/Contexts.java | 2 +- .../java/io/grpc/DecompressorRegistry.java | 6 +-- .../main/java/io/grpc/InternalChannelz.java | 18 +++---- .../java/io/grpc/LoadBalancerRegistry.java | 8 +-- .../java/io/grpc/ManagedChannelProvider.java | 2 +- core/src/main/java/io/grpc/Metadata.java | 12 ++--- .../main/java/io/grpc/MethodDescriptor.java | 6 +-- .../main/java/io/grpc/ServerInterceptors.java | 6 +-- .../java/io/grpc/ServerMethodDefinition.java | 4 +- .../java/io/grpc/ServerServiceDefinition.java | 11 ++-- .../main/java/io/grpc/ServerStreamTracer.java | 2 +- .../main/java/io/grpc/ServiceDescriptor.java | 6 +-- core/src/main/java/io/grpc/Status.java | 2 +- .../java/io/grpc/SynchronizationContext.java | 2 +- .../io/grpc/inprocess/InProcessServer.java | 2 +- .../inprocess/InProcessServerBuilder.java | 2 +- .../io/grpc/inprocess/InProcessTransport.java | 6 +-- .../AbstractManagedChannelImplBuilder.java | 2 +- .../internal/ApplicationThreadDeframer.java | 2 +- .../internal/CompositeReadableBuffer.java | 2 +- .../grpc/internal/DelayedClientTransport.java | 6 +-- .../io/grpc/internal/DnsNameResolver.java | 2 +- .../main/java/io/grpc/internal/Http2Ping.java | 2 +- .../grpc/internal/InUseStateAggregator.java | 2 +- .../internal/InternalHandlerRegistry.java | 4 +- .../internal/JndiResourceResolverFactory.java | 2 +- .../java/io/grpc/internal/JsonParser.java | 2 +- .../io/grpc/internal/ManagedChannelImpl.java | 20 ++++---- .../internal/ManagedChannelOrphanWrapper.java | 6 +-- .../java/io/grpc/internal/OobChannel.java | 2 +- ...SerializeReentrantCallsDirectExecutor.java | 2 +- .../io/grpc/internal/SerializingExecutor.java | 2 +- .../java/io/grpc/internal/ServerCallImpl.java | 2 +- .../java/io/grpc/internal/ServerImpl.java | 4 +- .../internal/ServiceConfigInterceptor.java | 8 +-- .../grpc/internal/SharedResourceHolder.java | 2 +- .../io/grpc/internal/SharedResourcePool.java | 2 +- .../io/grpc/internal/SubchannelChannel.java | 2 +- .../io/grpc/util/MutableHandlerRegistry.java | 2 +- .../io/grpc/util/RoundRobinLoadBalancer.java | 16 +++--- ...smitStatusRuntimeExceptionInterceptor.java | 2 +- core/src/test/java/io/grpc/ContextsTest.java | 2 +- .../io/grpc/DecompressorRegistryTest.java | 2 +- core/src/test/java/io/grpc/MetadataTest.java | 4 +- .../io/grpc/NameResolverProviderTest.java | 4 +- .../java/io/grpc/ServerInterceptorsTest.java | 8 +-- .../io/grpc/ServiceProvidersTestUtil.java | 2 +- .../io/grpc/SynchronizationContextTest.java | 4 +- .../internal/AbstractServerStreamTest.java | 2 +- .../ApplicationThreadDeframerTest.java | 2 +- ...AutoConfiguredLoadBalancerFactoryTest.java | 8 +-- .../io/grpc/internal/CensusModulesTest.java | 8 +-- .../grpc/internal/ChannelLoggerImplTest.java | 2 +- .../io/grpc/internal/ChannelTracerTest.java | 2 +- .../io/grpc/internal/ClientCallImplTest.java | 50 +++++++++---------- .../ConnectivityStateManagerTest.java | 4 +- .../io/grpc/internal/DnsNameResolverTest.java | 38 +++++++------- .../test/java/io/grpc/internal/FakeClock.java | 2 +- .../ForwardingManagedChannelTest.java | 2 +- .../grpc/internal/InternalSubchannelTest.java | 2 +- .../java/io/grpc/internal/JsonParserTest.java | 2 +- .../ManagedChannelImplIdlenessTest.java | 2 +- .../grpc/internal/ManagedChannelImplTest.java | 30 +++++------ .../ManagedChannelOrphanWrapperTest.java | 10 ++-- .../io/grpc/internal/RetriableStreamTest.java | 4 +- .../io/grpc/internal/ServerCallImplTest.java | 28 +++++------ .../java/io/grpc/internal/ServerImplTest.java | 20 ++++---- .../internal/SharedResourceHolderTest.java | 4 +- .../test/java/io/grpc/internal/TestUtils.java | 2 +- .../ForwardingLoadBalancerHelperTest.java | 2 +- .../grpc/util/RoundRobinLoadBalancerTest.java | 22 ++++---- .../grpc/util/UtilServerInterceptorsTest.java | 4 +- .../routeguide/RouteGuideServerTest.java | 2 +- .../io/grpc/grpclb/CachedSubchannelPool.java | 2 +- .../grpc/grpclb/GrpclbClientLoadRecorder.java | 4 +- .../main/java/io/grpc/grpclb/GrpclbState.java | 4 +- .../grpc/grpclb/GrpclbLoadBalancerTest.java | 8 +-- .../testing/integration/StressTestClient.java | 6 +-- .../testing/integration/TestServiceImpl.java | 2 +- .../io/grpc/ChannelAndServerBuilderTest.java | 4 +- .../java/io/grpc/stub/StubConfigTest.java | 2 +- .../testing/integration/CompressionTest.java | 6 +-- .../integration/MoreInProcessTest.java | 12 ++--- .../testing/integration/TestCasesTest.java | 2 +- .../integration/TrafficControlProxy.java | 2 +- .../io/grpc/netty/NettyChannelBuilder.java | 2 +- .../io/grpc/netty/ProtocolNegotiators.java | 2 +- .../main/java/io/grpc/netty/WriteQueue.java | 2 +- .../io/grpc/netty/NettyClientHandlerTest.java | 2 +- .../io/grpc/netty/NettyClientStreamTest.java | 2 +- .../grpc/netty/NettyClientTransportTest.java | 2 +- .../io/grpc/netty/NettyServerHandlerTest.java | 2 +- .../io/grpc/netty/NettyServerStreamTest.java | 2 +- .../java/io/grpc/netty/NettyServerTest.java | 2 +- .../grpc/okhttp/OkHttpProtocolNegotiator.java | 12 ++--- .../grpc/okhttp/OkHttpClientStreamTest.java | 2 +- .../okhttp/OkHttpClientTransportTest.java | 2 +- .../io/grpc/okhttp/OptionalMethodTest.java | 12 ++--- .../io/grpc/okhttp/internal/Platform.java | 8 +-- .../java/io/grpc/okhttp/internal/Util.java | 2 +- .../io/grpc/okhttp/internal/framed/Hpack.java | 6 +-- .../io/grpc/protobuf/lite/ProtoLiteUtils.java | 8 +-- .../java/io/grpc/protobuf/nano/NanoUtils.java | 2 +- .../services/ProtoReflectionService.java | 24 ++++----- .../java/io/grpc/services/BinlogHelper.java | 14 +++--- .../HealthCheckingLoadBalancerFactory.java | 2 +- .../services/ProtoReflectionServiceTest.java | 18 +++---- .../grpc/services/BinaryLogProviderTest.java | 14 +++--- .../io/grpc/services/BinlogHelperTest.java | 28 +++++------ ...HealthCheckingLoadBalancerFactoryTest.java | 18 +++---- .../services/HealthStatusManagerTest.java | 2 +- .../main/java/io/grpc/stub/ClientCalls.java | 20 ++++---- .../main/java/io/grpc/stub/MetadataUtils.java | 4 +- .../main/java/io/grpc/stub/ServerCalls.java | 10 ++-- .../java/io/grpc/stub/ClientCallsTest.java | 24 ++++----- .../java/io/grpc/stub/ServerCallsTest.java | 26 +++++----- .../testing/protobuf/SimpleServiceTest.java | 2 +- .../testing/AbstractTransportTest.java | 12 ++--- .../grpc/internal/testing/StatsTestUtils.java | 2 +- .../grpc/internal/testing/StreamRecorder.java | 2 +- .../testing/TestClientStreamTracer.java | 6 +-- .../testing/TestServerStreamTracer.java | 2 +- .../internal/testing/TestStreamTracer.java | 8 +-- .../java/io/grpc/testing/StreamRecorder.java | 2 +- .../io/grpc/testing/GrpcServerRuleTest.java | 2 +- 145 files changed, 486 insertions(+), 489 deletions(-) diff --git a/alts/src/main/java/io/grpc/alts/internal/AltsHandshakerStub.java b/alts/src/main/java/io/grpc/alts/internal/AltsHandshakerStub.java index 5dc31919fe..d8da4061cc 100644 --- a/alts/src/main/java/io/grpc/alts/internal/AltsHandshakerStub.java +++ b/alts/src/main/java/io/grpc/alts/internal/AltsHandshakerStub.java @@ -29,7 +29,7 @@ class AltsHandshakerStub { private final StreamObserver reader = new Reader(); private final StreamObserver writer; private final ArrayBlockingQueue> responseQueue = - new ArrayBlockingQueue>(1); + new ArrayBlockingQueue<>(1); private final AtomicReference exceptionMessage = new AtomicReference<>(); AltsHandshakerStub(HandshakerServiceStub serviceStub) { diff --git a/alts/src/main/java/io/grpc/alts/internal/AltsTsiHandshaker.java b/alts/src/main/java/io/grpc/alts/internal/AltsTsiHandshaker.java index 3699abb8d5..c8978cfa41 100644 --- a/alts/src/main/java/io/grpc/alts/internal/AltsTsiHandshaker.java +++ b/alts/src/main/java/io/grpc/alts/internal/AltsTsiHandshaker.java @@ -99,7 +99,7 @@ public final class AltsTsiHandshaker implements TsiHandshaker { @Override public TsiPeer extractPeer() throws GeneralSecurityException { Preconditions.checkState(!isInProgress(), "Handshake is not complete."); - List> peerProperties = new ArrayList>(); + List> peerProperties = new ArrayList<>(); peerProperties.add( new TsiPeer.StringProperty( TSI_SERVICE_ACCOUNT_PEER_PROPERTY, diff --git a/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java b/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java index d474382bb9..7dbae59cf3 100644 --- a/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java +++ b/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java @@ -210,7 +210,7 @@ public class AltsProtocolNegotiatorTest { // Capture the protected data written to the wire. assertEquals(1, channel.outboundMessages().size()); - ByteBuf protectedData = channel.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 class AltsProtocolNegotiatorTest { // Read the protected message at the client and verify that it matches the original message. assertEquals(1, channel.inboundMessages().size()); - ByteBuf receivedData1 = channel.readInbound(); + ByteBuf receivedData1 = channel.readInbound(); int receivedLen1 = receivedData1.readableBytes(); byte[] receivedBytes = new byte[receivedLen1]; receivedData1.readBytes(receivedBytes, 0, receivedLen1); @@ -364,7 +364,7 @@ public class AltsProtocolNegotiatorTest { private void doHandshake() throws Exception { // Capture the client frame and add to the server. assertEquals(1, channel.outboundMessages().size()); - ByteBuf clientFrame = channel.readOutbound(); + ByteBuf clientFrame = channel.readOutbound(); assertTrue(serverHandshaker.processBytesFromPeer(clientFrame)); // Get the server response handshake frames. @@ -374,7 +374,7 @@ public class AltsProtocolNegotiatorTest { // Capture the next client frame and add to the server. assertEquals(1, channel.outboundMessages().size()); - clientFrame = channel.readOutbound(); + clientFrame = channel.readOutbound(); assertTrue(serverHandshaker.processBytesFromPeer(clientFrame)); // Get the server response handshake frames. diff --git a/auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java b/auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java index 3b32d008c8..f2f4dc3bcc 100644 --- a/auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java +++ b/auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java @@ -221,7 +221,7 @@ public class GoogleAuthLibraryCallCredentialsTest { ListMultimap values = LinkedListMultimap.create(); values.put("Authorization", "token1"); when(credentials.getRequestMetadata(eq(expectedUri))) - .thenReturn(null, Multimaps.asMap(values), null); + .thenReturn(null, Multimaps.asMap(values), null); GoogleAuthLibraryCallCredentials callCredentials = new GoogleAuthLibraryCallCredentials(credentials); 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 37a817a3c3..c7ea3ab2d4 100644 --- a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java +++ b/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java @@ -432,7 +432,7 @@ public abstract class AbstractBenchmark { final ClientCall streamingCall = channel.newCall(pingPongMethod, CALL_OPTIONS); final AtomicReference> requestObserverRef = - new AtomicReference>(); + new AtomicReference<>(); final AtomicBoolean ignoreMessages = new AtomicBoolean(); StreamObserver requestObserver = ClientCalls.asyncBidiStreamingCall( streamingCall, @@ -486,7 +486,7 @@ public abstract class AbstractBenchmark { final ClientCall streamingCall = channel.newCall(flowControlledStreaming, CALL_OPTIONS); final AtomicReference> requestObserverRef = - new AtomicReference>(); + new AtomicReference<>(); final AtomicBoolean ignoreMessages = new AtomicBoolean(); StreamObserver requestObserver = ClientCalls.asyncBidiStreamingCall( streamingCall, diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadClient.java b/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadClient.java index f6779daa02..c25fb38fde 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadClient.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadClient.java @@ -379,7 +379,7 @@ class LoadClient { while (!shutdown) { maxOutstanding.acquireUninterruptibly(); final AtomicReference> requestObserver = - new AtomicReference>(); + new AtomicReference<>(); requestObserver.set(stub.streamingCall( new StreamObserver() { long now = System.nanoTime(); diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AbstractConfigurationBuilder.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AbstractConfigurationBuilder.java index 59624a4cea..fc74b1706e 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AbstractConfigurationBuilder.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AbstractConfigurationBuilder.java @@ -109,7 +109,7 @@ public abstract class AbstractConfigurationBuilder public final T build(String[] args) { T config = newConfiguration(); Map paramMap = getParamMap(); - Set appliedParams = new TreeSet(CASE_INSENSITIVE_ORDER); + Set appliedParams = new TreeSet<>(CASE_INSENSITIVE_ORDER); for (String arg : args) { if (!arg.startsWith("--")) { @@ -197,7 +197,7 @@ public abstract class AbstractConfigurationBuilder protected abstract T build0(T config); private Map getParamMap() { - Map map = new TreeMap(CASE_INSENSITIVE_ORDER); + Map map = new TreeMap<>(CASE_INSENSITIVE_ORDER); for (Param param : getParams()) { map.put(param.getName(), param); } diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncClient.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncClient.java index e453dd8bc9..c740c9cde0 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncClient.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncClient.java @@ -122,7 +122,7 @@ public class AsyncClient { long endTime) throws Exception { // Initiate the concurrent calls List> futures = - new ArrayList>(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); diff --git a/benchmarks/src/test/java/io/grpc/benchmarks/driver/LoadWorkerTest.java b/benchmarks/src/test/java/io/grpc/benchmarks/driver/LoadWorkerTest.java index a9de21f681..2f8b7a0ea2 100644 --- a/benchmarks/src/test/java/io/grpc/benchmarks/driver/LoadWorkerTest.java +++ b/benchmarks/src/test/java/io/grpc/benchmarks/driver/LoadWorkerTest.java @@ -59,7 +59,7 @@ public class LoadWorkerTest { worker.start(); channel = NettyChannelBuilder.forAddress("localhost", port).usePlaintext().build(); workerServiceStub = WorkerServiceGrpc.newStub(channel); - marksQueue = new LinkedBlockingQueue(); + marksQueue = new LinkedBlockingQueue<>(); } @Test diff --git a/context/src/jmh/java/io/grpc/ReadBenchmark.java b/context/src/jmh/java/io/grpc/ReadBenchmark.java index fa078ce79a..8046008bec 100644 --- a/context/src/jmh/java/io/grpc/ReadBenchmark.java +++ b/context/src/jmh/java/io/grpc/ReadBenchmark.java @@ -33,7 +33,7 @@ public class ReadBenchmark { @State(Scope.Benchmark) public static class ContextState { - List> keys = new ArrayList>(); + List> keys = new ArrayList<>(); List contexts = new ArrayList<>(); @Setup diff --git a/context/src/main/java/io/grpc/Context.java b/context/src/main/java/io/grpc/Context.java index 4df0e0f6c7..abb09427f9 100644 --- a/context/src/main/java/io/grpc/Context.java +++ b/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, Object> EMPTY_ENTRIES = - new PersistentHashArrayMappedTrie, 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 = new AtomicReference(); + private static final AtomicReference storage = new AtomicReference<>(); // For testing static Storage storage() { @@ -159,7 +159,7 @@ public class Context { * the name is intended for debugging purposes and does not impact behavior. */ public static Key key(String name) { - return new Key(name); + return new Key<>(name); } /** @@ -167,7 +167,7 @@ public class Context { * have the same name; the name is intended for debugging purposes and does not impact behavior. */ public static Key keyWithDefault(String name, T defaultValue) { - return new Key(name, defaultValue); + return new Key<>(name, defaultValue); } /** diff --git a/context/src/main/java/io/grpc/PersistentHashArrayMappedTrie.java b/context/src/main/java/io/grpc/PersistentHashArrayMappedTrie.java index 8c5b053233..72ef37bf91 100644 --- a/context/src/main/java/io/grpc/PersistentHashArrayMappedTrie.java +++ b/context/src/main/java/io/grpc/PersistentHashArrayMappedTrie.java @@ -62,9 +62,9 @@ final class PersistentHashArrayMappedTrie { */ public PersistentHashArrayMappedTrie put(K key, V value) { if (root == null) { - return new PersistentHashArrayMappedTrie(new Leaf(key, value)); + return new PersistentHashArrayMappedTrie<>(new Leaf<>(key, value)); } else { - return new PersistentHashArrayMappedTrie(root.put(key, value, key.hashCode(), 0)); + return new PersistentHashArrayMappedTrie<>(root.put(key, value, key.hashCode(), 0)); } } @@ -99,13 +99,13 @@ final class PersistentHashArrayMappedTrie { if (thisHash != hash) { // Insert return CompressedIndex.combine( - new Leaf(key, value), hash, this, thisHash, bitsConsumed); + new Leaf<>(key, value), hash, this, thisHash, bitsConsumed); } else if (this.key == key) { // Replace - return new Leaf(key, value); + return new Leaf<>(key, value); } else { // Hash collision - return new CollisionLeaf(this.key, this.value, key, value); + return new CollisionLeaf<>(this.key, this.value, key, value); } } @@ -158,21 +158,21 @@ final class PersistentHashArrayMappedTrie { if (thisHash != hash) { // Insert return CompressedIndex.combine( - new Leaf(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(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(newKeys, newValues); + return new CollisionLeaf<>(newKeys, newValues); } } @@ -238,14 +238,14 @@ final class PersistentHashArrayMappedTrie { @SuppressWarnings("unchecked") Node[] newValues = (Node[]) new Node[values.length + 1]; System.arraycopy(values, 0, newValues, 0, compressedIndex); - newValues[compressedIndex] = new Leaf(key, value); + newValues[compressedIndex] = new Leaf<>(key, value); System.arraycopy( values, compressedIndex, newValues, compressedIndex + 1, values.length - compressedIndex); - return new CompressedIndex(newBitmap, newValues, size() + 1); + return new CompressedIndex<>(newBitmap, newValues, size() + 1); } else { // Replace Node[] newValues = Arrays.copyOf(values, values.length); @@ -254,7 +254,7 @@ final class PersistentHashArrayMappedTrie { int newSize = size(); newSize += newValues[compressedIndex].size(); newSize -= values[compressedIndex].size(); - return new CompressedIndex(bitmap, newValues, newSize); + return new CompressedIndex<>(bitmap, newValues, newSize); } } @@ -267,7 +267,7 @@ final class PersistentHashArrayMappedTrie { Node node = combine(node1, hash1, node2, hash2, bitsConsumed + BITS); @SuppressWarnings("unchecked") Node[] values = (Node[]) new Node[] {node}; - return new CompressedIndex(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 @@ final class PersistentHashArrayMappedTrie { } @SuppressWarnings("unchecked") Node[] values = (Node[]) new Node[] {node1, node2}; - return new CompressedIndex(indexBit1 | indexBit2, values, node1.size() + node2.size()); + return new CompressedIndex<>(indexBit1 | indexBit2, values, node1.size() + node2.size()); } } diff --git a/context/src/main/java/io/grpc/ThreadLocalContextStorage.java b/context/src/main/java/io/grpc/ThreadLocalContextStorage.java index 6b19f00348..63f560462a 100644 --- a/context/src/main/java/io/grpc/ThreadLocalContextStorage.java +++ b/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 localContext = new ThreadLocal(); + static final ThreadLocal localContext = new ThreadLocal<>(); @Override public Context doAttach(Context toAttach) { diff --git a/context/src/test/java/io/grpc/ContextTest.java b/context/src/test/java/io/grpc/ContextTest.java index c0b8f96970..56ba22b2a7 100644 --- a/context/src/test/java/io/grpc/ContextTest.java +++ b/context/src/test/java/io/grpc/ContextTest.java @@ -166,7 +166,7 @@ public class ContextTest { @Test public void detachingNonCurrentLogsSevereMessage() { - final AtomicReference logRef = new AtomicReference(); + final AtomicReference logRef = new AtomicReference<>(); Handler handler = new Handler() { @Override public void publish(LogRecord record) { @@ -284,9 +284,9 @@ public class ContextTest { } Context.CancellableContext base = Context.current().withCancellation(); - final AtomicReference observed1 = new AtomicReference(); + final AtomicReference observed1 = new AtomicReference<>(); base.addListener(new SetContextCancellationListener(observed1), MoreExecutors.directExecutor()); - final AtomicReference observed2 = new AtomicReference(); + final AtomicReference observed2 = new AtomicReference<>(); base.addListener(new SetContextCancellationListener(observed2), MoreExecutors.directExecutor()); assertNull(observed1.get()); assertNull(observed2.get()); @@ -294,14 +294,14 @@ public class ContextTest { assertSame(base, observed1.get()); assertSame(base, observed2.get()); - final AtomicReference observed3 = new AtomicReference(); + final AtomicReference observed3 = new AtomicReference<>(); base.addListener(new SetContextCancellationListener(observed3), MoreExecutors.directExecutor()); assertSame(base, observed3.get()); } @Test public void exceptionOfExecutorDoesntThrow() { - final AtomicReference loggedThrowable = new AtomicReference(); + final AtomicReference loggedThrowable = new AtomicReference<>(); Handler logHandler = new Handler() { @Override public void publish(LogRecord record) { @@ -325,7 +325,7 @@ public class ContextTest { logger.addHandler(logHandler); try { Context.CancellableContext base = Context.current().withCancellation(); - final AtomicReference observed1 = new AtomicReference(); + final AtomicReference observed1 = new AtomicReference<>(); final Error err = new Error(); base.addListener(cancellationListener, new Executor() { @Override @@ -342,7 +342,7 @@ public class ContextTest { final Error err2 = new Error(); loggedThrowable.set(null); - final AtomicReference observed2 = new AtomicReference(); + final AtomicReference observed2 = new AtomicReference<>(); base.addListener(cancellationListener, new Executor() { @Override public void execute(Runnable runnable) { @@ -596,7 +596,7 @@ public class ContextTest { assertSame(parent.getDeadline(), sooner); assertSame(child.getDeadline(), sooner); final CountDownLatch latch = new CountDownLatch(1); - final AtomicReference error = new AtomicReference(); + final AtomicReference error = new AtomicReference<>(); child.addListener(new Context.CancellationListener() { @Override public void cancelled(Context context) { @@ -709,7 +709,7 @@ public class ContextTest { } private static class QueuedExecutor implements Executor { - private final Queue runnables = new ArrayDeque(); + private final Queue runnables = new ArrayDeque<>(); @Override public void execute(Runnable r) { @@ -939,7 +939,7 @@ public class ContextTest { @Test public void errorWhenAncestryLengthLong() { - final AtomicReference logRef = new AtomicReference(); + final AtomicReference logRef = new AtomicReference<>(); Handler handler = new Handler() { @Override public void publish(LogRecord record) { diff --git a/context/src/test/java/io/grpc/PersistentHashArrayMappedTrieTest.java b/context/src/test/java/io/grpc/PersistentHashArrayMappedTrieTest.java index c91800541f..f02c2916e3 100644 --- a/context/src/test/java/io/grpc/PersistentHashArrayMappedTrieTest.java +++ b/context/src/test/java/io/grpc/PersistentHashArrayMappedTrieTest.java @@ -35,7 +35,7 @@ public class PersistentHashArrayMappedTrieTest { Key key = new Key(0); Object value1 = new Object(); Object value2 = new Object(); - Leaf leaf = new Leaf(key, value1); + Leaf leaf = new Leaf<>(key, value1); Node ret = leaf.put(key, value2, key.hashCode(), 0); assertTrue(ret instanceof Leaf); assertSame(value2, ret.get(key, key.hashCode(), 0)); @@ -52,7 +52,7 @@ public class PersistentHashArrayMappedTrieTest { Key key2 = new Key(0); Object value1 = new Object(); Object value2 = new Object(); - Leaf leaf = new Leaf(key1, value1); + Leaf leaf = new Leaf<>(key1, value1); Node ret = leaf.put(key2, value2, key2.hashCode(), 0); assertTrue(ret instanceof CollisionLeaf); assertSame(value1, ret.get(key1, key1.hashCode(), 0)); @@ -71,7 +71,7 @@ public class PersistentHashArrayMappedTrieTest { Key key2 = new Key(1); Object value1 = new Object(); Object value2 = new Object(); - Leaf leaf = new Leaf(key1, value1); + Leaf leaf = new Leaf<>(key1, value1); Node ret = leaf.put(key2, value2, key2.hashCode(), 0); assertTrue(ret instanceof CompressedIndex); assertSame(value1, ret.get(key1, key1.hashCode(), 0)); @@ -87,12 +87,12 @@ public class PersistentHashArrayMappedTrieTest { @Test(expected = AssertionError.class) public void collisionLeaf_assertKeysDifferent() { Key key1 = new Key(0); - new CollisionLeaf(key1, new Object(), key1, new Object()); + new CollisionLeaf<>(key1, new Object(), key1, new Object()); } @Test(expected = AssertionError.class) public void collisionLeaf_assertHashesSame() { - new CollisionLeaf(new Key(0), new Object(), new Key(1), new Object()); + new CollisionLeaf<>(new Key(0), new Object(), new Key(1), new Object()); } @Test @@ -104,7 +104,7 @@ public class PersistentHashArrayMappedTrieTest { Object value2 = new Object(); Object insertValue = new Object(); CollisionLeaf leaf = - new CollisionLeaf(key1, value1, key2, value2); + new CollisionLeaf<>(key1, value1, key2, value2); Node ret = leaf.put(insertKey, insertValue, insertKey.hashCode(), 0); assertTrue(ret instanceof CompressedIndex); @@ -127,7 +127,7 @@ public class PersistentHashArrayMappedTrieTest { Key key = new Key(replaceKey.hashCode()); Object value = new Object(); CollisionLeaf leaf = - new CollisionLeaf(replaceKey, originalValue, key, value); + new CollisionLeaf<>(replaceKey, originalValue, key, value); Object replaceValue = new Object(); Node ret = leaf.put(replaceKey, replaceValue, replaceKey.hashCode(), 0); assertTrue(ret instanceof CollisionLeaf); @@ -150,7 +150,7 @@ public class PersistentHashArrayMappedTrieTest { Object value2 = new Object(); Object value3 = new Object(); CollisionLeaf leaf = - new CollisionLeaf(key1, value1, key2, value2); + new CollisionLeaf<>(key1, value1, key2, value2); Node ret = leaf.put(key3, value3, key3.hashCode(), 0); assertTrue(ret instanceof CollisionLeaf); @@ -172,8 +172,8 @@ public class PersistentHashArrayMappedTrieTest { final Key key2 = new Key(19); final Object value1 = new Object(); final Object value2 = new Object(); - Leaf leaf1 = new Leaf(key1, value1); - Leaf leaf2 = new Leaf(key2, value2); + Leaf leaf1 = new Leaf<>(key1, value1); + Leaf leaf2 = new Leaf<>(key2, value2); class Verifier { private void verify(Node ret) { CompressedIndex collisionLeaf = (CompressedIndex) ret; @@ -203,8 +203,8 @@ public class PersistentHashArrayMappedTrieTest { final Key key2 = new Key(31 << 5 | 1); // 5 bit regions: (31, 1) final Object value1 = new Object(); final Object value2 = new Object(); - Leaf leaf1 = new Leaf(key1, value1); - Leaf leaf2 = new Leaf(key2, value2); + Leaf leaf1 = new Leaf<>(key1, value1); + Leaf leaf2 = new Leaf<>(key2, value2); class Verifier { private void verify(Node ret) { CompressedIndex collisionInternal = (CompressedIndex) ret; diff --git a/core/src/jmh/java/io/grpc/CallOptionsBenchmark.java b/core/src/jmh/java/io/grpc/CallOptionsBenchmark.java index cc426e50f5..663a0b14bf 100644 --- a/core/src/jmh/java/io/grpc/CallOptionsBenchmark.java +++ b/core/src/jmh/java/io/grpc/CallOptionsBenchmark.java @@ -49,7 +49,7 @@ public class CallOptionsBenchmark { */ @Setup public void setUp() throws Exception { - customOptions = new ArrayList>(customOptionsCount); + customOptions = new ArrayList<>(customOptionsCount); for (int i = 0; i < customOptionsCount; i++) { customOptions.add(CallOptions.Key.createWithDefault("name " + i, "defaultvalue")); } @@ -59,7 +59,7 @@ public class CallOptionsBenchmark { allOpts = allOpts.withOption(customOptions.get(i), "value"); } - shuffledCustomOptions = new ArrayList>(customOptions); + shuffledCustomOptions = new ArrayList<>(customOptions); // Make the shuffling deterministic Collections.shuffle(shuffledCustomOptions, new Random(1)); } diff --git a/core/src/jmh/java/io/grpc/internal/StatsTraceContextBenchmark.java b/core/src/jmh/java/io/grpc/internal/StatsTraceContextBenchmark.java index 80ed9fc820..0eda9b87f3 100644 --- a/core/src/jmh/java/io/grpc/internal/StatsTraceContextBenchmark.java +++ b/core/src/jmh/java/io/grpc/internal/StatsTraceContextBenchmark.java @@ -40,7 +40,7 @@ public class StatsTraceContextBenchmark { private final Metadata emptyMetadata = new Metadata(); private final List serverStreamTracerFactories = - Collections.emptyList(); + Collections.emptyList(); /** * Javadoc comment. diff --git a/core/src/main/java/io/grpc/Attributes.java b/core/src/main/java/io/grpc/Attributes.java index 411d11c337..7ae4612c0a 100644 --- a/core/src/main/java/io/grpc/Attributes.java +++ b/core/src/main/java/io/grpc/Attributes.java @@ -135,7 +135,7 @@ public final class Attributes { */ @Deprecated public static Key of(String debugString) { - return new Key(debugString); + return new Key<>(debugString); } /** @@ -146,7 +146,7 @@ public final class Attributes { * @return Key object */ public static Key create(String debugString) { - return new Key(debugString); + return new Key<>(debugString); } } @@ -222,7 +222,7 @@ public final class Attributes { private Map, Object> data(int size) { if (newdata == null) { - newdata = new IdentityHashMap, Object>(size); + newdata = new IdentityHashMap<>(size); } return newdata; } diff --git a/core/src/main/java/io/grpc/CallOptions.java b/core/src/main/java/io/grpc/CallOptions.java index 469de34abb..5e5f6ef31e 100644 --- a/core/src/main/java/io/grpc/CallOptions.java +++ b/core/src/main/java/io/grpc/CallOptions.java @@ -216,7 +216,7 @@ public final class CallOptions { public CallOptions withStreamTracerFactory(ClientStreamTracer.Factory factory) { CallOptions newOptions = new CallOptions(this); ArrayList newList = - new ArrayList(streamTracerFactories.size() + 1); + new ArrayList<>(streamTracerFactories.size() + 1); newList.addAll(streamTracerFactories); newList.add(factory); newOptions.streamTracerFactories = Collections.unmodifiableList(newList); @@ -269,7 +269,7 @@ public final class CallOptions { @Deprecated public static Key of(String debugString, T defaultValue) { Preconditions.checkNotNull(debugString, "debugString"); - return new Key(debugString, defaultValue); + return new Key<>(debugString, defaultValue); } /** @@ -283,7 +283,7 @@ public final class CallOptions { */ public static Key create(String debugString) { Preconditions.checkNotNull(debugString, "debugString"); - return new Key(debugString, /*defaultValue=*/ null); + return new Key<>(debugString, /*defaultValue=*/ null); } /** @@ -297,7 +297,7 @@ public final class CallOptions { */ public static Key createWithDefault(String debugString, T defaultValue) { Preconditions.checkNotNull(debugString, "debugString"); - return new Key(debugString, defaultValue); + return new Key<>(debugString, defaultValue); } } diff --git a/core/src/main/java/io/grpc/CompressorRegistry.java b/core/src/main/java/io/grpc/CompressorRegistry.java index e0124af823..4711f6917d 100644 --- a/core/src/main/java/io/grpc/CompressorRegistry.java +++ b/core/src/main/java/io/grpc/CompressorRegistry.java @@ -53,7 +53,7 @@ public final class CompressorRegistry { @VisibleForTesting CompressorRegistry(Compressor ...cs) { - compressors = new ConcurrentHashMap(); + compressors = new ConcurrentHashMap<>(); for (Compressor c : cs) { compressors.put(c.getMessageEncoding(), c); } diff --git a/core/src/main/java/io/grpc/Contexts.java b/core/src/main/java/io/grpc/Contexts.java index 04f2fd034b..c62ffc80a3 100644 --- a/core/src/main/java/io/grpc/Contexts.java +++ b/core/src/main/java/io/grpc/Contexts.java @@ -48,7 +48,7 @@ public final class Contexts { ServerCallHandler next) { Context previous = context.attach(); try { - return new ContextualizedServerCallListener( + return new ContextualizedServerCallListener<>( next.startCall(call, headers), context); } finally { diff --git a/core/src/main/java/io/grpc/DecompressorRegistry.java b/core/src/main/java/io/grpc/DecompressorRegistry.java index 72926d2a91..305c5700aa 100644 --- a/core/src/main/java/io/grpc/DecompressorRegistry.java +++ b/core/src/main/java/io/grpc/DecompressorRegistry.java @@ -74,7 +74,7 @@ public final class DecompressorRegistry { newSize++; } Map newDecompressors = - new LinkedHashMap(newSize); + new LinkedHashMap<>(newSize); for (DecompressorInfo di : parent.decompressors.values()) { String previousEncoding = di.decompressor.getMessageEncoding(); if (!previousEncoding.equals(encoding)) { @@ -90,7 +90,7 @@ public final class DecompressorRegistry { } private DecompressorRegistry() { - decompressors = new LinkedHashMap(0); + decompressors = new LinkedHashMap<>(0); advertisedDecompressors = new byte[0]; } @@ -115,7 +115,7 @@ public final class DecompressorRegistry { */ @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1704") public Set getAdvertisedMessageEncodings() { - Set advertisedDecompressors = new HashSet(decompressors.size()); + Set advertisedDecompressors = new HashSet<>(decompressors.size()); for (Entry entry : decompressors.entrySet()) { if (entry.getValue().advertised) { advertisedDecompressors.add(entry.getKey()); diff --git a/core/src/main/java/io/grpc/InternalChannelz.java b/core/src/main/java/io/grpc/InternalChannelz.java index 5517a75839..2ccbd4a491 100644 --- a/core/src/main/java/io/grpc/InternalChannelz.java +++ b/core/src/main/java/io/grpc/InternalChannelz.java @@ -50,16 +50,16 @@ public final class InternalChannelz { private static final InternalChannelz INSTANCE = new InternalChannelz(); private final ConcurrentNavigableMap> servers - = new ConcurrentSkipListMap>(); + = new ConcurrentSkipListMap<>(); private final ConcurrentNavigableMap> rootChannels - = new ConcurrentSkipListMap>(); + = new ConcurrentSkipListMap<>(); private final ConcurrentMap> subchannels - = new ConcurrentHashMap>(); + = new ConcurrentHashMap<>(); // An InProcessTransport can appear in both otherSockets and perServerSockets simultaneously private final ConcurrentMap> otherSockets - = new ConcurrentHashMap>(); + = new ConcurrentHashMap<>(); private final ConcurrentMap perServerSockets - = new ConcurrentHashMap(); + = new ConcurrentHashMap<>(); // A convenience class to avoid deeply nested types. private static final class ServerSocketMap @@ -144,7 +144,7 @@ public final class InternalChannelz { /** Returns a {@link RootChannelList}. */ public RootChannelList getRootChannels(long fromId, int maxPageSize) { List> channelList - = new ArrayList>(); + = new ArrayList<>(); Iterator> iterator = rootChannels.tailMap(fromId).values().iterator(); @@ -169,7 +169,7 @@ public final class InternalChannelz { /** Returns a server list. */ public ServerList getServers(long fromId, int maxPageSize) { List> serverList - = new ArrayList>(maxPageSize); + = new ArrayList<>(maxPageSize); Iterator> iterator = servers.tailMap(fromId).values().iterator(); @@ -992,11 +992,11 @@ public final class InternalChannelz { this.soTimeoutMillis = timeoutMillis; this.lingerSeconds = lingerSeconds; this.tcpInfo = tcpInfo; - this.others = Collections.unmodifiableMap(new HashMap(others)); + this.others = Collections.unmodifiableMap(new HashMap<>(others)); } public static final class Builder { - private final Map others = new HashMap(); + private final Map others = new HashMap<>(); private TcpInfo tcpInfo; private Integer timeoutMillis; diff --git a/core/src/main/java/io/grpc/LoadBalancerRegistry.java b/core/src/main/java/io/grpc/LoadBalancerRegistry.java index 81c7310573..a215c4108d 100644 --- a/core/src/main/java/io/grpc/LoadBalancerRegistry.java +++ b/core/src/main/java/io/grpc/LoadBalancerRegistry.java @@ -45,9 +45,9 @@ public final class LoadBalancerRegistry { private static final Iterable> HARDCODED_CLASSES = getHardCodedClasses(); private final LinkedHashSet allProviders = - new LinkedHashSet(); + new LinkedHashSet<>(); private final LinkedHashMap effectiveProviders = - new LinkedHashMap(); + new LinkedHashMap<>(); /** * Register a provider. @@ -131,7 +131,7 @@ public final class LoadBalancerRegistry { */ @VisibleForTesting synchronized Map providers() { - return new LinkedHashMap(effectiveProviders); + return new LinkedHashMap<>(effectiveProviders); } @VisibleForTesting @@ -139,7 +139,7 @@ public final class LoadBalancerRegistry { // Class.forName(String) is used to remove the need for ProGuard configuration. Note that // ProGuard does not detect usages of Class.forName(String, boolean, ClassLoader): // https://sourceforge.net/p/proguard/bugs/418/ - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); try { list.add(Class.forName("io.grpc.internal.PickFirstLoadBalancerProvider")); } catch (ClassNotFoundException e) { diff --git a/core/src/main/java/io/grpc/ManagedChannelProvider.java b/core/src/main/java/io/grpc/ManagedChannelProvider.java index 3455440f24..26e29727bc 100644 --- a/core/src/main/java/io/grpc/ManagedChannelProvider.java +++ b/core/src/main/java/io/grpc/ManagedChannelProvider.java @@ -102,7 +102,7 @@ public abstract class ManagedChannelProvider { private static final class HardcodedClasses implements Iterable> { @Override public Iterator> iterator() { - List> list = new ArrayList>(); + List> list = new ArrayList<>(); try { list.add(Class.forName("io.grpc.okhttp.OkHttpChannelProvider")); } catch (ClassNotFoundException ex) { diff --git a/core/src/main/java/io/grpc/Metadata.java b/core/src/main/java/io/grpc/Metadata.java index 7f97f7f61f..c7559d5d6b 100644 --- a/core/src/main/java/io/grpc/Metadata.java +++ b/core/src/main/java/io/grpc/Metadata.java @@ -253,7 +253,7 @@ public final class Metadata { public Iterable getAll(final Key key) { for (int i = 0; i < size; i++) { if (bytesEqual(key.asciiName(), name(i))) { - return new IterableAt(key, i); + return new IterableAt<>(key, i); } } return null; @@ -269,7 +269,7 @@ public final class Metadata { if (isEmpty()) { return Collections.emptySet(); } - Set ks = new HashSet(size); + Set ks = new HashSet<>(size); for (int i = 0; i < size; i++) { ks.add(new String(name(i), 0 /* hibyte */)); } @@ -442,7 +442,7 @@ public final class Metadata { public void merge(Metadata other, Set> keys) { Preconditions.checkNotNull(other, "other"); // Use ByteBuffer for equals and hashCode. - Map> asciiKeys = new HashMap>(keys.size()); + Map> asciiKeys = new HashMap<>(keys.size()); for (Key key : keys) { asciiKeys.put(ByteBuffer.wrap(key.asciiName()), key); } @@ -576,7 +576,7 @@ public final class Metadata { * end with {@link #BINARY_HEADER_SUFFIX}. */ public static Key of(String name, BinaryMarshaller marshaller) { - return new BinaryKey(name, marshaller); + return new BinaryKey<>(name, marshaller); } /** @@ -590,11 +590,11 @@ public final class Metadata { } static Key of(String name, boolean pseudo, AsciiMarshaller marshaller) { - return new AsciiKey(name, pseudo, marshaller); + return new AsciiKey<>(name, pseudo, marshaller); } static Key of(String name, boolean pseudo, TrustedAsciiMarshaller marshaller) { - return new TrustedAsciiKey(name, pseudo, marshaller); + return new TrustedAsciiKey<>(name, pseudo, marshaller); } private final String originalName; diff --git a/core/src/main/java/io/grpc/MethodDescriptor.java b/core/src/main/java/io/grpc/MethodDescriptor.java index 7d006b7968..e532e581b3 100644 --- a/core/src/main/java/io/grpc/MethodDescriptor.java +++ b/core/src/main/java/io/grpc/MethodDescriptor.java @@ -50,7 +50,7 @@ public final class MethodDescriptor { // Must be set to InternalKnownTransport.values().length // Not referenced to break the dependency. - private final AtomicReferenceArray rawMethodNames = new AtomicReferenceArray(1); + private final AtomicReferenceArray rawMethodNames = new AtomicReferenceArray<>(1); /** @@ -211,7 +211,7 @@ public final class MethodDescriptor { MethodType type, String fullMethodName, Marshaller requestMarshaller, Marshaller responseMarshaller) { - return new MethodDescriptor( + return new MethodDescriptor<>( type, fullMethodName, requestMarshaller, responseMarshaller, null, false, false, false); } @@ -564,7 +564,7 @@ public final class MethodDescriptor { */ @CheckReturnValue public MethodDescriptor build() { - return new MethodDescriptor( + return new MethodDescriptor<>( type, fullMethodName, requestMarshaller, diff --git a/core/src/main/java/io/grpc/ServerInterceptors.java b/core/src/main/java/io/grpc/ServerInterceptors.java index 8f457554b3..dc1b0609d9 100644 --- a/core/src/main/java/io/grpc/ServerInterceptors.java +++ b/core/src/main/java/io/grpc/ServerInterceptors.java @@ -175,9 +175,9 @@ public final class ServerInterceptors { final ServerServiceDefinition serviceDef, final MethodDescriptor.Marshaller marshaller) { List> wrappedMethods = - new ArrayList>(); + new ArrayList<>(); List> wrappedDescriptors = - new ArrayList>(); + new ArrayList<>(); // Wrap the descriptors for (final ServerMethodDefinition definition : serviceDef.getMethods()) { final MethodDescriptor originalMethodDescriptor = definition.getMethodDescriptor(); @@ -210,7 +210,7 @@ public final class ServerInterceptors { static final class InterceptCallHandler implements ServerCallHandler { public static InterceptCallHandler create( ServerInterceptor interceptor, ServerCallHandler callHandler) { - return new InterceptCallHandler(interceptor, callHandler); + return new InterceptCallHandler<>(interceptor, callHandler); } private final ServerInterceptor interceptor; diff --git a/core/src/main/java/io/grpc/ServerMethodDefinition.java b/core/src/main/java/io/grpc/ServerMethodDefinition.java index 5163172a6e..b2f6ae7d83 100644 --- a/core/src/main/java/io/grpc/ServerMethodDefinition.java +++ b/core/src/main/java/io/grpc/ServerMethodDefinition.java @@ -41,7 +41,7 @@ public final class ServerMethodDefinition { public static ServerMethodDefinition create( MethodDescriptor method, ServerCallHandler handler) { - return new ServerMethodDefinition(method, handler); + return new ServerMethodDefinition<>(method, handler); } /** The {@code MethodDescriptor} for this method. */ @@ -62,6 +62,6 @@ public final class ServerMethodDefinition { */ public ServerMethodDefinition withServerCallHandler( ServerCallHandler handler) { - return new ServerMethodDefinition(method, handler); + return new ServerMethodDefinition<>(method, handler); } } diff --git a/core/src/main/java/io/grpc/ServerServiceDefinition.java b/core/src/main/java/io/grpc/ServerServiceDefinition.java index d0faa10b1d..3bcac57bd8 100644 --- a/core/src/main/java/io/grpc/ServerServiceDefinition.java +++ b/core/src/main/java/io/grpc/ServerServiceDefinition.java @@ -44,8 +44,7 @@ public final class ServerServiceDefinition { private ServerServiceDefinition( ServiceDescriptor serviceDescriptor, Map> methods) { this.serviceDescriptor = checkNotNull(serviceDescriptor, "serviceDescriptor"); - this.methods = - Collections.unmodifiableMap(new HashMap>(methods)); + this.methods = Collections.unmodifiableMap(new HashMap<>(methods)); } /** @@ -78,8 +77,7 @@ public final class ServerServiceDefinition { public static final class Builder { private final String serviceName; private final ServiceDescriptor serviceDescriptor; - private final Map> methods = - new HashMap>(); + private final Map> methods = new HashMap<>(); private Builder(String serviceName) { this.serviceName = checkNotNull(serviceName, "serviceName"); @@ -125,14 +123,13 @@ public final class ServerServiceDefinition { ServiceDescriptor serviceDescriptor = this.serviceDescriptor; if (serviceDescriptor == null) { List> methodDescriptors - = new ArrayList>(methods.size()); + = new ArrayList<>(methods.size()); for (ServerMethodDefinition serverMethod : methods.values()) { methodDescriptors.add(serverMethod.getMethodDescriptor()); } serviceDescriptor = new ServiceDescriptor(serviceName, methodDescriptors); } - Map> tmpMethods = - new HashMap>(methods); + Map> tmpMethods = new HashMap<>(methods); for (MethodDescriptor descriptorMethod : serviceDescriptor.getMethods()) { ServerMethodDefinition removed = tmpMethods.remove( descriptorMethod.getFullMethodName()); diff --git a/core/src/main/java/io/grpc/ServerStreamTracer.java b/core/src/main/java/io/grpc/ServerStreamTracer.java index d004352ea1..d522610ab3 100644 --- a/core/src/main/java/io/grpc/ServerStreamTracer.java +++ b/core/src/main/java/io/grpc/ServerStreamTracer.java @@ -94,7 +94,7 @@ public abstract class ServerStreamTracer extends StreamTracer { private static ReadOnlyServerCall create( ServerCallInfo callInfo) { - return new ReadOnlyServerCall(callInfo); + return new ReadOnlyServerCall<>(callInfo); } private ReadOnlyServerCall(ServerCallInfo callInfo) { diff --git a/core/src/main/java/io/grpc/ServiceDescriptor.java b/core/src/main/java/io/grpc/ServiceDescriptor.java index 8bb762e87e..57a6ff12cc 100644 --- a/core/src/main/java/io/grpc/ServiceDescriptor.java +++ b/core/src/main/java/io/grpc/ServiceDescriptor.java @@ -67,7 +67,7 @@ public final class ServiceDescriptor { private ServiceDescriptor(Builder b) { this.name = b.name; validateMethodNames(name, b.methods); - this.methods = Collections.unmodifiableList(new ArrayList>(b.methods)); + this.methods = Collections.unmodifiableList(new ArrayList<>(b.methods)); this.schemaDescriptor = b.schemaDescriptor; } @@ -107,7 +107,7 @@ public final class ServiceDescriptor { } static void validateMethodNames(String serviceName, Collection> methods) { - Set allNames = new HashSet(methods.size()); + Set allNames = new HashSet<>(methods.size()); for (MethodDescriptor method : methods) { checkNotNull(method, "method"); String methodServiceName = @@ -139,7 +139,7 @@ public final class ServiceDescriptor { } private String name; - private List> methods = new ArrayList>(); + private List> methods = new ArrayList<>(); private Object schemaDescriptor; /** diff --git a/core/src/main/java/io/grpc/Status.java b/core/src/main/java/io/grpc/Status.java index 6dec5653f9..1c4a301004 100644 --- a/core/src/main/java/io/grpc/Status.java +++ b/core/src/main/java/io/grpc/Status.java @@ -234,7 +234,7 @@ public final class Status { private static final List STATUS_LIST = buildStatusList(); private static List buildStatusList() { - TreeMap canonicalizer = new TreeMap(); + TreeMap canonicalizer = new TreeMap<>(); for (Code code : Code.values()) { Status replaced = canonicalizer.put(code.value(), new Status(code)); if (replaced != null) { diff --git a/core/src/main/java/io/grpc/SynchronizationContext.java b/core/src/main/java/io/grpc/SynchronizationContext.java index 9cbebe3934..7a41ed2d2d 100644 --- a/core/src/main/java/io/grpc/SynchronizationContext.java +++ b/core/src/main/java/io/grpc/SynchronizationContext.java @@ -56,7 +56,7 @@ public final class SynchronizationContext implements Executor { private final UncaughtExceptionHandler uncaughtExceptionHandler; @GuardedBy("lock") - private final Queue queue = new ArrayDeque(); + private final Queue queue = new ArrayDeque<>(); @GuardedBy("lock") private Thread drainingThread; diff --git a/core/src/main/java/io/grpc/inprocess/InProcessServer.java b/core/src/main/java/io/grpc/inprocess/InProcessServer.java index dbfbce71bd..b66e95b0a2 100644 --- a/core/src/main/java/io/grpc/inprocess/InProcessServer.java +++ b/core/src/main/java/io/grpc/inprocess/InProcessServer.java @@ -37,7 +37,7 @@ import javax.annotation.concurrent.ThreadSafe; @ThreadSafe final class InProcessServer implements InternalServer { private static final ConcurrentMap registry - = new ConcurrentHashMap(); + = new ConcurrentHashMap<>(); static InProcessServer findServer(String name) { return registry.get(name); diff --git a/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java b/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java index 742e439326..ed27f3f9e6 100644 --- a/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java +++ b/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java @@ -120,7 +120,7 @@ public final class InProcessServerBuilder */ public InProcessServerBuilder scheduledExecutorService( ScheduledExecutorService scheduledExecutorService) { - schedulerPool = new FixedObjectPool( + schedulerPool = new FixedObjectPool<>( checkNotNull(scheduledExecutorService, "scheduledExecutorService")); return this; } diff --git a/core/src/main/java/io/grpc/inprocess/InProcessTransport.java b/core/src/main/java/io/grpc/inprocess/InProcessTransport.java index 22ce616f25..a769827c07 100644 --- a/core/src/main/java/io/grpc/inprocess/InProcessTransport.java +++ b/core/src/main/java/io/grpc/inprocess/InProcessTransport.java @@ -91,7 +91,7 @@ final class InProcessTransport implements ServerTransport, ConnectionClientTrans @GuardedBy("this") private Status shutdownStatus; @GuardedBy("this") - private Set streams = new HashSet(); + private Set streams = new HashSet<>(); @GuardedBy("this") private List serverStreamTracerFactories; private final Attributes attributes = Attributes.newBuilder() @@ -368,7 +368,7 @@ final class InProcessTransport implements ServerTransport, ConnectionClientTrans private int clientRequested; @GuardedBy("this") private ArrayDeque clientReceiveQueue = - new ArrayDeque(); + new ArrayDeque<>(); @GuardedBy("this") private Status clientNotifyStatus; @GuardedBy("this") @@ -614,7 +614,7 @@ final class InProcessTransport implements ServerTransport, ConnectionClientTrans private int serverRequested; @GuardedBy("this") private ArrayDeque serverReceiveQueue = - new ArrayDeque(); + new ArrayDeque<>(); @GuardedBy("this") private boolean serverNotifyHalfClose; // Only is intended to prevent double-close when server closes. diff --git a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java index eb1c6b75f1..76ce3e57b8 100644 --- a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java +++ b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java @@ -209,7 +209,7 @@ public abstract class AbstractManagedChannelImplBuilder @Override public final T executor(Executor executor) { if (executor != null) { - this.executorPool = new FixedObjectPool(executor); + this.executorPool = new FixedObjectPool<>(executor); } else { this.executorPool = DEFAULT_EXECUTOR_POOL; } diff --git a/core/src/main/java/io/grpc/internal/ApplicationThreadDeframer.java b/core/src/main/java/io/grpc/internal/ApplicationThreadDeframer.java index 1efe4729e9..476933d6b9 100644 --- a/core/src/main/java/io/grpc/internal/ApplicationThreadDeframer.java +++ b/core/src/main/java/io/grpc/internal/ApplicationThreadDeframer.java @@ -41,7 +41,7 @@ public class ApplicationThreadDeframer implements Deframer, MessageDeframer.List private final TransportExecutor transportExecutor; /** Queue for messages returned by the deframer when deframing in the application thread. */ - private final Queue messageReadQueue = new ArrayDeque(); + private final Queue messageReadQueue = new ArrayDeque<>(); ApplicationThreadDeframer( MessageDeframer.Listener listener, diff --git a/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java b/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java index 8f5f4964f4..d35bf05cf9 100644 --- a/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java +++ b/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java @@ -33,7 +33,7 @@ import java.util.Queue; public class CompositeReadableBuffer extends AbstractReadableBuffer { private int readableBytes; - private final Queue buffers = new ArrayDeque(); + private final Queue buffers = new ArrayDeque<>(); /** * Adds a new {@link ReadableBuffer} at the end of the buffer list. After a buffer is added, it is diff --git a/core/src/main/java/io/grpc/internal/DelayedClientTransport.java b/core/src/main/java/io/grpc/internal/DelayedClientTransport.java index 76bffd0112..2d0cc8ec3c 100644 --- a/core/src/main/java/io/grpc/internal/DelayedClientTransport.java +++ b/core/src/main/java/io/grpc/internal/DelayedClientTransport.java @@ -65,7 +65,7 @@ final class DelayedClientTransport implements ManagedClientTransport { @Nonnull @GuardedBy("lock") - private Collection pendingStreams = new LinkedHashSet(); + private Collection pendingStreams = new LinkedHashSet<>(); /** * When {@code shutdownStatus != null && !hasPendingStreams()}, then the transport is considered @@ -240,7 +240,7 @@ final class DelayedClientTransport implements ManagedClientTransport { savedReportTransportTerminated = reportTransportTerminated; reportTransportTerminated = null; if (!pendingStreams.isEmpty()) { - pendingStreams = Collections.emptyList(); + pendingStreams = Collections.emptyList(); } } if (savedReportTransportTerminated != null) { @@ -322,7 +322,7 @@ final class DelayedClientTransport implements ManagedClientTransport { // Because delayed transport is long-lived, we take this opportunity to down-size the // hashmap. if (pendingStreams.isEmpty()) { - pendingStreams = new LinkedHashSet(); + pendingStreams = new LinkedHashSet<>(); } if (!hasPendingStreams()) { // There may be a brief gap between delayed transport clearing in-use state, and first real diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java index 9699cca2bd..cddd8e0b54 100644 --- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java +++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java @@ -417,7 +417,7 @@ final class DnsNameResolver extends NameResolver { @SuppressWarnings("unchecked") @VisibleForTesting static List> parseTxtResults(List txtRecords) { - List> serviceConfigs = new ArrayList>(); + List> serviceConfigs = new ArrayList<>(); for (String txtRecord : txtRecords) { if (txtRecord.startsWith(SERVICE_CONFIG_PREFIX)) { List> choices; diff --git a/core/src/main/java/io/grpc/internal/Http2Ping.java b/core/src/main/java/io/grpc/internal/Http2Ping.java index 1259d85f2b..6104d87637 100644 --- a/core/src/main/java/io/grpc/internal/Http2Ping.java +++ b/core/src/main/java/io/grpc/internal/Http2Ping.java @@ -51,7 +51,7 @@ public class Http2Ping { * The registered callbacks and the executor used to invoke them. */ @GuardedBy("this") private Map callbacks - = new LinkedHashMap(); + = new LinkedHashMap<>(); /** * False until the operation completes, either successfully (other side sent acknowledgement) or diff --git a/core/src/main/java/io/grpc/internal/InUseStateAggregator.java b/core/src/main/java/io/grpc/internal/InUseStateAggregator.java index 786baf77e7..88181fd512 100644 --- a/core/src/main/java/io/grpc/internal/InUseStateAggregator.java +++ b/core/src/main/java/io/grpc/internal/InUseStateAggregator.java @@ -25,7 +25,7 @@ import javax.annotation.concurrent.NotThreadSafe; @NotThreadSafe public abstract class InUseStateAggregator { - private final HashSet inUseObjects = new HashSet(); + private final HashSet inUseObjects = new HashSet<>(); /** * Update the in-use state of an object. Initially no object is in use. diff --git a/core/src/main/java/io/grpc/internal/InternalHandlerRegistry.java b/core/src/main/java/io/grpc/internal/InternalHandlerRegistry.java index 91f3311d62..db81d11393 100644 --- a/core/src/main/java/io/grpc/internal/InternalHandlerRegistry.java +++ b/core/src/main/java/io/grpc/internal/InternalHandlerRegistry.java @@ -57,7 +57,7 @@ final class InternalHandlerRegistry extends HandlerRegistry { // Store per-service first, to make sure services are added/replaced atomically. private final HashMap services = - new LinkedHashMap(); + new LinkedHashMap<>(); Builder addService(ServerServiceDefinition service) { services.put(service.getServiceDescriptor().getName(), service); @@ -66,7 +66,7 @@ final class InternalHandlerRegistry extends HandlerRegistry { InternalHandlerRegistry build() { Map> map = - new HashMap>(); + new HashMap<>(); for (ServerServiceDefinition service : services.values()) { for (ServerMethodDefinition method : service.getMethods()) { map.put(method.getMethodDescriptor().getFullMethodName(), method); diff --git a/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java b/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java index fb8e18d180..b661c0e3bb 100644 --- a/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java +++ b/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java @@ -251,7 +251,7 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol List records = new ArrayList<>(); @SuppressWarnings("JdkObsolete") - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable<>(); env.put("com.sun.jndi.ldap.connect.timeout", "5000"); env.put("com.sun.jndi.ldap.read.timeout", "5000"); DirContext dirContext = new InitialDirContext(env); diff --git a/core/src/main/java/io/grpc/internal/JsonParser.java b/core/src/main/java/io/grpc/internal/JsonParser.java index c6daf21363..90cbe44161 100644 --- a/core/src/main/java/io/grpc/internal/JsonParser.java +++ b/core/src/main/java/io/grpc/internal/JsonParser.java @@ -79,7 +79,7 @@ public final class JsonParser { private static Map parseJsonObject(JsonReader jr) throws IOException { jr.beginObject(); - Map obj = new LinkedHashMap(); + Map obj = new LinkedHashMap<>(); while (jr.hasNext()) { String name = jr.nextName(); Object value = parseRecursive(jr); diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java index 6a37fe56ce..020311e3c1 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java @@ -195,10 +195,10 @@ final class ManagedChannelImpl extends ManagedChannel implements // Must be mutated from syncContext // If any monitoring hook to be added later needs to get a snapshot of this Set, we could // switch to a ConcurrentHashMap. - private final Set subchannels = new HashSet(16, .75f); + private final Set subchannels = new HashSet<>(16, .75f); // Must be mutated from syncContext - private final Set oobChannels = new HashSet(1, .75f); + private final Set oobChannels = new HashSet<>(1, .75f); // reprocess() must be run from syncContext private final DelayedClientTransport delayedTransport; @@ -815,14 +815,14 @@ final class ManagedChannelImpl extends ManagedChannel implements @Override public ClientCall newCall(MethodDescriptor method, CallOptions callOptions) { - return new ClientCallImpl( - method, - getCallExecutor(callOptions), - callOptions, - transportProvider, - terminated ? null : transportFactory.getScheduledExecutorService(), - channelCallTracer, - retryEnabled) + return new ClientCallImpl<>( + method, + getCallExecutor(callOptions), + callOptions, + transportProvider, + terminated ? null : transportFactory.getScheduledExecutorService(), + channelCallTracer, + retryEnabled) .setFullStreamDecompression(fullStreamDecompression) .setDecompressorRegistry(decompressorRegistry) .setCompressorRegistry(compressorRegistry); diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java b/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java index 61f3fb9005..2e2c8eb4ea 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java @@ -30,10 +30,10 @@ import java.util.logging.Logger; final class ManagedChannelOrphanWrapper extends ForwardingManagedChannel { private static final ReferenceQueue refqueue = - new ReferenceQueue(); + new ReferenceQueue<>(); // Retain the References so they don't get GC'd private static final ConcurrentMap refs = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); private static final Logger logger = Logger.getLogger(ManagedChannelOrphanWrapper.class.getName()); @@ -89,7 +89,7 @@ final class ManagedChannelOrphanWrapper extends ForwardingManagedChannel { ReferenceQueue refqueue, ConcurrentMap refs) { super(orphanable, refqueue); - allocationSite = new SoftReference( + allocationSite = new SoftReference<>( ENABLE_ALLOCATION_TRACKING ? new RuntimeException("ManagedChannel allocation site") : missingCallSite); diff --git a/core/src/main/java/io/grpc/internal/OobChannel.java b/core/src/main/java/io/grpc/internal/OobChannel.java index d0366cdf5f..d1e3236126 100644 --- a/core/src/main/java/io/grpc/internal/OobChannel.java +++ b/core/src/main/java/io/grpc/internal/OobChannel.java @@ -191,7 +191,7 @@ final class OobChannel extends ManagedChannel implements InternalInstrumented ClientCall newCall( MethodDescriptor methodDescriptor, CallOptions callOptions) { - return new ClientCallImpl(methodDescriptor, + return new ClientCallImpl<>(methodDescriptor, callOptions.getExecutor() == null ? executor : callOptions.getExecutor(), callOptions, transportProvider, deadlineCancellationExecutor, channelCallsTracer, false /* retryEnabled */); diff --git a/core/src/main/java/io/grpc/internal/SerializeReentrantCallsDirectExecutor.java b/core/src/main/java/io/grpc/internal/SerializeReentrantCallsDirectExecutor.java index 685caf1306..85ce5137e8 100644 --- a/core/src/main/java/io/grpc/internal/SerializeReentrantCallsDirectExecutor.java +++ b/core/src/main/java/io/grpc/internal/SerializeReentrantCallsDirectExecutor.java @@ -74,7 +74,7 @@ class SerializeReentrantCallsDirectExecutor implements Executor { private void enqueue(Runnable r) { if (taskQueue == null) { - taskQueue = new ArrayDeque(4); + taskQueue = new ArrayDeque<>(4); } taskQueue.add(r); } diff --git a/core/src/main/java/io/grpc/internal/SerializingExecutor.java b/core/src/main/java/io/grpc/internal/SerializingExecutor.java index 9d9234e010..6ac57635cf 100644 --- a/core/src/main/java/io/grpc/internal/SerializingExecutor.java +++ b/core/src/main/java/io/grpc/internal/SerializingExecutor.java @@ -62,7 +62,7 @@ public final class SerializingExecutor implements Executor, Runnable { private final Executor executor; /** A list of Runnables to be run in order. */ - private final Queue runQueue = new ConcurrentLinkedQueue(); + private final Queue runQueue = new ConcurrentLinkedQueue<>(); private volatile int runState = STOPPED; diff --git a/core/src/main/java/io/grpc/internal/ServerCallImpl.java b/core/src/main/java/io/grpc/internal/ServerCallImpl.java index 24a852da53..0fc52ec34f 100644 --- a/core/src/main/java/io/grpc/internal/ServerCallImpl.java +++ b/core/src/main/java/io/grpc/internal/ServerCallImpl.java @@ -190,7 +190,7 @@ final class ServerCallImpl extends ServerCall { } ServerStreamListener newServerStreamListener(ServerCall.Listener listener) { - return new ServerStreamListenerImpl(this, listener, context); + return new ServerStreamListenerImpl<>(this, listener, context); } @Override diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java index 29a615df36..260c85a80e 100644 --- a/core/src/main/java/io/grpc/internal/ServerImpl.java +++ b/core/src/main/java/io/grpc/internal/ServerImpl.java @@ -554,7 +554,7 @@ public final class ServerImpl extends io.grpc.Server implements InternalInstrume Context.CancellableContext context, StatsTraceContext statsTraceCtx) { // TODO(ejona86): should we update fullMethodName to have the canonical path of the method? statsTraceCtx.serverCallStarted( - new ServerCallInfoImpl( + new ServerCallInfoImpl<>( methodDef.getMethodDescriptor(), // notify with original method descriptor stream.getAttributes(), stream.getAuthority())); @@ -574,7 +574,7 @@ public final class ServerImpl extends io.grpc.Server implements InternalInstrume ServerStream stream, Metadata headers, Context.CancellableContext context) { - ServerCallImpl call = new ServerCallImpl( + ServerCallImpl call = new ServerCallImpl<>( stream, methodDef.getMethodDescriptor(), headers, diff --git a/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java b/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java index 63e92ec709..0d35b4e353 100644 --- a/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java +++ b/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java @@ -54,10 +54,10 @@ final class ServiceConfigInterceptor implements ClientInterceptor { // Map from method name to MethodInfo @VisibleForTesting final AtomicReference> serviceMethodMap - = new AtomicReference>(); + = new AtomicReference<>(); @VisibleForTesting final AtomicReference> serviceMap - = new AtomicReference>(); + = new AtomicReference<>(); private final boolean retryEnabled; private final int maxRetryAttemptsLimit; @@ -74,8 +74,8 @@ final class ServiceConfigInterceptor implements ClientInterceptor { } void handleUpdate(@Nonnull Map serviceConfig) { - Map newServiceMethodConfigs = new HashMap(); - Map newServiceConfigs = new HashMap(); + Map newServiceMethodConfigs = new HashMap<>(); + Map newServiceConfigs = new HashMap<>(); // Try and do as much validation here before we swap out the existing configuration. In case // the input is invalid, we don't want to lose the existing configuration. diff --git a/core/src/main/java/io/grpc/internal/SharedResourceHolder.java b/core/src/main/java/io/grpc/internal/SharedResourceHolder.java index 39368141ef..40dbfeb9a5 100644 --- a/core/src/main/java/io/grpc/internal/SharedResourceHolder.java +++ b/core/src/main/java/io/grpc/internal/SharedResourceHolder.java @@ -53,7 +53,7 @@ public final class SharedResourceHolder { }); private final IdentityHashMap, Instance> instances = - new IdentityHashMap, Instance>(); + new IdentityHashMap<>(); private final ScheduledExecutorFactory destroyerFactory; diff --git a/core/src/main/java/io/grpc/internal/SharedResourcePool.java b/core/src/main/java/io/grpc/internal/SharedResourcePool.java index 57892720d3..b9b0e2cb3b 100644 --- a/core/src/main/java/io/grpc/internal/SharedResourcePool.java +++ b/core/src/main/java/io/grpc/internal/SharedResourcePool.java @@ -27,7 +27,7 @@ public final class SharedResourcePool implements ObjectPool { } public static SharedResourcePool forResource(SharedResourceHolder.Resource resource) { - return new SharedResourcePool(resource); + return new SharedResourcePool<>(resource); } @Override diff --git a/core/src/main/java/io/grpc/internal/SubchannelChannel.java b/core/src/main/java/io/grpc/internal/SubchannelChannel.java index da402c8fb9..9d5bfcec7d 100644 --- a/core/src/main/java/io/grpc/internal/SubchannelChannel.java +++ b/core/src/main/java/io/grpc/internal/SubchannelChannel.java @@ -106,7 +106,7 @@ final class SubchannelChannel extends Channel { public void sendMessage(RequestT message) {} }; } - return new ClientCallImpl(methodDescriptor, + return new ClientCallImpl<>(methodDescriptor, effectiveExecutor, callOptions.withOption(GrpcUtil.CALL_OPTIONS_RPC_OWNED_BY_BALANCER, Boolean.TRUE), transportProvider, deadlineCancellationExecutor, callsTracer, false /* retryEnabled */); diff --git a/core/src/main/java/io/grpc/util/MutableHandlerRegistry.java b/core/src/main/java/io/grpc/util/MutableHandlerRegistry.java index a068cdccf3..1e92341892 100644 --- a/core/src/main/java/io/grpc/util/MutableHandlerRegistry.java +++ b/core/src/main/java/io/grpc/util/MutableHandlerRegistry.java @@ -40,7 +40,7 @@ import javax.annotation.concurrent.ThreadSafe; @ExperimentalApi("https://github.com/grpc/grpc-java/issues/933") public final class MutableHandlerRegistry extends HandlerRegistry { private final ConcurrentMap services - = new ConcurrentHashMap(); + = new ConcurrentHashMap<>(); /** * Registers a service. diff --git a/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java b/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java index f8e083186e..7595c47373 100644 --- a/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java +++ b/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java @@ -72,7 +72,7 @@ final class RoundRobinLoadBalancer extends LoadBalancer { private final Helper helper; private final Map subchannels = - new HashMap(); + new HashMap<>(); private final Random random; private ConnectivityState currentState; @@ -122,11 +122,11 @@ final class RoundRobinLoadBalancer extends LoadBalancer { // after creation but since we can mutate the values we leverage that and set // AtomicReference which will allow mutating state info for given channel. .set(STATE_INFO, - new Ref(ConnectivityStateInfo.forNonError(IDLE))); + new Ref<>(ConnectivityStateInfo.forNonError(IDLE))); Ref stickyRef = null; if (stickinessState != null) { - subchannelAttrs.set(STICKY_REF, stickyRef = new Ref(null)); + subchannelAttrs.set(STICKY_REF, stickyRef = new Ref<>(null)); } Subchannel subchannel = checkNotNull( @@ -248,7 +248,7 @@ final class RoundRobinLoadBalancer extends LoadBalancer { * remove all attributes. */ private static Set stripAttrs(List groupList) { - Set addrs = new HashSet(groupList.size()); + Set addrs = new HashSet<>(groupList.size()); for (EquivalentAddressGroup group : groupList) { addrs.add(new EquivalentAddressGroup(group.getAddresses())); } @@ -271,7 +271,7 @@ final class RoundRobinLoadBalancer extends LoadBalancer { } private static Set setsDifference(Set a, Set b) { - Set aCopy = new HashSet(a); + Set aCopy = new HashSet<>(a); aCopy.removeAll(b); return aCopy; } @@ -293,9 +293,9 @@ final class RoundRobinLoadBalancer extends LoadBalancer { final Key key; final ConcurrentMap> stickinessMap = - new ConcurrentHashMap>(); + new ConcurrentHashMap<>(); - final Queue evictionQueue = new ConcurrentLinkedQueue(); + final Queue evictionQueue = new ConcurrentLinkedQueue<>(); StickinessState(@Nonnull String stickinessKey) { this.key = Key.of(stickinessKey, Metadata.ASCII_STRING_MARSHALLER); @@ -425,7 +425,7 @@ final class RoundRobinLoadBalancer extends LoadBalancer { // the lists cannot contain duplicate subchannels return other == this || (stickinessState == other.stickinessState && list.size() == other.list.size() - && new HashSet(list).containsAll(other.list)); + && new HashSet<>(list).containsAll(other.list)); } } diff --git a/core/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java b/core/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java index 0b890651db..bead2be4e9 100644 --- a/core/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java +++ b/core/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java @@ -56,7 +56,7 @@ public final class TransmitStatusRuntimeExceptionInterceptor implements ServerIn @Override public ServerCall.Listener interceptCall( ServerCall call, Metadata headers, ServerCallHandler next) { - final ServerCall serverCall = new SerializingServerCall(call); + final ServerCall serverCall = new SerializingServerCall<>(call); ServerCall.Listener listener = next.startCall(serverCall, headers); return new ForwardingServerCallListener.SimpleForwardingServerCallListener(listener) { @Override diff --git a/core/src/test/java/io/grpc/ContextsTest.java b/core/src/test/java/io/grpc/ContextsTest.java index 4a4ae3500c..3e91ca1207 100644 --- a/core/src/test/java/io/grpc/ContextsTest.java +++ b/core/src/test/java/io/grpc/ContextsTest.java @@ -48,7 +48,7 @@ public class ContextsTest { /** For use in comparing context by reference. */ private Context uniqueContext = Context.ROOT.withValue(contextKey, new Object()); @SuppressWarnings("unchecked") - private ServerCall call = new NoopServerCall(); + private ServerCall call = new NoopServerCall<>(); private Metadata headers = new Metadata(); @Test diff --git a/core/src/test/java/io/grpc/DecompressorRegistryTest.java b/core/src/test/java/io/grpc/DecompressorRegistryTest.java index 0430eb2e2c..f916e926e9 100644 --- a/core/src/test/java/io/grpc/DecompressorRegistryTest.java +++ b/core/src/test/java/io/grpc/DecompressorRegistryTest.java @@ -49,7 +49,7 @@ public class DecompressorRegistryTest { @Test public void getKnownMessageEncodings_checkDefaultMessageEncodingsExist() { - Set knownEncodings = new HashSet(); + Set knownEncodings = new HashSet<>(); knownEncodings.add("identity"); knownEncodings.add("gzip"); diff --git a/core/src/test/java/io/grpc/MetadataTest.java b/core/src/test/java/io/grpc/MetadataTest.java index 5ff97339bb..e2bdf667ae 100644 --- a/core/src/test/java/io/grpc/MetadataTest.java +++ b/core/src/test/java/io/grpc/MetadataTest.java @@ -140,7 +140,7 @@ public class MetadataTest { Metadata metadata = new Metadata(); metadata.put(KEY, lance); assertEquals(lance, metadata.get(KEY)); - Iterator fishes = metadata.getAll(KEY).iterator(); + Iterator fishes = metadata.getAll(KEY).iterator(); assertTrue(fishes.hasNext()); assertEquals(fishes.next(), lance); assertFalse(fishes.hasNext()); @@ -192,7 +192,7 @@ public class MetadataTest { h1.merge(h2); - Iterator fishes = h1.getAll(KEY).iterator(); + Iterator fishes = h1.getAll(KEY).iterator(); assertTrue(fishes.hasNext()); assertEquals(fishes.next(), lance); assertFalse(fishes.hasNext()); diff --git a/core/src/test/java/io/grpc/NameResolverProviderTest.java b/core/src/test/java/io/grpc/NameResolverProviderTest.java index efe4e9e330..10a529b4c3 100644 --- a/core/src/test/java/io/grpc/NameResolverProviderTest.java +++ b/core/src/test/java/io/grpc/NameResolverProviderTest.java @@ -41,7 +41,7 @@ public class NameResolverProviderTest { @Test public void getDefaultScheme_noProvider() { - List providers = Collections.emptyList(); + List providers = Collections.emptyList(); NameResolver.Factory factory = NameResolverProvider.asFactory(providers); try { factory.getDefaultScheme(); @@ -67,7 +67,7 @@ public class NameResolverProviderTest { @Test public void newNameResolver_noProvider() { - List providers = Collections.emptyList(); + List providers = Collections.emptyList(); NameResolver.Factory factory = NameResolverProvider.asFactory(providers); try { factory.newNameResolver(uri, attributes); diff --git a/core/src/test/java/io/grpc/ServerInterceptorsTest.java b/core/src/test/java/io/grpc/ServerInterceptorsTest.java index e34c9df28c..f81753c072 100644 --- a/core/src/test/java/io/grpc/ServerInterceptorsTest.java +++ b/core/src/test/java/io/grpc/ServerInterceptorsTest.java @@ -63,7 +63,7 @@ public class ServerInterceptorsTest { private MethodDescriptor flowMethod; - private ServerCall call = new NoopServerCall(); + private ServerCall call = new NoopServerCall<>(); private ServerServiceDefinition serviceDefinition; @@ -269,7 +269,7 @@ public class ServerInterceptorsTest { @Test public void argumentsPassed() { @SuppressWarnings("unchecked") - final ServerCall call2 = new NoopServerCall(); + final ServerCall call2 = new NoopServerCall<>(); @SuppressWarnings("unchecked") final ServerCall.Listener listener2 = mock(ServerCall.Listener.class); @@ -398,7 +398,7 @@ public class ServerInterceptorsTest { .intercept(inputStreamMessageService, interceptor2); ServerMethodDefinition serverMethod = (ServerMethodDefinition) intercepted2.getMethod("basic/wrapped"); - ServerCall call2 = new NoopServerCall(); + ServerCall call2 = new NoopServerCall<>(); byte[] bytes = {}; serverMethod .getServerCallHandler() @@ -425,7 +425,7 @@ public class ServerInterceptorsTest { } private ServerCallHandler anyCallHandler() { - return Mockito.>any(); + return Mockito.any(); } private static class NoopInterceptor implements ServerInterceptor { diff --git a/core/src/test/java/io/grpc/ServiceProvidersTestUtil.java b/core/src/test/java/io/grpc/ServiceProvidersTestUtil.java index aec493d573..f273d25d4a 100644 --- a/core/src/test/java/io/grpc/ServiceProvidersTestUtil.java +++ b/core/src/test/java/io/grpc/ServiceProvidersTestUtil.java @@ -41,7 +41,7 @@ final class ServiceProvidersTestUtil { String callableClassName, ClassLoader cl, Set hardcodedClassNames) throws Exception { - final Set notLoaded = new HashSet(hardcodedClassNames); + final Set notLoaded = new HashSet<>(hardcodedClassNames); cl = new ClassLoader(cl) { @Override public Class loadClass(String name, boolean resolve) throws ClassNotFoundException { diff --git a/core/src/test/java/io/grpc/SynchronizationContextTest.java b/core/src/test/java/io/grpc/SynchronizationContextTest.java index 66dfdbd4ee..9e9bf29b1d 100644 --- a/core/src/test/java/io/grpc/SynchronizationContextTest.java +++ b/core/src/test/java/io/grpc/SynchronizationContextTest.java @@ -99,8 +99,8 @@ public class SynchronizationContextTest { final CountDownLatch task1Running = new CountDownLatch(1); final CountDownLatch task1Proceed = new CountDownLatch(1); final CountDownLatch sideThreadDone = new CountDownLatch(1); - final AtomicReference task1Thread = new AtomicReference(); - final AtomicReference task2Thread = new AtomicReference(); + final AtomicReference task1Thread = new AtomicReference<>(); + final AtomicReference task2Thread = new AtomicReference<>(); doAnswer(new Answer() { @Override diff --git a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java index dbc57aed51..baa3fa769b 100644 --- a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java +++ b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java @@ -85,7 +85,7 @@ public class AbstractServerStreamTest { */ @Test public void frameShouldBeIgnoredAfterDeframerClosed() { - final Queue streamListenerMessageQueue = new LinkedList(); + final Queue streamListenerMessageQueue = new LinkedList<>(); stream.transportState().setListener(new ServerStreamListenerBase() { @Override public void messagesAvailable(MessageProducer producer) { diff --git a/core/src/test/java/io/grpc/internal/ApplicationThreadDeframerTest.java b/core/src/test/java/io/grpc/internal/ApplicationThreadDeframerTest.java index 68f2ac1f0d..cdc618e59f 100644 --- a/core/src/test/java/io/grpc/internal/ApplicationThreadDeframerTest.java +++ b/core/src/test/java/io/grpc/internal/ApplicationThreadDeframerTest.java @@ -117,7 +117,7 @@ public class ApplicationThreadDeframerTest { public void messagesAvailableDrainsToMessageReadQueue_returnedByInitializingMessageProducer() throws Exception { byte[][] messageBytes = {{1, 2, 3}, {4}, {5, 6}}; - Queue messages = new LinkedList(); + Queue messages = new LinkedList<>(); for (int i = 0; i < messageBytes.length; i++) { messages.add(new ByteArrayInputStream(messageBytes[i])); } diff --git a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java index 157d68001a..c28f051132 100644 --- a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java +++ b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java @@ -191,7 +191,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { @Test public void handleResolvedAddressGroups_shutsDownOldBalancer() { - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("loadBalancingPolicy", "round_robin"); Attributes serviceConfigAttrs = Attributes.newBuilder() @@ -407,7 +407,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { public void decideLoadBalancerProvider_grpclbOverridesServiceConfigLbPolicy() throws Exception { AutoConfiguredLoadBalancer lb = (AutoConfiguredLoadBalancer) lbf.newLoadBalancer(new TestHelper()); - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("loadBalancingPolicy", "round_robin"); List servers = Collections.singletonList( @@ -590,7 +590,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { verify(channelLogger).log( eq(ChannelLogLevel.DEBUG), eq("{0} specified by Service Config are not available"), - eq(new LinkedHashSet(Arrays.asList("magic_balancer")))); + eq(new LinkedHashSet<>(Arrays.asList("magic_balancer")))); } @Test @@ -652,7 +652,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { verifyNoMoreInteractions(channelLogger); - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("loadBalancingPolicy", "round_robin"); lb.handleResolvedAddressGroups(servers, Attributes.newBuilder() diff --git a/core/src/test/java/io/grpc/internal/CensusModulesTest.java b/core/src/test/java/io/grpc/internal/CensusModulesTest.java index 8f084590a0..c0376e5082 100644 --- a/core/src/test/java/io/grpc/internal/CensusModulesTest.java +++ b/core/src/test/java/io/grpc/internal/CensusModulesTest.java @@ -231,7 +231,7 @@ public class CensusModulesTest { } }).build()); - final AtomicReference capturedCallOptions = new AtomicReference(); + final AtomicReference capturedCallOptions = new AtomicReference<>(); ClientInterceptor callOptionsCaptureInterceptor = new ClientInterceptor() { @Override public ClientCall interceptCall( @@ -830,7 +830,7 @@ public class CensusModulesTest { headers.put( Metadata.Key.of("never-used-key-bin", Metadata.BINARY_BYTE_MARSHALLER), new byte[] {}); - Set originalHeaderKeys = new HashSet(headers.keys()); + Set originalHeaderKeys = new HashSet<>(headers.keys()); CensusTracingModule.ClientCallTracer callTracer = censusTracing.newClientCallTracer(BlankSpan.INSTANCE, method); @@ -1020,7 +1020,7 @@ public class CensusModulesTest { assertSame(spyServerSpan, ContextUtils.CONTEXT_SPAN_KEY.get(filteredContext)); serverStreamTracer.serverCallStarted( - new ServerCallInfoImpl(method, Attributes.EMPTY, null)); + new ServerCallInfoImpl<>(method, Attributes.EMPTY, null)); verify(spyServerSpan, never()).end(any(EndSpanOptions.class)); @@ -1063,7 +1063,7 @@ public class CensusModulesTest { serverStreamTracer.filterContext(Context.ROOT); serverStreamTracer.serverCallStarted( - new ServerCallInfoImpl(sampledMethod, Attributes.EMPTY, null)); + new ServerCallInfoImpl<>(sampledMethod, Attributes.EMPTY, null)); serverStreamTracer.streamClosed(Status.CANCELLED); diff --git a/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java b/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java index b03f4a7d74..486d96fd7b 100644 --- a/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java +++ b/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java @@ -43,7 +43,7 @@ public class ChannelLoggerImplTest { private final FakeClock clock = new FakeClock(); private final InternalLogId logId = InternalLogId.allocate("test", /*details=*/ null); private final String logPrefix = "[" + logId + "] "; - private final ArrayList logs = new ArrayList(); + private final ArrayList logs = new ArrayList<>(); private final Handler handler = new Handler() { @Override public void publish(LogRecord record) { diff --git a/core/src/test/java/io/grpc/internal/ChannelTracerTest.java b/core/src/test/java/io/grpc/internal/ChannelTracerTest.java index 7e9ec66dbf..24da7c7ff4 100644 --- a/core/src/test/java/io/grpc/internal/ChannelTracerTest.java +++ b/core/src/test/java/io/grpc/internal/ChannelTracerTest.java @@ -40,7 +40,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class ChannelTracerTest { private static final Logger logger = Logger.getLogger(ChannelLogger.class.getName()); - private final ArrayList logs = new ArrayList(); + private final ArrayList logs = new ArrayList<>(); private final Handler handler = new Handler() { @Override public void publish(LogRecord record) { diff --git a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java index c8f7254c1a..18483ae637 100644 --- a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java +++ b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java @@ -143,7 +143,7 @@ public class ClientCallImplTest { @Test public void statusPropagatedFromStreamToCallListener() { DelayedExecutor executor = new DelayedExecutor(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, executor, baseCallOptions, @@ -165,7 +165,7 @@ public class ClientCallImplTest { @Test public void exceptionInOnMessageTakesPrecedenceOverServer() { DelayedExecutor executor = new DelayedExecutor(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, executor, baseCallOptions, @@ -202,7 +202,7 @@ public class ClientCallImplTest { @Test public void exceptionInOnHeadersTakesPrecedenceOverServer() { DelayedExecutor executor = new DelayedExecutor(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, executor, baseCallOptions, @@ -237,7 +237,7 @@ public class ClientCallImplTest { @Test public void exceptionInOnReadyTakesPrecedenceOverServer() { DelayedExecutor executor = new DelayedExecutor(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, executor, baseCallOptions, @@ -271,7 +271,7 @@ public class ClientCallImplTest { @Test public void advertisedEncodingsAreSent() { - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, @@ -295,7 +295,7 @@ public class ClientCallImplTest { @Test public void authorityPropagatedToStream() { - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions.withAuthority("overridden-authority"), @@ -312,7 +312,7 @@ public class ClientCallImplTest { @Test public void callOptionsPropagatedToTransport() { final CallOptions callOptions = baseCallOptions.withAuthority("dummy_value"); - final ClientCallImpl call = new ClientCallImpl( + final ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), callOptions, @@ -330,7 +330,7 @@ public class ClientCallImplTest { @Test public void authorityNotPropagatedToStream() { - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), // Don't provide an authority @@ -502,7 +502,7 @@ public class ClientCallImplTest { Context context = Context.current().withValue(testKey, "testValue"); Context previous = context.attach(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, new SerializingExecutor(Executors.newSingleThreadExecutor()), baseCallOptions, @@ -580,7 +580,7 @@ public class ClientCallImplTest { Context.CancellableContext cancellableContext = Context.current().withCancellation(); Context previous = cancellableContext.attach(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, new SerializingExecutor(Executors.newSingleThreadExecutor()), baseCallOptions, @@ -610,7 +610,7 @@ public class ClientCallImplTest { cancellableContext.cancel(cause); Context previous = cancellableContext.attach(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, new SerializingExecutor(Executors.newSingleThreadExecutor()), baseCallOptions, @@ -655,7 +655,7 @@ public class ClientCallImplTest { public void deadlineExceededBeforeCallStarted() { CallOptions callOptions = baseCallOptions.withDeadlineAfter(0, TimeUnit.SECONDS); fakeClock.forwardTime(System.nanoTime(), TimeUnit.NANOSECONDS); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, new SerializingExecutor(Executors.newSingleThreadExecutor()), callOptions, @@ -678,7 +678,7 @@ public class ClientCallImplTest { .withDeadlineAfter(1000, TimeUnit.MILLISECONDS, deadlineCancellationExecutor); Context origContext = context.attach(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, @@ -703,7 +703,7 @@ public class ClientCallImplTest { Context origContext = context.attach(); CallOptions callOpts = baseCallOptions.withDeadlineAfter(2000, TimeUnit.MILLISECONDS); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), callOpts, @@ -728,7 +728,7 @@ public class ClientCallImplTest { Context origContext = context.attach(); CallOptions callOpts = baseCallOptions.withDeadlineAfter(1000, TimeUnit.MILLISECONDS); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), callOpts, @@ -749,7 +749,7 @@ public class ClientCallImplTest { @Test public void callOptionsDeadlineShouldBePropagatedToStream() { CallOptions callOpts = baseCallOptions.withDeadlineAfter(1000, TimeUnit.MILLISECONDS); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), callOpts, @@ -767,7 +767,7 @@ public class ClientCallImplTest { @Test public void noDeadlineShouldBePropagatedToStream() { - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, @@ -785,7 +785,7 @@ public class ClientCallImplTest { fakeClock.forwardTime(System.nanoTime(), TimeUnit.NANOSECONDS); // The deadline needs to be a number large enough to get encompass the call to start, otherwise // the scheduled cancellation won't be created, and the call will fail early. - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions.withDeadline(Deadline.after(1, TimeUnit.SECONDS)), @@ -810,7 +810,7 @@ public class ClientCallImplTest { .withDeadlineAfter(1, TimeUnit.SECONDS, deadlineCancellationExecutor); Context origContext = context.attach(); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, @@ -833,7 +833,7 @@ public class ClientCallImplTest { public void streamCancelAbortsDeadlineTimer() { fakeClock.forwardTime(System.nanoTime(), TimeUnit.NANOSECONDS); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions.withDeadline(Deadline.after(1, TimeUnit.SECONDS)), @@ -858,7 +858,7 @@ public class ClientCallImplTest { */ @Test public void timeoutShouldNotBeSet() { - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, @@ -876,7 +876,7 @@ public class ClientCallImplTest { @Test public void cancelInOnMessageShouldInvokeStreamCancel() throws Exception { - final ClientCallImpl call = new ClientCallImpl( + final ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, @@ -914,7 +914,7 @@ public class ClientCallImplTest { public void startAddsMaxSize() { CallOptions callOptions = baseCallOptions.withMaxInboundMessageSize(1).withMaxOutboundMessageSize(2); - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, new SerializingExecutor(Executors.newSingleThreadExecutor()), callOptions, @@ -932,7 +932,7 @@ public class ClientCallImplTest { @Test public void getAttributes() { - ClientCallImpl call = new ClientCallImpl( + ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, provider, deadlineCancellationExecutor, channelCallTracer, false /* retryEnabled */); Attributes attrs = @@ -952,7 +952,7 @@ public class ClientCallImplTest { } private static final class DelayedExecutor implements Executor { - private final BlockingQueue commands = new LinkedBlockingQueue(); + private final BlockingQueue commands = new LinkedBlockingQueue<>(); @Override public void execute(Runnable command) { diff --git a/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java b/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java index 1f88a31eb2..e12f9bf16c 100644 --- a/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java +++ b/core/src/test/java/io/grpc/internal/ConnectivityStateManagerTest.java @@ -43,7 +43,7 @@ public class ConnectivityStateManagerTest { private final FakeClock executor = new FakeClock(); private final ConnectivityStateManager state = new ConnectivityStateManager(); - private final LinkedList sink = new LinkedList(); + private final LinkedList sink = new LinkedList<>(); @Test public void noCallback() { @@ -147,7 +147,7 @@ public class ConnectivityStateManagerTest { @Test public void multipleCallbacks() { - final LinkedList callbackRuns = new LinkedList(); + final LinkedList callbackRuns = new LinkedList<>(); state.notifyWhenStateChanged(new Runnable() { @Override public void run() { diff --git a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java index c3317768ce..ae1d520675 100644 --- a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java +++ b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java @@ -613,7 +613,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_failsOnMisspelling() { - Map bad = new LinkedHashMap(); + Map bad = new LinkedHashMap<>(); bad.put("parcentage", 1.0); thrown.expectMessage("Bad key"); @@ -622,7 +622,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_clientLanguageMatchesJava() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List langs = new ArrayList<>(); langs.add("java"); choice.put("clientLanguage", langs); @@ -633,7 +633,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_clientLanguageDoesntMatchGo() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List langs = new ArrayList<>(); langs.add("go"); choice.put("clientLanguage", langs); @@ -644,7 +644,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_clientLanguageCaseInsensitive() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List langs = new ArrayList<>(); langs.add("JAVA"); choice.put("clientLanguage", langs); @@ -655,7 +655,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_clientLanguageMatchesEmtpy() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List langs = new ArrayList<>(); choice.put("clientLanguage", langs); choice.put("serviceConfig", serviceConfig); @@ -665,7 +665,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_clientLanguageMatchesMulti() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List langs = new ArrayList<>(); langs.add("go"); langs.add("java"); @@ -677,7 +677,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageZeroAlwaysFails() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 0D); choice.put("serviceConfig", serviceConfig); @@ -686,7 +686,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageHundredAlwaysSucceeds() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 100D); choice.put("serviceConfig", serviceConfig); @@ -695,7 +695,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageAboveMatches50() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 50D); choice.put("serviceConfig", serviceConfig); @@ -711,7 +711,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageAtFails50() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 50D); choice.put("serviceConfig", serviceConfig); @@ -727,7 +727,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageAboveMatches99() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 99D); choice.put("serviceConfig", serviceConfig); @@ -743,7 +743,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageAtFails99() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 99D); choice.put("serviceConfig", serviceConfig); @@ -759,7 +759,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageAboveMatches1() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 1D); choice.put("serviceConfig", serviceConfig); @@ -775,7 +775,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_percentageAtFails1() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); choice.put("percentage", 1D); choice.put("serviceConfig", serviceConfig); @@ -791,7 +791,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_hostnameMatches() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List hosts = new ArrayList<>(); hosts.add("localhost"); choice.put("clientHostname", hosts); @@ -802,7 +802,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_hostnameDoesntMatch() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List hosts = new ArrayList<>(); hosts.add("localhorse"); choice.put("clientHostname", hosts); @@ -813,7 +813,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_clientLanguageCaseSensitive() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List hosts = new ArrayList<>(); hosts.add("LOCALHOST"); choice.put("clientHostname", hosts); @@ -824,7 +824,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_hostnameMatchesEmtpy() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List hosts = new ArrayList<>(); choice.put("clientHostname", hosts); choice.put("serviceConfig", serviceConfig); @@ -834,7 +834,7 @@ public class DnsNameResolverTest { @Test public void maybeChooseServiceConfig_hostnameMatchesMulti() { - Map choice = new LinkedHashMap(); + Map choice = new LinkedHashMap<>(); List hosts = new ArrayList<>(); hosts.add("localhorse"); hosts.add("localhost"); diff --git a/core/src/test/java/io/grpc/internal/FakeClock.java b/core/src/test/java/io/grpc/internal/FakeClock.java index ff2d90ee73..ae8a41802c 100644 --- a/core/src/test/java/io/grpc/internal/FakeClock.java +++ b/core/src/test/java/io/grpc/internal/FakeClock.java @@ -268,7 +268,7 @@ public final class FakeClock { */ public Collection getDueTasks() { checkDueTasks(); - return new ArrayList(dueTasks); + return new ArrayList<>(dueTasks); } /** diff --git a/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java b/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java index 6e192e945c..cc23eb8fb8 100644 --- a/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java +++ b/core/src/test/java/io/grpc/internal/ForwardingManagedChannelTest.java @@ -86,7 +86,7 @@ public final class ForwardingManagedChannelTest { @Test public void newCall() { - NoopClientCall clientCall = new NoopClientCall(); + NoopClientCall clientCall = new NoopClientCall<>(); CallOptions callOptions = CallOptions.DEFAULT.withoutWaitForReady(); MethodDescriptor method = TestMethodDescriptors.voidMethod(); when(mock.newCall(same(method), same(callOptions))).thenReturn(clientCall); diff --git a/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java b/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java index ec4cdd200f..34da9dbd09 100644 --- a/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java +++ b/core/src/test/java/io/grpc/internal/InternalSubchannelTest.java @@ -102,7 +102,7 @@ public class InternalSubchannelTest { @Mock private BackoffPolicy.Provider mockBackoffPolicyProvider; @Mock private ClientTransportFactory mockTransportFactory; - private final LinkedList callbackInvokes = new LinkedList(); + private final LinkedList callbackInvokes = new LinkedList<>(); private final InternalSubchannel.Callback mockInternalSubchannelCallback = new InternalSubchannel.Callback() { @Override diff --git a/core/src/test/java/io/grpc/internal/JsonParserTest.java b/core/src/test/java/io/grpc/internal/JsonParserTest.java index 7ffeeb807c..d783a65059 100644 --- a/core/src/test/java/io/grpc/internal/JsonParserTest.java +++ b/core/src/test/java/io/grpc/internal/JsonParserTest.java @@ -117,7 +117,7 @@ public class JsonParserTest { @Test public void objectStringName() throws IOException { - LinkedHashMap expected = new LinkedHashMap(); + LinkedHashMap expected = new LinkedHashMap<>(); expected.put("hi", Double.valueOf("2")); assertEquals(expected, JsonParser.parse("{\"hi\": 2}")); diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java index 62c7bbb064..75cf2ee056 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java @@ -484,7 +484,7 @@ public class ManagedChannelImplIdlenessTest { // We need this because createSubchannel() should be called from the SynchronizationContext private static Subchannel createSubchannelSafely( final Helper helper, final EquivalentAddressGroup addressGroup, final Attributes attrs) { - final AtomicReference resultCapture = new AtomicReference(); + final AtomicReference resultCapture = new AtomicReference<>(); helper.getSynchronizationContext().execute( new Runnable() { @Override diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java index aae174d883..248a0692ce 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java @@ -326,7 +326,7 @@ public class ManagedChannelImplTest { @Test public void createSubchannelOutsideSynchronizationContextShouldLogWarning() { createChannel(); - final AtomicReference logRef = new AtomicReference(); + final AtomicReference logRef = new AtomicReference<>(); Handler handler = new Handler() { @Override public void publish(LogRecord record) { @@ -1711,8 +1711,8 @@ public class ManagedChannelImplTest { CallOptions callOptions = CallOptions.DEFAULT.withCallCredentials(creds); final Context.Key testKey = Context.key("testing"); Context ctx = Context.current().withValue(testKey, "testValue"); - final LinkedList credsApplyContexts = new LinkedList(); - final LinkedList newStreamContexts = new LinkedList(); + final LinkedList credsApplyContexts = new LinkedList<>(); + final LinkedList newStreamContexts = new LinkedList<>(); doAnswer(new Answer() { @Override public Void answer(InvocationOnMock in) throws Throwable { @@ -2599,7 +2599,7 @@ public class ManagedChannelImplTest { assertThat(getStats(channel).channelTrace.events).hasSize(prevSize); prevSize = getStats(channel).channelTrace.events.size(); - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("methodConfig", new HashMap()); attributes = Attributes.newBuilder() @@ -2943,18 +2943,18 @@ public class ManagedChannelImplTest { @Test public void retryBackoffThenChannelShutdown_retryShouldStillHappen_newCallShouldFail() { - Map retryPolicy = new HashMap(); + Map retryPolicy = new HashMap<>(); retryPolicy.put("maxAttempts", 3D); retryPolicy.put("initialBackoff", "10s"); retryPolicy.put("maxBackoff", "30s"); retryPolicy.put("backoffMultiplier", 2D); retryPolicy.put("retryableStatusCodes", Arrays.asList("UNAVAILABLE")); - Map methodConfig = new HashMap(); - Map name = new HashMap(); + Map methodConfig = new HashMap<>(); + Map name = new HashMap<>(); name.put("service", "service"); methodConfig.put("name", Arrays.asList(name)); methodConfig.put("retryPolicy", retryPolicy); - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("methodConfig", Arrays.asList(methodConfig)); Attributes attributesWithRetryPolicy = Attributes .newBuilder().set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -3050,16 +3050,16 @@ public class ManagedChannelImplTest { @Test public void hedgingScheduledThenChannelShutdown_hedgeShouldStillHappen_newCallShouldFail() { - Map hedgingPolicy = new HashMap(); + Map hedgingPolicy = new HashMap<>(); hedgingPolicy.put("maxAttempts", 3D); hedgingPolicy.put("hedgingDelay", "10s"); hedgingPolicy.put("nonFatalStatusCodes", Arrays.asList("UNAVAILABLE")); - Map methodConfig = new HashMap(); - Map name = new HashMap(); + Map methodConfig = new HashMap<>(); + Map name = new HashMap<>(); name.put("service", "service"); methodConfig.put("name", Arrays.asList(name)); methodConfig.put("hedgingPolicy", hedgingPolicy); - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("methodConfig", Arrays.asList(methodConfig)); Attributes attributesWithRetryPolicy = Attributes .newBuilder().set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -3286,7 +3286,7 @@ public class ManagedChannelImplTest { final ArrayList resolvers = new ArrayList<>(); // The Attributes argument of the next invocation of listener.onAddresses(servers, attrs) final AtomicReference nextResolvedAttributes = - new AtomicReference(Attributes.EMPTY); + new AtomicReference<>(Attributes.EMPTY); FakeNameResolverFactory( URI expectedUri, @@ -3367,7 +3367,7 @@ public class ManagedChannelImplTest { static final class Builder { final URI expectedUri; - List servers = ImmutableList.of(); + List servers = ImmutableList.of(); boolean resolvedAtStart = true; Status error = null; @@ -3412,7 +3412,7 @@ public class ManagedChannelImplTest { // We need this because createSubchannel() should be called from the SynchronizationContext private static Subchannel createSubchannelSafely( final Helper helper, final EquivalentAddressGroup addressGroup, final Attributes attrs) { - final AtomicReference resultCapture = new AtomicReference(); + final AtomicReference resultCapture = new AtomicReference<>(); helper.getSynchronizationContext().execute( new Runnable() { @Override diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelOrphanWrapperTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelOrphanWrapperTest.java index da89c2778f..17c3f8cdc3 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelOrphanWrapperTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelOrphanWrapperTest.java @@ -49,9 +49,9 @@ public final class ManagedChannelOrphanWrapperTest { ManagedChannel mc = new TestManagedChannel(); String channelString = mc.toString(); final ReferenceQueue refqueue = - new ReferenceQueue(); + new ReferenceQueue<>(); ConcurrentMap refs = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); assertEquals(0, refs.size()); ManagedChannelOrphanWrapper channel = new ManagedChannelOrphanWrapper(mc, refqueue, refs); @@ -103,9 +103,9 @@ public final class ManagedChannelOrphanWrapperTest { @Test public void refCycleIsGCed() { ReferenceQueue refqueue = - new ReferenceQueue(); + new ReferenceQueue<>(); ConcurrentMap refs = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); ApplicationWithChannelRef app = new ApplicationWithChannelRef(); ChannelWithApplicationRef channelImpl = new ChannelWithApplicationRef(); ManagedChannelOrphanWrapper channel = @@ -113,7 +113,7 @@ public final class ManagedChannelOrphanWrapperTest { app.channel = channel; channelImpl.application = app; WeakReference appWeakRef = - new WeakReference(app); + new WeakReference<>(app); // Simulate the application and channel going out of scope. A ref cycle between app and // channel remains, so ensure that our tracking of orphaned channels does not prevent this diff --git a/core/src/test/java/io/grpc/internal/RetriableStreamTest.java b/core/src/test/java/io/grpc/internal/RetriableStreamTest.java index 55deed38ba..fc4f1591c7 100644 --- a/core/src/test/java/io/grpc/internal/RetriableStreamTest.java +++ b/core/src/test/java/io/grpc/internal/RetriableStreamTest.java @@ -632,7 +632,7 @@ public class RetriableStreamTest { ArgumentCaptor sublistenerCaptor1 = ArgumentCaptor.forClass(ClientStreamListener.class); final AtomicReference sublistenerCaptor2 = - new AtomicReference(); + new AtomicReference<>(); final Status cancelStatus = Status.CANCELLED.withDescription("c"); ClientStream mockStream1 = mock( @@ -762,7 +762,7 @@ public class RetriableStreamTest { @Test public void isReady_whileDraining() { final AtomicReference sublistenerCaptor1 = - new AtomicReference(); + new AtomicReference<>(); final List readiness = new ArrayList<>(); ClientStream mockStream1 = mock( diff --git a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java index 24adf9a3d9..bd56aee365 100644 --- a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java +++ b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java @@ -88,7 +88,7 @@ public class ServerCallImplTest { public void setUp() { MockitoAnnotations.initMocks(this); context = Context.ROOT.withCancellation(); - call = new ServerCallImpl(stream, UNARY_METHOD, requestHeaders, context, + call = new ServerCallImpl<>(stream, UNARY_METHOD, requestHeaders, context, DecompressorRegistry.getDefaultInstance(), CompressorRegistry.getDefaultInstance(), serverCallTracer); } @@ -111,7 +111,7 @@ public class ServerCallImplTest { assertEquals(0, before.callsStarted); assertEquals(0, before.lastCallStartedNanos); - call = new ServerCallImpl(stream, UNARY_METHOD, requestHeaders, context, + call = new ServerCallImpl<>(stream, UNARY_METHOD, requestHeaders, context, DecompressorRegistry.getDefaultInstance(), CompressorRegistry.getDefaultInstance(), tracer); @@ -217,7 +217,7 @@ public class ServerCallImplTest { private void sendMessage_serverSendsOne_closeOnSecondCall( MethodDescriptor method) { - ServerCallImpl serverCall = new ServerCallImpl( + ServerCallImpl serverCall = new ServerCallImpl<>( stream, method, requestHeaders, @@ -251,7 +251,7 @@ public class ServerCallImplTest { private void sendMessage_serverSendsOne_closeOnSecondCall_appRunToCompletion( MethodDescriptor method) { - ServerCallImpl serverCall = new ServerCallImpl( + ServerCallImpl serverCall = new ServerCallImpl<>( stream, method, requestHeaders, @@ -288,7 +288,7 @@ public class ServerCallImplTest { private void serverSendsOne_okFailsOnMissingResponse( MethodDescriptor method) { - ServerCallImpl serverCall = new ServerCallImpl( + ServerCallImpl serverCall = new ServerCallImpl<>( stream, method, requestHeaders, @@ -343,7 +343,7 @@ public class ServerCallImplTest { @Test public void streamListener_halfClosed() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.halfClosed(); @@ -353,7 +353,7 @@ public class ServerCallImplTest { @Test public void streamListener_halfClosed_onlyOnce() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.halfClosed(); // canceling the call should short circuit future halfClosed() calls. streamListener.closed(Status.CANCELLED); @@ -366,7 +366,7 @@ public class ServerCallImplTest { @Test public void streamListener_closedOk() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.closed(Status.OK); @@ -378,7 +378,7 @@ public class ServerCallImplTest { @Test public void streamListener_closedCancelled() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.closed(Status.CANCELLED); @@ -390,7 +390,7 @@ public class ServerCallImplTest { @Test public void streamListener_onReady() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.onReady(); @@ -400,7 +400,7 @@ public class ServerCallImplTest { @Test public void streamListener_onReady_onlyOnce() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.onReady(); // canceling the call should short circuit future halfClosed() calls. streamListener.closed(Status.CANCELLED); @@ -413,7 +413,7 @@ public class ServerCallImplTest { @Test public void streamListener_messageRead() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.messagesAvailable(new SingleMessageProducer(UNARY_METHOD.streamRequest(1234L))); verify(callListener).onMessage(1234L); @@ -422,7 +422,7 @@ public class ServerCallImplTest { @Test public void streamListener_messageRead_onlyOnce() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); streamListener.messagesAvailable(new SingleMessageProducer(UNARY_METHOD.streamRequest(1234L))); // canceling the call should short circuit future halfClosed() calls. streamListener.closed(Status.CANCELLED); @@ -435,7 +435,7 @@ public class ServerCallImplTest { @Test public void streamListener_unexpectedRuntimeException() { ServerStreamListenerImpl streamListener = - new ServerCallImpl.ServerStreamListenerImpl(call, callListener, context); + new ServerCallImpl.ServerStreamListenerImpl<>(call, callListener, context); doThrow(new RuntimeException("unexpected exception")) .when(callListener) .onMessage(any(Long.class)); diff --git a/core/src/test/java/io/grpc/internal/ServerImplTest.java b/core/src/test/java/io/grpc/internal/ServerImplTest.java index d02a75d804..701e642a94 100644 --- a/core/src/test/java/io/grpc/internal/ServerImplTest.java +++ b/core/src/test/java/io/grpc/internal/ServerImplTest.java @@ -504,8 +504,8 @@ public class ServerImplTest { final Metadata.Key metadataKey = Metadata.Key.of("inception", Metadata.ASCII_STRING_MARSHALLER); final AtomicReference> callReference - = new AtomicReference>(); - final AtomicReference callContextReference = new AtomicReference(); + = new AtomicReference<>(); + final AtomicReference callContextReference = new AtomicReference<>(); mutableFallbackRegistry.addService(ServerServiceDefinition.builder( new ServiceDescriptor("Waiter", method)) .addMethod( @@ -545,7 +545,7 @@ public class ServerImplTest { ServerCall call = callReference.get(); assertNotNull(call); assertEquals( - new ServerCallInfoImpl( + new ServerCallInfoImpl<>( call.getMethodDescriptor(), call.getAttributes(), call.getAuthority()), @@ -606,9 +606,9 @@ public class ServerImplTest { final Attributes.Key key2 = Attributes.Key.create("test-key2"); final Attributes.Key key3 = Attributes.Key.create("test-key3"); final AtomicReference filter1TerminationCallbackArgument = - new AtomicReference(); + new AtomicReference<>(); final AtomicReference filter2TerminationCallbackArgument = - new AtomicReference(); + new AtomicReference<>(); final AtomicInteger readyCallbackCalled = new AtomicInteger(0); final AtomicInteger terminationCallbackCalled = new AtomicInteger(0); builder.addTransportFilter(new ServerTransportFilter() { @@ -677,7 +677,7 @@ public class ServerImplTest { @Test public void interceptors() throws Exception { - final LinkedList capturedContexts = new LinkedList(); + final LinkedList capturedContexts = new LinkedList<>(); final Context.Key key1 = Context.key("key1"); final Context.Key key2 = Context.key("key2"); final Context.Key key3 = Context.key("key3"); @@ -1024,9 +1024,9 @@ public class ServerImplTest { @Test public void testClientClose_cancelTriggersImmediateCancellation() throws Exception { AtomicBoolean contextCancelled = new AtomicBoolean(false); - AtomicReference context = new AtomicReference(); + AtomicReference context = new AtomicReference<>(); AtomicReference> callReference - = new AtomicReference>(); + = new AtomicReference<>(); ServerStreamListener streamListener = testClientClose_setup(callReference, context, contextCancelled); @@ -1047,9 +1047,9 @@ public class ServerImplTest { @Test public void testClientClose_OkTriggersDelayedCancellation() throws Exception { AtomicBoolean contextCancelled = new AtomicBoolean(false); - AtomicReference context = new AtomicReference(); + AtomicReference context = new AtomicReference<>(); AtomicReference> callReference - = new AtomicReference>(); + = new AtomicReference<>(); ServerStreamListener streamListener = testClientClose_setup(callReference, context, contextCancelled); diff --git a/core/src/test/java/io/grpc/internal/SharedResourceHolderTest.java b/core/src/test/java/io/grpc/internal/SharedResourceHolderTest.java index 3b65d08dca..94fef8315d 100644 --- a/core/src/test/java/io/grpc/internal/SharedResourceHolderTest.java +++ b/core/src/test/java/io/grpc/internal/SharedResourceHolderTest.java @@ -46,7 +46,7 @@ import org.mockito.stubbing.Answer; public class SharedResourceHolderTest { private final LinkedList> scheduledDestroyTasks = - new LinkedList>(); + new LinkedList<>(); private SharedResourceHolder holder; @@ -186,7 +186,7 @@ public class SharedResourceHolderTest { Runnable command = (Runnable) args[0]; long delay = (Long) args[1]; TimeUnit unit = (TimeUnit) args[2]; - MockScheduledFuture future = new MockScheduledFuture( + MockScheduledFuture future = new MockScheduledFuture<>( command, delay, unit); scheduledDestroyTasks.add(future); return future; diff --git a/core/src/test/java/io/grpc/internal/TestUtils.java b/core/src/test/java/io/grpc/internal/TestUtils.java index 1978736402..a01e902a12 100644 --- a/core/src/test/java/io/grpc/internal/TestUtils.java +++ b/core/src/test/java/io/grpc/internal/TestUtils.java @@ -69,7 +69,7 @@ final class TestUtils { static BlockingQueue captureTransports( ClientTransportFactory mockTransportFactory, @Nullable final Runnable startRunnable) { final BlockingQueue captor = - new LinkedBlockingQueue(); + new LinkedBlockingQueue<>(); doAnswer(new Answer() { @Override diff --git a/core/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java b/core/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java index 653db9fb84..ba02673c29 100644 --- a/core/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java +++ b/core/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java @@ -56,7 +56,7 @@ public class ForwardingLoadBalancerHelperTest { if (clazz.equals(EquivalentAddressGroup.class)) { return new EquivalentAddressGroup(Arrays.asList(mockAddr)); } else if (clazz.equals(List.class)) { - return Collections.emptyList(); + return Collections.emptyList(); } return null; } diff --git a/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java b/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java index 7ba6486539..7f4b39d7bc 100644 --- a/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java +++ b/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java @@ -186,7 +186,7 @@ public class RoundRobinLoadBalancerTest { List eagList = Arrays.asList(new EquivalentAddressGroup(allAddrs.get(i))); when(subchannel.getAttributes()).thenReturn(Attributes.newBuilder().set(STATE_INFO, - new Ref( + new Ref<>( ConnectivityStateInfo.forNonError(READY))).build()); when(subchannel.getAllAddresses()).thenReturn(eagList); } @@ -306,7 +306,7 @@ public class RoundRobinLoadBalancerTest { Subchannel subchannel2 = mock(Subchannel.class); ReadyPicker picker = new ReadyPicker(Collections.unmodifiableList( - Lists.newArrayList(subchannel, subchannel1, subchannel2)), + Lists.newArrayList(subchannel, subchannel1, subchannel2)), 0 /* startIndex */, null /* stickinessState */); assertThat(picker.getList()).containsExactly(subchannel, subchannel1, subchannel2); @@ -438,7 +438,7 @@ public class RoundRobinLoadBalancerTest { @Test public void stickinessEnabled_withoutStickyHeader() { - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("stickinessMetadataKey", "my-sticky-key"); Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -470,7 +470,7 @@ public class RoundRobinLoadBalancerTest { @Test public void stickinessEnabled_withStickyHeader() { - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("stickinessMetadataKey", "my-sticky-key"); Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -500,7 +500,7 @@ public class RoundRobinLoadBalancerTest { @Test public void stickinessEnabled_withDifferentStickyHeaders() { - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("stickinessMetadataKey", "my-sticky-key"); Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -545,7 +545,7 @@ public class RoundRobinLoadBalancerTest { @Test public void stickiness_goToTransientFailure_pick_backToReady() { - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("stickinessMetadataKey", "my-sticky-key"); Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -593,7 +593,7 @@ public class RoundRobinLoadBalancerTest { @Test public void stickiness_goToTransientFailure_backToReady_pick() { - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("stickinessMetadataKey", "my-sticky-key"); Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -647,7 +647,7 @@ public class RoundRobinLoadBalancerTest { @Test public void stickiness_oneSubchannelShutdown() { - Map serviceConfig = new HashMap(); + Map serviceConfig = new HashMap<>(); serviceConfig.put("stickinessMetadataKey", "my-sticky-key"); Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); @@ -703,14 +703,14 @@ public class RoundRobinLoadBalancerTest { @Test public void stickiness_resolveTwice_metadataKeyChanged() { - Map serviceConfig1 = new HashMap(); + Map serviceConfig1 = new HashMap<>(); serviceConfig1.put("stickinessMetadataKey", "my-sticky-key1"); Attributes attributes1 = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig1).build(); loadBalancer.handleResolvedAddressGroups(servers, attributes1); Map stickinessMap1 = loadBalancer.getStickinessMapForTest(); - Map serviceConfig2 = new HashMap(); + Map serviceConfig2 = new HashMap<>(); serviceConfig2.put("stickinessMetadataKey", "my-sticky-key2"); Attributes attributes2 = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig2).build(); @@ -722,7 +722,7 @@ public class RoundRobinLoadBalancerTest { @Test public void stickiness_resolveTwice_metadataKeyUnChanged() { - Map serviceConfig1 = new HashMap(); + Map serviceConfig1 = new HashMap<>(); serviceConfig1.put("stickinessMetadataKey", "my-sticky-key1"); Attributes attributes1 = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig1).build(); diff --git a/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java b/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java index 37433b8540..8f94107394 100644 --- a/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java +++ b/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java @@ -76,7 +76,7 @@ public class UtilServerInterceptorsTest { final Status expectedStatus = Status.UNAVAILABLE; final Metadata expectedMetadata = new Metadata(); FakeServerCall call = - new FakeServerCall(expectedStatus, expectedMetadata); + new FakeServerCall<>(expectedStatus, expectedMetadata); final StatusRuntimeException exception = new StatusRuntimeException(expectedStatus, expectedMetadata); listener = new VoidCallListener() { @@ -126,7 +126,7 @@ public class UtilServerInterceptorsTest { final Metadata expectedMetadata = new Metadata(); FakeServerCall call = - new FakeServerCall(expectedStatus, expectedMetadata); + new FakeServerCall<>(expectedStatus, expectedMetadata); final StatusRuntimeException exception = new StatusRuntimeException(expectedStatus, expectedMetadata); diff --git a/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java b/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java index cd6ee1f116..7e7d146db1 100644 --- a/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java +++ b/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java @@ -159,7 +159,7 @@ public class RouteGuideServerTest { assertTrue(latch.await(1, TimeUnit.SECONDS)); // verify - assertEquals(new HashSet(Arrays.asList(f2, f3)), result); + assertEquals(new HashSet<>(Arrays.asList(f2, f3)), result); } @Test diff --git a/grpclb/src/main/java/io/grpc/grpclb/CachedSubchannelPool.java b/grpclb/src/main/java/io/grpc/grpclb/CachedSubchannelPool.java index eb35b6dd9d..b033fef388 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/CachedSubchannelPool.java +++ b/grpclb/src/main/java/io/grpc/grpclb/CachedSubchannelPool.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; */ final class CachedSubchannelPool implements SubchannelPool { private final HashMap cache = - new HashMap(); + new HashMap<>(); private Helper helper; diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java index 02031ea518..e9269f4feb 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java @@ -64,7 +64,7 @@ final class GrpclbClientLoadRecorder extends ClientStreamTracer.Factory { // Specific finish types @GuardedBy("this") - private Map callsDroppedPerToken = new HashMap(1); + private Map callsDroppedPerToken = new HashMap<>(1); @SuppressWarnings("unused") private volatile long callsFailedToSend; @SuppressWarnings("unused") @@ -112,7 +112,7 @@ final class GrpclbClientLoadRecorder extends ClientStreamTracer.Factory { synchronized (this) { if (!callsDroppedPerToken.isEmpty()) { localCallsDroppedPerToken = callsDroppedPerToken; - callsDroppedPerToken = new HashMap(localCallsDroppedPerToken.size()); + callsDroppedPerToken = new HashMap<>(localCallsDroppedPerToken.size()); } } for (Entry entry : localCallsDroppedPerToken.entrySet()) { diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java index edd768f622..97afc6c612 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java @@ -335,7 +335,7 @@ final class GrpclbState { logger.log( ChannelLogLevel.INFO, "Using RR list={0}, drop={1}", newBackendAddrList, newDropList); HashMap newSubchannelMap = - new HashMap(); + new HashMap<>(); List newBackendList = new ArrayList<>(); for (BackendAddressGroup backendAddr : newBackendAddrList) { @@ -346,7 +346,7 @@ final class GrpclbState { if (subchannel == null) { Attributes subchannelAttrs = Attributes.newBuilder() .set(STATE_INFO, - new AtomicReference( + new AtomicReference<>( ConnectivityStateInfo.forNonError(IDLE))) .build(); subchannel = subchannelPool.takeOrCreateSubchannel(eag, subchannelAttrs); diff --git a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java index 675fdc4315..1b729e8b70 100644 --- a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java +++ b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java @@ -141,7 +141,7 @@ public class GrpclbLoadBalancerTest { private Helper helper; @Mock private SubchannelPool subchannelPool; - private final ArrayList logs = new ArrayList(); + private final ArrayList logs = new ArrayList<>(); private final ChannelLogger channelLogger = new ChannelLogger() { @Override public void log(ChannelLogLevel level, String msg) { @@ -159,9 +159,9 @@ public class GrpclbLoadBalancerTest { private ArgumentCaptor> lbResponseObserverCaptor; private final FakeClock fakeClock = new FakeClock(); private final LinkedList> lbRequestObservers = - new LinkedList>(); - private final LinkedList mockSubchannels = new LinkedList(); - private final LinkedList fakeOobChannels = new LinkedList(); + new LinkedList<>(); + private final LinkedList mockSubchannels = new LinkedList<>(); + private final LinkedList fakeOobChannels = new LinkedList<>(); private final ArrayList subchannelTracker = new ArrayList<>(); private final ArrayList oobChannelTracker = new ArrayList<>(); private final ArrayList failingLbAuthorities = new ArrayList<>(); diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java index 62f182528b..fba45d1e0b 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/StressTestClient.java @@ -109,7 +109,7 @@ public class StressTestClient { private Server metricsServer; private final Map gauges = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); private volatile boolean shutdown; @@ -117,7 +117,7 @@ public class StressTestClient { * List of futures that {@link #blockUntilStressTestComplete()} waits for. */ private final List> workerFutures = - new ArrayList>(); + new ArrayList<>(); private final List channels = new ArrayList<>(); private ListeningExecutorService threadpool; @@ -325,7 +325,7 @@ public class StressTestClient { } private static List> parseCommaSeparatedTuples(String str) { - List> tuples = new ArrayList>(); + List> tuples = new ArrayList<>(); for (String tupleStr : Splitter.on(',').split(str)) { int splitIdx = tupleStr.lastIndexOf(':'); if (splitIdx == -1) { diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java index 8bbe4a43cd..5fe7248b2b 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java @@ -372,7 +372,7 @@ public class TestServiceImpl extends TestServiceGrpc.TestServiceImplBase { * Breaks down the request and creates a queue of response chunks for the given request. */ public Queue toChunkQueue(StreamingOutputCallRequest request) { - Queue chunkQueue = new ArrayDeque(); + Queue chunkQueue = new ArrayDeque<>(); int offset = 0; for (ResponseParameters params : request.getResponseParametersList()) { chunkQueue.add(new Chunk(params.getIntervalUs(), offset, params.getSize())); diff --git a/interop-testing/src/test/java/io/grpc/ChannelAndServerBuilderTest.java b/interop-testing/src/test/java/io/grpc/ChannelAndServerBuilderTest.java index 6ac5e6df14..b83bb61357 100644 --- a/interop-testing/src/test/java/io/grpc/ChannelAndServerBuilderTest.java +++ b/interop-testing/src/test/java/io/grpc/ChannelAndServerBuilderTest.java @@ -55,9 +55,9 @@ public class ChannelAndServerBuilderTest { ClassPath.from(loader).getTopLevelClassesRecursive("io.grpc"); // Java 9 doesn't expose the URLClassLoader, which breaks searching through the classpath if (classInfos.isEmpty()) { - return new ArrayList(); + return new ArrayList<>(); } - List classes = new ArrayList(); + List classes = new ArrayList<>(); for (ClassInfo classInfo : classInfos) { Class clazz = Class.forName(classInfo.getName(), false /*initialize*/, loader); if (ServerBuilder.class.isAssignableFrom(clazz) && clazz != ServerBuilder.class) { diff --git a/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java b/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java index c227d42e31..8fd0501df8 100644 --- a/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java +++ b/interop-testing/src/test/java/io/grpc/stub/StubConfigTest.java @@ -60,7 +60,7 @@ public class StubConfigTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); ClientCall call = - new NoopClientCall(); + new NoopClientCall<>(); when(channel.newCall( Mockito.>any(), any(CallOptions.class))) .thenReturn(call); diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/CompressionTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/CompressionTest.java index 9ebcb2ef3b..360557c625 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/CompressionTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/CompressionTest.java @@ -147,7 +147,7 @@ public class CompressionTest { @Parameters public static Collection params() { boolean[] bools = new boolean[]{false, true}; - List combos = new ArrayList(64); + List combos = new ArrayList<>(64); for (boolean enableClientMessageCompression : bools) { for (boolean clientAcceptEncoding : bools) { for (boolean clientEncoding : bools) { @@ -280,7 +280,7 @@ public class CompressionTest { } ClientCall call = next.newCall(method, callOptions); - return new ClientCompressor(call); + return new ClientCompressor<>(call); } } @@ -291,7 +291,7 @@ public class CompressionTest { @Override public void start(io.grpc.ClientCall.Listener responseListener, Metadata headers) { - super.start(new ClientHeadersCapture(responseListener), headers); + super.start(new ClientHeadersCapture<>(responseListener), headers); setMessageCompression(enableClientMessageCompression); } } diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/MoreInProcessTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/MoreInProcessTest.java index b18d0219f9..bf373dd5ba 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/MoreInProcessTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/MoreInProcessTest.java @@ -105,8 +105,8 @@ public class MoreInProcessTest { // implement a client final CountDownLatch finishLatch = new CountDownLatch(1); final AtomicReference responseRef = - new AtomicReference(); - final AtomicReference throwableRef = new AtomicReference(); + new AtomicReference<>(); + final AtomicReference throwableRef = new AtomicReference<>(); StreamObserver responseObserver = new StreamObserver() { @Override @@ -164,8 +164,8 @@ public class MoreInProcessTest { // implement a client final CountDownLatch finishLatch = new CountDownLatch(1); final AtomicReference responseRef = - new AtomicReference(); - final AtomicReference throwableRef = new AtomicReference(); + new AtomicReference<>(); + final AtomicReference throwableRef = new AtomicReference<>(); StreamObserver responseObserver = new StreamObserver() { @Override @@ -223,8 +223,8 @@ public class MoreInProcessTest { // implement a client final CountDownLatch finishLatch = new CountDownLatch(1); final AtomicReference responseRef = - new AtomicReference(); - final AtomicReference throwableRef = new AtomicReference(); + new AtomicReference<>(); + final AtomicReference throwableRef = new AtomicReference<>(); StreamObserver responseObserver = new StreamObserver() { @Override diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/TestCasesTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/TestCasesTest.java index 2ce95b412f..53faebb82b 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/TestCasesTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/TestCasesTest.java @@ -76,7 +76,7 @@ public class TestCasesTest { assertEquals(testCases.length + additionalTestCases.length, TestCases.values().length); - Set testCaseSet = new HashSet(testCases.length); + Set testCaseSet = new HashSet<>(testCases.length); for (String testCase : testCases) { testCaseSet.add(TestCases.fromString(testCase)); } diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/TrafficControlProxy.java b/interop-testing/src/test/java/io/grpc/testing/integration/TrafficControlProxy.java index b94ecbfe84..19f22cb03f 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/TrafficControlProxy.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/TrafficControlProxy.java @@ -186,7 +186,7 @@ public final class TrafficControlProxy { DataInputStream inStream; DataOutputStream outStream; int bytesQueued; - BlockingQueue queue = new DelayQueue(); + BlockingQueue queue = new DelayQueue<>(); MessageQueue(DataInputStream inputStream, DataOutputStream outputStream) { inStream = inputStream; diff --git a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java index 790a791dd1..3065ec2088 100644 --- a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java +++ b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java @@ -66,7 +66,7 @@ public final class NettyChannelBuilder private static final long AS_LARGE_AS_INFINITE = TimeUnit.DAYS.toNanos(1000L); private final Map, Object> channelOptions = - new HashMap, Object>(); + new HashMap<>(); private NegotiationType negotiationType = NegotiationType.TLS; private OverrideAuthorityChecker authorityChecker; diff --git a/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java b/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java index 9a6d72c0ac..cd25df50ad 100644 --- a/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java +++ b/netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java @@ -445,7 +445,7 @@ public final class ProtocolNegotiators { public abstract static class AbstractBufferingHandler extends ChannelDuplexHandler { private ChannelHandler[] handlers; - private Queue bufferedWrites = new ArrayDeque(); + private Queue bufferedWrites = new ArrayDeque<>(); private boolean writing; private boolean flushRequested; private Throwable failCause; diff --git a/netty/src/main/java/io/grpc/netty/WriteQueue.java b/netty/src/main/java/io/grpc/netty/WriteQueue.java index 8e48cf4c3b..24063ad181 100644 --- a/netty/src/main/java/io/grpc/netty/WriteQueue.java +++ b/netty/src/main/java/io/grpc/netty/WriteQueue.java @@ -51,7 +51,7 @@ class WriteQueue { public WriteQueue(Channel channel) { this.channel = Preconditions.checkNotNull(channel, "channel"); - queue = new ConcurrentLinkedQueue(); + queue = new ConcurrentLinkedQueue<>(); } /** diff --git a/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java index 006dfa40f8..510ac7573b 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java @@ -129,7 +129,7 @@ public class NettyClientHandlerTest extends NettyHandlerTestBase streamListenerMessageQueue = new LinkedList(); + private final Queue streamListenerMessageQueue = new LinkedList<>(); @Override protected void manualSetUp() throws Exception { diff --git a/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java b/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java index 6ec73cbe57..b2c81ca5ec 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientStreamTest.java @@ -92,7 +92,7 @@ public class NettyClientStreamTest extends NettyStreamTestBase marshaller = mock(MethodDescriptor.Marshaller.class); - private final Queue listenerMessageQueue = new LinkedList(); + private final Queue listenerMessageQueue = new LinkedList<>(); // Must be initialized before @Before, because it is used by createStream() private MethodDescriptor methodDescriptor = MethodDescriptor.newBuilder() diff --git a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java index 7b28fac5c1..3fb14aae26 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java @@ -173,7 +173,7 @@ public class NettyClientTransportTest { @Test public void setSoLingerChannelOption() throws IOException { startServer(); - Map, Object> channelOptions = new HashMap, Object>(); + Map, Object> channelOptions = new HashMap<>(); // set SO_LINGER option int soLinger = 123; channelOptions.put(ChannelOption.SO_LINGER, soLinger); diff --git a/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java index 3fa2c6f869..57720f5093 100644 --- a/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java @@ -130,7 +130,7 @@ public class NettyServerHandlerTest extends NettyHandlerTestBase streamListenerMessageQueue = new LinkedList(); + final Queue streamListenerMessageQueue = new LinkedList<>(); private int maxConcurrentStreams = Integer.MAX_VALUE; private int maxHeaderListSize = Integer.MAX_VALUE; diff --git a/netty/src/test/java/io/grpc/netty/NettyServerStreamTest.java b/netty/src/test/java/io/grpc/netty/NettyServerStreamTest.java index 1a174cdcb5..faf6a1783e 100644 --- a/netty/src/test/java/io/grpc/netty/NettyServerStreamTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyServerStreamTest.java @@ -69,7 +69,7 @@ public class NettyServerStreamTest extends NettyStreamTestBase listenerMessageQueue = new LinkedList(); + private final Queue listenerMessageQueue = new LinkedList<>(); @Before @Override diff --git a/netty/src/test/java/io/grpc/netty/NettyServerTest.java b/netty/src/test/java/io/grpc/netty/NettyServerTest.java index 648fc78184..28d31c2436 100644 --- a/netty/src/test/java/io/grpc/netty/NettyServerTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyServerTest.java @@ -122,7 +122,7 @@ public class NettyServerTest { final int originalLowWaterMark = 2097169; final int originalHighWaterMark = 2097211; - Map, Object> channelOptions = new HashMap, Object>(); + Map, Object> channelOptions = new HashMap<>(); channelOptions.put(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(originalLowWaterMark, originalHighWaterMark)); diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java index eabe385ffa..d981ee2845 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java @@ -116,22 +116,22 @@ class OkHttpProtocolNegotiator { static final class AndroidNegotiator extends OkHttpProtocolNegotiator { // setUseSessionTickets(boolean) private static final OptionalMethod SET_USE_SESSION_TICKETS = - new OptionalMethod(null, "setUseSessionTickets", Boolean.TYPE); + new OptionalMethod<>(null, "setUseSessionTickets", Boolean.TYPE); // setHostname(String) private static final OptionalMethod SET_HOSTNAME = - new OptionalMethod(null, "setHostname", String.class); + new OptionalMethod<>(null, "setHostname", String.class); // byte[] getAlpnSelectedProtocol() private static final OptionalMethod GET_ALPN_SELECTED_PROTOCOL = - new OptionalMethod(byte[].class, "getAlpnSelectedProtocol"); + new OptionalMethod<>(byte[].class, "getAlpnSelectedProtocol"); // setAlpnProtocol(byte[]) private static final OptionalMethod SET_ALPN_PROTOCOLS = - new OptionalMethod(null, "setAlpnProtocols", byte[].class); + new OptionalMethod<>(null, "setAlpnProtocols", byte[].class); // byte[] getNpnSelectedProtocol() private static final OptionalMethod GET_NPN_SELECTED_PROTOCOL = - new OptionalMethod(byte[].class, "getNpnSelectedProtocol"); + new OptionalMethod<>(byte[].class, "getNpnSelectedProtocol"); // setNpnProtocol(byte[]) private static final OptionalMethod SET_NPN_PROTOCOLS = - new OptionalMethod(null, "setNpnProtocols", byte[].class); + new OptionalMethod<>(null, "setNpnProtocols", byte[].class); AndroidNegotiator(Platform platform) { super(platform); diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientStreamTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientStreamTest.java index 1b7d38fc1a..c1731c8b32 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientStreamTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientStreamTest.java @@ -109,7 +109,7 @@ public class OkHttpClientStreamTest { @Test public void cancel_notStarted() { - final AtomicReference statusRef = new AtomicReference(); + final AtomicReference statusRef = new AtomicReference<>(); stream.start(new BaseClientStreamListener() { @Override public void closed( diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java index ab2a721e29..572b8ac895 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java @@ -1925,7 +1925,7 @@ public class OkHttpClientTransportTest { THROW_ERROR } - final LinkedBlockingQueue nextResults = new LinkedBlockingQueue(); + final LinkedBlockingQueue nextResults = new LinkedBlockingQueue<>(); @Override public void close() throws IOException { diff --git a/okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java b/okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java index c2515d2b06..1879ce9d6a 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OptionalMethodTest.java @@ -57,30 +57,30 @@ public class OptionalMethodTest { @Test public void isSupported() { - OptionalMethod defaultClassMethod = new OptionalMethod( + OptionalMethod defaultClassMethod = new OptionalMethod<>( String.class, "testMethod", String.class); assertTrue(defaultClassMethod.isSupported(new DefaultClass())); - OptionalMethod privateImpl = new OptionalMethod( + OptionalMethod privateImpl = new OptionalMethod<>( String.class, "testMethod", String.class); assertTrue(privateImpl.isSupported(new PrivateImpl())); - OptionalMethod privateClass = new OptionalMethod( + OptionalMethod privateClass = new OptionalMethod<>( String.class, "testMethod", String.class); assertFalse(privateClass.isSupported(new PrivateClass())); } @Test public void invokeOptional() throws InvocationTargetException { - OptionalMethod defaultClassMethod = new OptionalMethod( + OptionalMethod defaultClassMethod = new OptionalMethod<>( String.class, "testMethod", String.class); assertEquals("testArg", defaultClassMethod.invokeOptional(new DefaultClass(), "testArg")); - OptionalMethod privateImpl = new OptionalMethod( + OptionalMethod privateImpl = new OptionalMethod<>( String.class, "testMethod", String.class); assertEquals("testArg", privateImpl.invokeOptional(new PrivateImpl(), "testArg")); - OptionalMethod privateClass = new OptionalMethod( + OptionalMethod privateClass = new OptionalMethod<>( String.class, "testMethod", String.class); assertEquals(null, privateClass.invokeOptional(new PrivateClass(), "testArg")); } diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java index 2610932a54..7638f5be55 100644 --- a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java +++ b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java @@ -163,15 +163,15 @@ public class Platform { if (androidOrAppEngineProvider != null) { // Attempt to find Android 2.3+ APIs. OptionalMethod setUseSessionTickets - = new OptionalMethod(null, "setUseSessionTickets", boolean.class); + = new OptionalMethod<>(null, "setUseSessionTickets", boolean.class); OptionalMethod setHostname - = new OptionalMethod(null, "setHostname", String.class); + = new OptionalMethod<>(null, "setHostname", String.class); Method trafficStatsTagSocket = null; Method trafficStatsUntagSocket = null; OptionalMethod getAlpnSelectedProtocol = - new OptionalMethod(byte[].class, "getAlpnSelectedProtocol"); + new OptionalMethod<>(byte[].class, "getAlpnSelectedProtocol"); OptionalMethod setAlpnProtocols = - new OptionalMethod(null, "setAlpnProtocols", byte[].class); + new OptionalMethod<>(null, "setAlpnProtocols", byte[].class); // Attempt to find Android 4.0+ APIs. try { diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Util.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Util.java index a0e668fd80..d0239d1e71 100644 --- a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Util.java +++ b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Util.java @@ -222,7 +222,7 @@ public final class Util { /** Returns an immutable copy of {@code map}. */ public static Map immutableMap(Map map) { - return Collections.unmodifiableMap(new LinkedHashMap(map)); + return Collections.unmodifiableMap(new LinkedHashMap<>(map)); } public static ThreadFactory threadFactory(final String name, final boolean daemon) { diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/Hpack.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/Hpack.java index 5db4f09967..d574e19960 100644 --- a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/Hpack.java +++ b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/Hpack.java @@ -118,7 +118,7 @@ final class Hpack { // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-12#section-3.1 static final class Reader { - private final List headerList = new ArrayList(); + private final List headerList = new ArrayList<>(); private final BufferedSource source; private int headerTableSizeSetting; @@ -222,7 +222,7 @@ final class Hpack { } public List getAndResetHeaderList() { - List result = new ArrayList(headerList); + List result = new ArrayList<>(headerList); headerList.clear(); return result; } @@ -362,7 +362,7 @@ final class Hpack { private static Map nameToFirstIndex() { Map result = - new LinkedHashMap(STATIC_HEADER_TABLE.length); + new LinkedHashMap<>(STATIC_HEADER_TABLE.length); for (int i = 0; i < STATIC_HEADER_TABLE.length; i++) { if (!result.containsKey(STATIC_HEADER_TABLE[i].name)) { result.put(STATIC_HEADER_TABLE[i].name, i); diff --git a/protobuf-lite/src/main/java/io/grpc/protobuf/lite/ProtoLiteUtils.java b/protobuf-lite/src/main/java/io/grpc/protobuf/lite/ProtoLiteUtils.java index 402105f327..326e4ee895 100644 --- a/protobuf-lite/src/main/java/io/grpc/protobuf/lite/ProtoLiteUtils.java +++ b/protobuf-lite/src/main/java/io/grpc/protobuf/lite/ProtoLiteUtils.java @@ -81,7 +81,7 @@ public final class ProtoLiteUtils { */ public static Marshaller marshaller(T defaultInstance) { // TODO(ejona): consider changing return type to PrototypeMarshaller (assuming ABI safe) - return new MessageMarshaller(defaultInstance); + return new MessageMarshaller<>(defaultInstance); } /** @@ -91,7 +91,7 @@ public final class ProtoLiteUtils { */ public static Metadata.BinaryMarshaller metadataMarshaller( T defaultInstance) { - return new MetadataMarshaller(defaultInstance); + return new MetadataMarshaller<>(defaultInstance); } /** Copies the data from input stream to output stream. */ @@ -117,7 +117,7 @@ public final class ProtoLiteUtils { private static final class MessageMarshaller implements PrototypeMarshaller { - private static final ThreadLocal> bufs = new ThreadLocal>(); + private static final ThreadLocal> bufs = new ThreadLocal<>(); private final Parser parser; private final T defaultInstance; @@ -179,7 +179,7 @@ public final class ProtoLiteUtils { byte[] buf; if ((ref = bufs.get()) == null || (buf = ref.get()) == null || buf.length < size) { buf = new byte[size]; - bufs.set(new WeakReference(buf)); + bufs.set(new WeakReference<>(buf)); } int remaining = size; diff --git a/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java b/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java index 2195707e95..d435409fd9 100644 --- a/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java +++ b/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java @@ -40,7 +40,7 @@ public final class NanoUtils { * @since 1.0.0 */ public static Marshaller marshaller(MessageNanoFactory factory) { - return new MessageMarshaller(factory); + return new MessageMarshaller<>(factory); } private static final class MessageMarshaller implements Marshaller { diff --git a/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java b/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java index 53edf795e4..beadb0f1eb 100644 --- a/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java +++ b/services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java @@ -98,8 +98,8 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef return serverReflectionIndex; } - Set serverFileDescriptors = new HashSet(); - Set serverServiceNames = new HashSet(); + Set serverFileDescriptors = new HashSet<>(); + Set serverServiceNames = new HashSet<>(); List serverMutableServices = server.getMutableServices(); for (ServerServiceDefinition mutableService : serverMutableServices) { io.grpc.ServiceDescriptor serviceDescriptor = mutableService.getServiceDescriptor(); @@ -299,8 +299,8 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef ServerReflectionRequest request, FileDescriptor fd) { FileDescriptorResponse.Builder fdRBuilder = FileDescriptorResponse.newBuilder(); - Set seenFiles = new HashSet(); - Queue frontier = new ArrayDeque(); + Set seenFiles = new HashSet<>(); + Queue frontier = new ArrayDeque<>(); seenFiles.add(fd.getName()); frontier.add(fd); while (!frontier.isEmpty()) { @@ -348,7 +348,7 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef Set immutableServiceNames = immutableServicesIndex.getServiceNames(); Set mutableServiceNames = mutableServicesIndex.getServiceNames(); Set serviceNames = - new HashSet(immutableServiceNames.size() + mutableServiceNames.size()); + new HashSet<>(immutableServiceNames.size() + mutableServiceNames.size()); serviceNames.addAll(immutableServiceNames); serviceNames.addAll(mutableServiceNames); return serviceNames; @@ -398,18 +398,18 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef * mutable services. */ private static final class FileDescriptorIndex { - private final Set serviceNames = new HashSet(); - private final Set serviceFileDescriptors = new HashSet(); + private final Set serviceNames = new HashSet<>(); + private final Set serviceFileDescriptors = new HashSet<>(); private final Map fileDescriptorsByName = - new HashMap(); + new HashMap<>(); private final Map fileDescriptorsBySymbol = - new HashMap(); + new HashMap<>(); private final Map> fileDescriptorsByExtensionAndNumber = - new HashMap>(); + new HashMap<>(); FileDescriptorIndex(List services) { - Queue fileDescriptorsToProcess = new ArrayDeque(); - Set seenFiles = new HashSet(); + Queue fileDescriptorsToProcess = new ArrayDeque<>(); + Set seenFiles = new HashSet<>(); for (ServerServiceDefinition service : services) { io.grpc.ServiceDescriptor serviceDescriptor = service.getServiceDescriptor(); if (serviceDescriptor.getSchemaDescriptor() instanceof ProtoFileDescriptorSupplier) { diff --git a/services/src/main/java/io/grpc/services/BinlogHelper.java b/services/src/main/java/io/grpc/services/BinlogHelper.java index bda4f1f48a..ab503ca3a3 100644 --- a/services/src/main/java/io/grpc/services/BinlogHelper.java +++ b/services/src/main/java/io/grpc/services/BinlogHelper.java @@ -627,9 +627,9 @@ final class BinlogHelper { FactoryImpl(BinaryLogSink sink, String configurationString) { checkNotNull(sink, "sink"); BinlogHelper globalLog = null; - Map perServiceLogs = new HashMap(); - Map perMethodLogs = new HashMap(); - Set blacklistedMethods = new HashSet(); + Map perServiceLogs = new HashMap<>(); + Map perMethodLogs = new HashMap<>(); + Set blacklistedMethods = new HashSet<>(); if (configurationString != null && configurationString.length() > 0) { for (String configuration : Splitter.on(',').split(configurationString)) { Matcher configMatcher = configRe.matcher(configuration); @@ -796,11 +796,11 @@ final class BinlogHelper { return builder.build(); } - private static final Set NEVER_INCLUDED_METADATA = new HashSet( + private static final Set NEVER_INCLUDED_METADATA = new HashSet<>( Collections.singletonList( // grpc-status-details-bin is already logged in a field of the binlog proto STATUS_DETAILS_KEY.name())); - private static final Set ALWAYS_INCLUDED_METADATA = new HashSet( + private static final Set ALWAYS_INCLUDED_METADATA = new HashSet<>( Collections.singletonList( "grpc-trace-bin")); @@ -846,7 +846,7 @@ final class BinlogHelper { } } } - return new MaybeTruncated(metaBuilder, truncated); + return new MaybeTruncated<>(metaBuilder, truncated); } @VisibleForTesting @@ -861,6 +861,6 @@ final class BinlogHelper { int desiredBytes = Math.min(maxMessageBytes, message.length); msgBuilder.setData(ByteString.copyFrom(message, 0, desiredBytes)); } - return new MaybeTruncated(msgBuilder, maxMessageBytes < message.length); + return new MaybeTruncated<>(msgBuilder, maxMessageBytes < message.length); } } diff --git a/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java b/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java index 754d1a779d..c3f9445c6a 100644 --- a/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java +++ b/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java @@ -101,7 +101,7 @@ final class HealthCheckingLoadBalancerFactory extends Factory { @Nullable String healthCheckedService; private boolean balancerShutdown; - final HashSet hcStates = new HashSet(); + final HashSet hcStates = new HashSet<>(); HelperImpl(Helper delegate) { this.delegate = checkNotNull(delegate, "delegate"); diff --git a/services/src/test/java/io/grpc/protobuf/services/ProtoReflectionServiceTest.java b/services/src/test/java/io/grpc/protobuf/services/ProtoReflectionServiceTest.java index 4c703ecd8d..00cc42ca3b 100644 --- a/services/src/test/java/io/grpc/protobuf/services/ProtoReflectionServiceTest.java +++ b/services/src/test/java/io/grpc/protobuf/services/ProtoReflectionServiceTest.java @@ -101,7 +101,7 @@ public class ProtoReflectionServiceTest { @Test public void listServices() throws Exception { Set originalServices = - new HashSet( + new HashSet<>( Arrays.asList( ServiceResponse.newBuilder() .setName("grpc.reflection.v1alpha.ServerReflection") @@ -113,7 +113,7 @@ public class ProtoReflectionServiceTest { handlerRegistry.addService(dynamicService); assertServiceResponseEquals( - new HashSet( + new HashSet<>( Arrays.asList( ServiceResponse.newBuilder() .setName("grpc.reflection.v1alpha.ServerReflection") @@ -127,7 +127,7 @@ public class ProtoReflectionServiceTest { handlerRegistry.addService(anotherDynamicService); assertServiceResponseEquals( - new HashSet( + new HashSet<>( Arrays.asList( ServiceResponse.newBuilder() .setName("grpc.reflection.v1alpha.ServerReflection") @@ -144,7 +144,7 @@ public class ProtoReflectionServiceTest { handlerRegistry.removeService(dynamicService); assertServiceResponseEquals( - new HashSet( + new HashSet<>( Arrays.asList( ServiceResponse.newBuilder() .setName("grpc.reflection.v1alpha.ServerReflection") @@ -261,7 +261,7 @@ public class ProtoReflectionServiceTest { .getFileDescriptorResponse() .getFileDescriptorProtoList(); assertEquals(goldenResponse.size(), response.size()); - assertEquals(new HashSet(goldenResponse), new HashSet(response)); + assertEquals(new HashSet<>(goldenResponse), new HashSet<>(response)); } @Test @@ -368,7 +368,7 @@ public class ProtoReflectionServiceTest { .getFileDescriptorResponse() .getFileDescriptorProtoList(); assertEquals(goldenResponse.size(), response.size()); - assertEquals(new HashSet(goldenResponse), new HashSet(response)); + assertEquals(new HashSet<>(goldenResponse), new HashSet<>(response)); } @Test @@ -461,7 +461,7 @@ public class ProtoReflectionServiceTest { .setAllExtensionNumbersOfType("grpc.reflection.testing.ThirdLevelType") .build(); - Set goldenResponse = new HashSet(Arrays.asList(100, 101)); + Set goldenResponse = new HashSet<>(Arrays.asList(100, 101)); StreamRecorder responseObserver = StreamRecorder.create(); StreamObserver requestObserver = @@ -469,7 +469,7 @@ public class ProtoReflectionServiceTest { requestObserver.onNext(request); requestObserver.onCompleted(); Set extensionNumberResponseSet = - new HashSet( + new HashSet<>( responseObserver .firstValue() .get() @@ -632,6 +632,6 @@ public class ProtoReflectionServiceTest { List response = responseObserver.firstValue().get().getListServicesResponse().getServiceList(); assertEquals(goldenResponse.size(), response.size()); - assertEquals(goldenResponse, new HashSet(response)); + assertEquals(goldenResponse, new HashSet<>(response)); } } diff --git a/services/src/test/java/io/grpc/services/BinaryLogProviderTest.java b/services/src/test/java/io/grpc/services/BinaryLogProviderTest.java index 8e8703085e..454ec6d76d 100644 --- a/services/src/test/java/io/grpc/services/BinaryLogProviderTest.java +++ b/services/src/test/java/io/grpc/services/BinaryLogProviderTest.java @@ -80,8 +80,8 @@ public class BinaryLogProviderTest { .setSafe(true) .setSampledToLocalTracing(true) .build(); - private final List binlogReq = new ArrayList(); - private final List binlogResp = new ArrayList(); + private final List binlogReq = new ArrayList<>(); + private final List binlogResp = new ArrayList<>(); private final BinaryLogProvider binlogProvider = new BinaryLogProvider() { @Override public ServerInterceptor getServerInterceptor(String fullMethodName) { @@ -98,13 +98,13 @@ public class BinaryLogProviderTest { @Test public void wrapChannel_methodDescriptor() throws Exception { final AtomicReference> methodRef = - new AtomicReference>(); + new AtomicReference<>(); Channel channel = new Channel() { @Override public ClientCall newCall( MethodDescriptor method, CallOptions callOptions) { methodRef.set(method); - return new NoopClientCall(); + return new NoopClientCall<>(); } @Override @@ -119,9 +119,9 @@ public class BinaryLogProviderTest { @Test public void wrapChannel_handler() throws Exception { - final List serializedReq = new ArrayList(); + final List serializedReq = new ArrayList<>(); final AtomicReference> listener = - new AtomicReference>(); + new AtomicReference<>(); Channel channel = new Channel() { @Override public ClientCall newCall( @@ -226,7 +226,7 @@ public class BinaryLogProviderTest { // The request as seen by the user supplied server code final List observedRequest = new ArrayList<>(); final AtomicReference> serverCall = - new AtomicReference>(); + new AtomicReference<>(); ServerMethodDefinition methodDef = ServerMethodDefinition.create( method, diff --git a/services/src/test/java/io/grpc/services/BinlogHelperTest.java b/services/src/test/java/io/grpc/services/BinlogHelperTest.java index 9a17d14014..bf4a044d26 100644 --- a/services/src/test/java/io/grpc/services/BinlogHelperTest.java +++ b/services/src/test/java/io/grpc/services/BinlogHelperTest.java @@ -917,7 +917,7 @@ public final class BinlogHelperTest { @SuppressWarnings({"rawtypes", "unchecked"}) public void serverDeadlineLogged() { final AtomicReference interceptedCall = - new AtomicReference(); + new AtomicReference<>(); final ServerCall.Listener mockListener = mock(ServerCall.Listener.class); final MethodDescriptor method = @@ -995,7 +995,7 @@ public final class BinlogHelperTest { public ClientCall newCall( MethodDescriptor methodDescriptor, CallOptions callOptions) { - return new NoopClientCall(); + return new NoopClientCall<>(); } @Override @@ -1049,7 +1049,7 @@ public final class BinlogHelperTest { public ClientCall newCall( MethodDescriptor methodDescriptor, CallOptions callOptions) { - return new NoopClientCall(); + return new NoopClientCall<>(); } @Override @@ -1081,10 +1081,10 @@ public final class BinlogHelperTest { @SuppressWarnings({"rawtypes", "unchecked"}) public void clientInterceptor() throws Exception { final AtomicReference interceptedListener = - new AtomicReference(); + new AtomicReference<>(); // capture these manually because ClientCall can not be mocked - final AtomicReference actualClientInitial = new AtomicReference(); - final AtomicReference actualRequest = new AtomicReference(); + final AtomicReference actualClientInitial = new AtomicReference<>(); + final AtomicReference actualRequest = new AtomicReference<>(); final SettableFuture halfCloseCalled = SettableFuture.create(); final SettableFuture cancelCalled = SettableFuture.create(); @@ -1248,10 +1248,10 @@ public final class BinlogHelperTest { @SuppressWarnings({"rawtypes", "unchecked"}) public void clientInterceptor_trailersOnlyResponseLogsPeerAddress() throws Exception { final AtomicReference interceptedListener = - new AtomicReference(); + new AtomicReference<>(); // capture these manually because ClientCall can not be mocked - final AtomicReference actualClientInitial = new AtomicReference(); - final AtomicReference actualRequest = new AtomicReference(); + final AtomicReference actualClientInitial = new AtomicReference<>(); + final AtomicReference actualRequest = new AtomicReference<>(); Channel channel = new Channel() { @Override @@ -1333,14 +1333,14 @@ public final class BinlogHelperTest { @SuppressWarnings({"rawtypes", "unchecked"}) public void serverInterceptor() throws Exception { final AtomicReference interceptedCall = - new AtomicReference(); + new AtomicReference<>(); ServerCall.Listener capturedListener; final ServerCall.Listener mockListener = mock(ServerCall.Listener.class); // capture these manually because ServerCall can not be mocked - final AtomicReference actualServerInitial = new AtomicReference(); - final AtomicReference actualResponse = new AtomicReference(); - final AtomicReference actualStatus = new AtomicReference(); - final AtomicReference actualTrailers = new AtomicReference(); + final AtomicReference actualServerInitial = new AtomicReference<>(); + final AtomicReference actualResponse = new AtomicReference<>(); + final AtomicReference actualStatus = new AtomicReference<>(); + final AtomicReference actualTrailers = new AtomicReference<>(); // begin call and receive client header { diff --git a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java index e7784a242e..5e8bf19497 100644 --- a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java +++ b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java @@ -941,16 +941,16 @@ public class HealthCheckingLoadBalancerFactoryTest { @Test public void getHealthCheckedServiceName_healthCheckConfigMissingServiceName() { - HashMap serviceConfig = new HashMap(); - HashMap hcConfig = new HashMap(); + HashMap serviceConfig = new HashMap<>(); + HashMap hcConfig = new HashMap<>(); serviceConfig.put("healthCheckConfig", hcConfig); assertThat(ServiceConfigUtil.getHealthCheckedServiceName(serviceConfig)).isNull(); } @Test public void getHealthCheckedServiceName_healthCheckConfigHasServiceName() { - HashMap serviceConfig = new HashMap(); - HashMap hcConfig = new HashMap(); + HashMap serviceConfig = new HashMap<>(); + HashMap hcConfig = new HashMap<>(); hcConfig.put("serviceName", "FooService"); serviceConfig.put("healthCheckConfig", hcConfig); assertThat(ServiceConfigUtil.getHealthCheckedServiceName(serviceConfig)) @@ -1022,8 +1022,8 @@ public class HealthCheckingLoadBalancerFactoryTest { } private Attributes attrsWithHealthCheckService(@Nullable String serviceName) { - HashMap serviceConfig = new HashMap(); - HashMap hcConfig = new HashMap(); + HashMap serviceConfig = new HashMap<>(); + HashMap hcConfig = new HashMap<>(); hcConfig.put("serviceName", serviceName); serviceConfig.put("healthCheckConfig", hcConfig); return Attributes.newBuilder() @@ -1068,7 +1068,7 @@ public class HealthCheckingLoadBalancerFactoryTest { private static class HealthImpl extends HealthGrpc.HealthImplBase { boolean checkCalled; - final Queue calls = new ArrayDeque(); + final Queue calls = new ArrayDeque<>(); @Override public void check(HealthCheckRequest request, @@ -1108,7 +1108,7 @@ public class HealthCheckingLoadBalancerFactoryTest { final List eagList; final Attributes attrs; final Channel channel; - final ArrayList logs = new ArrayList(); + final ArrayList logs = new ArrayList<>(); private final ChannelLogger logger = new ChannelLogger() { @Override public void log(ChannelLogLevel level, String msg) { @@ -1222,7 +1222,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // In reality wrappedHelper.createSubchannel() is always called from syncContext. // Make sure it's the case in the test too. private Subchannel createSubchannel(final int index, final Attributes attrs) { - final AtomicReference returnedSubchannel = new AtomicReference(); + final AtomicReference returnedSubchannel = new AtomicReference<>(); syncContext.execute(new Runnable() { @Override public void run() { diff --git a/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java b/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java index 47ce276e22..155f21e00f 100644 --- a/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java +++ b/services/src/test/java/io/grpc/services/HealthStatusManagerTest.java @@ -294,7 +294,7 @@ public class HealthStatusManagerTest { } private static class RespObserver implements StreamObserver { - final ArrayDeque responses = new ArrayDeque(); + final ArrayDeque responses = new ArrayDeque<>(); @Override public void onNext(HealthCheckResponse value) { diff --git a/stub/src/main/java/io/grpc/stub/ClientCalls.java b/stub/src/main/java/io/grpc/stub/ClientCalls.java index db2440381e..b575bcd331 100644 --- a/stub/src/main/java/io/grpc/stub/ClientCalls.java +++ b/stub/src/main/java/io/grpc/stub/ClientCalls.java @@ -154,7 +154,7 @@ public final class ClientCalls { // TODO(louiscryan): Not clear if we want to use this idiom for 'simple' stubs. public static Iterator blockingServerStreamingCall( ClientCall call, ReqT req) { - BlockingResponseStream result = new BlockingResponseStream(call); + BlockingResponseStream result = new BlockingResponseStream<>(call); asyncUnaryRequestCall(call, req, result.listener(), true); return result; } @@ -171,7 +171,7 @@ public final class ClientCalls { Channel channel, MethodDescriptor method, CallOptions callOptions, ReqT req) { ThreadlessExecutor executor = new ThreadlessExecutor(); ClientCall call = channel.newCall(method, callOptions.withExecutor(executor)); - BlockingResponseStream result = new BlockingResponseStream(call, executor); + BlockingResponseStream result = new BlockingResponseStream<>(call, executor); asyncUnaryRequestCall(call, req, result.listener(), true); return result; } @@ -185,8 +185,8 @@ public final class ClientCalls { */ public static ListenableFuture futureUnaryCall( ClientCall call, ReqT req) { - GrpcFuture responseFuture = new GrpcFuture(call); - asyncUnaryRequestCall(call, req, new UnaryStreamToFuture(responseFuture), false); + GrpcFuture responseFuture = new GrpcFuture<>(call); + asyncUnaryRequestCall(call, req, new UnaryStreamToFuture<>(responseFuture), false); return responseFuture; } @@ -265,9 +265,9 @@ public final class ClientCalls { asyncUnaryRequestCall( call, req, - new StreamObserverToCallListenerAdapter( + new StreamObserverToCallListenerAdapter<>( responseObserver, - new CallToStreamObserverAdapter(call), + new CallToStreamObserverAdapter<>(call), streamingResponse), streamingResponse); } @@ -292,10 +292,10 @@ public final class ClientCalls { ClientCall call, StreamObserver responseObserver, boolean streamingResponse) { - CallToStreamObserverAdapter adapter = new CallToStreamObserverAdapter(call); + CallToStreamObserverAdapter adapter = new CallToStreamObserverAdapter<>(call); startCall( call, - new StreamObserverToCallListenerAdapter( + new StreamObserverToCallListenerAdapter<>( responseObserver, adapter, streamingResponse), streamingResponse); return adapter; @@ -522,7 +522,7 @@ public final class ClientCalls { // TODO(ejona86): determine how to allow ClientCall.cancel() in case of application error. private static final class BlockingResponseStream implements Iterator { // Due to flow control, only needs to hold up to 2 items: 1 for value, 1 for close. - private final BlockingQueue buffer = new ArrayBlockingQueue(2); + private final BlockingQueue buffer = new ArrayBlockingQueue<>(2); private final ClientCall.Listener listener = new QueuingListener(); private final ClientCall call; /** May be null. */ @@ -630,7 +630,7 @@ public final class ClientCalls { private static final class ThreadlessExecutor implements Executor { private static final Logger log = Logger.getLogger(ThreadlessExecutor.class.getName()); - private final BlockingQueue queue = new LinkedBlockingQueue(); + private final BlockingQueue queue = new LinkedBlockingQueue<>(); // Non private to avoid synthetic class ThreadlessExecutor() {} diff --git a/stub/src/main/java/io/grpc/stub/MetadataUtils.java b/stub/src/main/java/io/grpc/stub/MetadataUtils.java index 609df039ab..0fedf3711f 100644 --- a/stub/src/main/java/io/grpc/stub/MetadataUtils.java +++ b/stub/src/main/java/io/grpc/stub/MetadataUtils.java @@ -71,7 +71,7 @@ public final class MetadataUtils { @Override public ClientCall interceptCall( MethodDescriptor method, CallOptions callOptions, Channel next) { - return new HeaderAttachingClientCall(next.newCall(method, callOptions)); + return new HeaderAttachingClientCall<>(next.newCall(method, callOptions)); } private final class HeaderAttachingClientCall @@ -135,7 +135,7 @@ public final class MetadataUtils { @Override public ClientCall interceptCall( MethodDescriptor method, CallOptions callOptions, Channel next) { - return new MetadataCapturingClientCall(next.newCall(method, callOptions)); + return new MetadataCapturingClientCall<>(next.newCall(method, callOptions)); } private final class MetadataCapturingClientCall diff --git a/stub/src/main/java/io/grpc/stub/ServerCalls.java b/stub/src/main/java/io/grpc/stub/ServerCalls.java index 6b05f4b6bc..de2cd6dcbd 100644 --- a/stub/src/main/java/io/grpc/stub/ServerCalls.java +++ b/stub/src/main/java/io/grpc/stub/ServerCalls.java @@ -117,7 +117,7 @@ public final class ServerCalls { call.getMethodDescriptor().getType().clientSendsOneMessage(), "asyncUnaryRequestCall is only for clientSendsOneMessage methods"); ServerCallStreamObserverImpl responseObserver = - new ServerCallStreamObserverImpl(call); + new ServerCallStreamObserverImpl<>(call); // We expect only 1 request, but we ask for 2 requests here so that if a misbehaving client // sends more than 1 requests, ServerCall will catch it. Note that disabling auto // inbound flow control has no effect on unary calls. @@ -201,7 +201,7 @@ public final class ServerCalls { */ private static ServerCallHandler asyncUnaryRequestCall( UnaryRequestMethod method) { - return new UnaryServerCallHandler(method); + return new UnaryServerCallHandler<>(method); } private static final class StreamingServerCallHandler @@ -217,7 +217,7 @@ public final class ServerCalls { @Override public ServerCall.Listener startCall(ServerCall call, Metadata headers) { ServerCallStreamObserverImpl responseObserver = - new ServerCallStreamObserverImpl(call); + new ServerCallStreamObserverImpl<>(call); StreamObserver requestObserver = method.invoke(responseObserver); responseObserver.freeze(); if (responseObserver.autoFlowControlEnabled) { @@ -289,7 +289,7 @@ public final class ServerCalls { */ private static ServerCallHandler asyncStreamingRequestCall( StreamingRequestMethod method) { - return new StreamingServerCallHandler(method); + return new StreamingServerCallHandler<>(method); } private interface UnaryRequestMethod { @@ -425,7 +425,7 @@ public final class ServerCalls { // NB: For streaming call we want to do the same as for unary call. Fail-fast by setting error // on responseObserver and then return no-op observer. asyncUnimplementedUnaryCall(methodDescriptor, responseObserver); - return new NoopStreamObserver(); + return new NoopStreamObserver<>(); } /** diff --git a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java index 91ca89a59d..298f58d2f8 100644 --- a/stub/src/test/java/io/grpc/stub/ClientCallsTest.java +++ b/stub/src/test/java/io/grpc/stub/ClientCallsTest.java @@ -133,9 +133,9 @@ public class ClientCallsTest { @Test public void unaryFutureCallSuccess() throws Exception { final AtomicReference> listener = - new AtomicReference>(); - final AtomicReference message = new AtomicReference(); - final AtomicReference halfClosed = new AtomicReference(); + new AtomicReference<>(); + final AtomicReference message = new AtomicReference<>(); + final AtomicReference halfClosed = new AtomicReference<>(); NoopClientCall call = new NoopClientCall() { @Override public void start(io.grpc.ClientCall.Listener responseListener, Metadata headers) { @@ -165,7 +165,7 @@ public class ClientCallsTest { @Test public void unaryFutureCallFailed() throws Exception { final AtomicReference> listener = - new AtomicReference>(); + new AtomicReference<>(); NoopClientCall call = new NoopClientCall() { @Override public void start(io.grpc.ClientCall.Listener responseListener, Metadata headers) { @@ -190,9 +190,9 @@ public class ClientCallsTest { @Test public void unaryFutureCallCancelled() throws Exception { final AtomicReference> listener = - new AtomicReference>(); - final AtomicReference cancelMessage = new AtomicReference(); - final AtomicReference cancelCause = new AtomicReference(); + new AtomicReference<>(); + final AtomicReference cancelMessage = new AtomicReference<>(); + final AtomicReference cancelCause = new AtomicReference<>(); NoopClientCall call = new NoopClientCall() { @Override public void start(io.grpc.ClientCall.Listener responseListener, Metadata headers) { @@ -222,7 +222,7 @@ public class ClientCallsTest { @Test public void cannotSetOnReadyAfterCallStarted() throws Exception { - NoopClientCall call = new NoopClientCall(); + NoopClientCall call = new NoopClientCall<>(); CallStreamObserver callStreamObserver = (CallStreamObserver) ClientCalls.asyncClientStreamingCall(call, new NoopStreamObserver()); @@ -243,7 +243,7 @@ public class ClientCallsTest { public void disablingInboundAutoFlowControlSuppressesRequestsForMoreMessages() throws Exception { final AtomicReference> listener = - new AtomicReference>(); + new AtomicReference<>(); final List requests = new ArrayList<>(); NoopClientCall call = new NoopClientCall() { @Override @@ -304,7 +304,7 @@ public class ClientCallsTest { } }; final AtomicReference> listener = - new AtomicReference>(); + new AtomicReference<>(); final List requests = new ArrayList<>(); NoopClientCall call = new NoopClientCall() { @Override @@ -350,7 +350,7 @@ public class ClientCallsTest { } }; final AtomicReference> listener = - new AtomicReference>(); + new AtomicReference<>(); final List requests = new ArrayList<>(); NoopClientCall call = new NoopClientCall() { @Override @@ -541,7 +541,7 @@ public class ClientCallsTest { @Test public void blockingResponseStreamFailed() throws Exception { final AtomicReference> listener = - new AtomicReference>(); + new AtomicReference<>(); NoopClientCall call = new NoopClientCall() { @Override public void start(io.grpc.ClientCall.Listener responseListener, Metadata headers) { diff --git a/stub/src/test/java/io/grpc/stub/ServerCallsTest.java b/stub/src/test/java/io/grpc/stub/ServerCallsTest.java index 6417679716..973b2a7d02 100644 --- a/stub/src/test/java/io/grpc/stub/ServerCallsTest.java +++ b/stub/src/test/java/io/grpc/stub/ServerCallsTest.java @@ -88,7 +88,7 @@ public class ServerCallsTest { final AtomicBoolean onCancelCalled = new AtomicBoolean(); final AtomicBoolean onReadyCalled = new AtomicBoolean(); final AtomicReference> callObserver = - new AtomicReference>(); + new AtomicReference<>(); ServerCallHandler callHandler = ServerCalls.asyncBidiStreamingCall( new ServerCalls.BidiStreamingMethod() { @@ -111,7 +111,7 @@ public class ServerCallsTest { } }); invokeCalled.set(true); - return new ServerCalls.NoopStreamObserver(); + return new ServerCalls.NoopStreamObserver<>(); } }); ServerCall.Listener callListener = @@ -139,7 +139,7 @@ public class ServerCallsTest { public void noCancellationExceptionIfOnCancelHandlerSet() throws Exception { final AtomicBoolean onCancelCalled = new AtomicBoolean(); final AtomicReference> callObserver = - new AtomicReference>(); + new AtomicReference<>(); ServerCallHandler callHandler = ServerCalls.asyncBidiStreamingCall( new ServerCalls.BidiStreamingMethod() { @@ -154,7 +154,7 @@ public class ServerCallsTest { onCancelCalled.set(true); } }); - return new ServerCalls.NoopStreamObserver(); + return new ServerCalls.NoopStreamObserver<>(); } }); ServerCall.Listener callListener = @@ -171,7 +171,7 @@ public class ServerCallsTest { @Test public void expectCancellationExceptionIfOnCancelHandlerNotSet() throws Exception { final AtomicReference> callObserver = - new AtomicReference>(); + new AtomicReference<>(); ServerCallHandler callHandler = ServerCalls.asyncBidiStreamingCall( new ServerCalls.BidiStreamingMethod() { @@ -180,7 +180,7 @@ public class ServerCallsTest { ServerCallStreamObserver serverCallObserver = (ServerCallStreamObserver) responseObserver; callObserver.set(serverCallObserver); - return new ServerCalls.NoopStreamObserver(); + return new ServerCalls.NoopStreamObserver<>(); } }); ServerCall.Listener callListener = @@ -206,14 +206,14 @@ public class ServerCallsTest { @Test public void cannotSetOnCancelHandlerAfterServiceInvocation() throws Exception { final AtomicReference> callObserver = - new AtomicReference>(); + new AtomicReference<>(); ServerCallHandler callHandler = ServerCalls.asyncBidiStreamingCall( new ServerCalls.BidiStreamingMethod() { @Override public StreamObserver invoke(StreamObserver responseObserver) { callObserver.set((ServerCallStreamObserver) responseObserver); - return new ServerCalls.NoopStreamObserver(); + return new ServerCalls.NoopStreamObserver<>(); } }); ServerCall.Listener callListener = @@ -234,14 +234,14 @@ public class ServerCallsTest { @Test public void cannotSetOnReadyHandlerAfterServiceInvocation() throws Exception { final AtomicReference> callObserver = - new AtomicReference>(); + new AtomicReference<>(); ServerCallHandler callHandler = ServerCalls.asyncBidiStreamingCall( new ServerCalls.BidiStreamingMethod() { @Override public StreamObserver invoke(StreamObserver responseObserver) { callObserver.set((ServerCallStreamObserver) responseObserver); - return new ServerCalls.NoopStreamObserver(); + return new ServerCalls.NoopStreamObserver<>(); } }); ServerCall.Listener callListener = @@ -262,14 +262,14 @@ public class ServerCallsTest { @Test public void cannotDisableAutoFlowControlAfterServiceInvocation() throws Exception { final AtomicReference> callObserver = - new AtomicReference>(); + new AtomicReference<>(); ServerCallHandler callHandler = ServerCalls.asyncBidiStreamingCall( new ServerCalls.BidiStreamingMethod() { @Override public StreamObserver invoke(StreamObserver responseObserver) { callObserver.set((ServerCallStreamObserver) responseObserver); - return new ServerCalls.NoopStreamObserver(); + return new ServerCalls.NoopStreamObserver<>(); } }); ServerCall.Listener callListener = @@ -293,7 +293,7 @@ public class ServerCallsTest { ServerCallStreamObserver serverCallObserver = (ServerCallStreamObserver) responseObserver; serverCallObserver.disableAutoInboundFlowControl(); - return new ServerCalls.NoopStreamObserver(); + return new ServerCalls.NoopStreamObserver<>(); } }); ServerCall.Listener callListener = diff --git a/testing-proto/src/test/java/io/grpc/testing/protobuf/SimpleServiceTest.java b/testing-proto/src/test/java/io/grpc/testing/protobuf/SimpleServiceTest.java index 85c39f3c74..89208c700a 100644 --- a/testing-proto/src/test/java/io/grpc/testing/protobuf/SimpleServiceTest.java +++ b/testing-proto/src/test/java/io/grpc/testing/protobuf/SimpleServiceTest.java @@ -111,7 +111,7 @@ public class SimpleServiceTest { continue; } - Map methodToAnnotation = new HashMap(); + Map methodToAnnotation = new HashMap<>(); for (Element enclosedElement : rootElement.getEnclosedElements()) { RpcMethod annotation = enclosedElement.getAnnotation(RpcMethod.class); if (annotation != null) { diff --git a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java index fca35313ba..d7ef06448a 100644 --- a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java +++ b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java @@ -2017,7 +2017,7 @@ public abstract class AbstractTransportTest { private static class MockServerListener implements ServerListener { public final BlockingQueue listeners - = new LinkedBlockingQueue(); + = new LinkedBlockingQueue<>(); private final SettableFuture shutdown = SettableFuture.create(); @Override @@ -2048,7 +2048,7 @@ public abstract class AbstractTransportTest { private static class MockServerTransportListener implements ServerTransportListener { public final ServerTransport transport; - public final BlockingQueue streams = new LinkedBlockingQueue(); + public final BlockingQueue streams = new LinkedBlockingQueue<>(); private final SettableFuture terminated = SettableFuture.create(); public MockServerTransportListener(ServerTransport transport) { @@ -2094,9 +2094,9 @@ public abstract class AbstractTransportTest { } private static class ServerStreamListenerBase implements ServerStreamListener { - private final BlockingQueue messageQueue = new LinkedBlockingQueue(); + private final BlockingQueue messageQueue = new LinkedBlockingQueue<>(); // Would have used Void instead of Object, but null elements are not allowed - private final BlockingQueue readyQueue = new LinkedBlockingQueue(); + private final BlockingQueue readyQueue = new LinkedBlockingQueue<>(); private final CountDownLatch halfClosedLatch = new CountDownLatch(1); private final SettableFuture status = SettableFuture.create(); @@ -2154,9 +2154,9 @@ public abstract class AbstractTransportTest { } private static class ClientStreamListenerBase implements ClientStreamListener { - private final BlockingQueue messageQueue = new LinkedBlockingQueue(); + private final BlockingQueue messageQueue = new LinkedBlockingQueue<>(); // Would have used Void instead of Object, but null elements are not allowed - private final BlockingQueue readyQueue = new LinkedBlockingQueue(); + private final BlockingQueue readyQueue = new LinkedBlockingQueue<>(); private final SettableFuture headers = SettableFuture.create(); private final SettableFuture trailers = SettableFuture.create(); private final SettableFuture status = SettableFuture.create(); diff --git a/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java b/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java index 5e69ecb958..a4721585e3 100644 --- a/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java +++ b/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java @@ -151,7 +151,7 @@ public class StatsTestUtils { */ // This needs to be synchronized with getCurrentRecordSink() which may run concurrently. public synchronized void rolloverRecords() { - records = new LinkedBlockingQueue(); + records = new LinkedBlockingQueue<>(); } private synchronized BlockingQueue getCurrentRecordSink() { diff --git a/testing/src/main/java/io/grpc/internal/testing/StreamRecorder.java b/testing/src/main/java/io/grpc/internal/testing/StreamRecorder.java index bd0ac9e4c9..adf092f4fc 100644 --- a/testing/src/main/java/io/grpc/internal/testing/StreamRecorder.java +++ b/testing/src/main/java/io/grpc/internal/testing/StreamRecorder.java @@ -36,7 +36,7 @@ public class StreamRecorder implements StreamObserver { * Creates a new recorder. */ public static StreamRecorder create() { - return new StreamRecorder(); + return new StreamRecorder<>(); } private final CountDownLatch latch; diff --git a/testing/src/main/java/io/grpc/internal/testing/TestClientStreamTracer.java b/testing/src/main/java/io/grpc/internal/testing/TestClientStreamTracer.java index d241ecb641..c4677c496a 100644 --- a/testing/src/main/java/io/grpc/internal/testing/TestClientStreamTracer.java +++ b/testing/src/main/java/io/grpc/internal/testing/TestClientStreamTracer.java @@ -31,10 +31,10 @@ public class TestClientStreamTracer extends ClientStreamTracer implements TestSt private final TestBaseStreamTracer delegate = new TestBaseStreamTracer(); protected final CountDownLatch outboundHeadersLatch = new CountDownLatch(1); protected final AtomicReference outboundHeadersCalled = - new AtomicReference(); + new AtomicReference<>(); protected final AtomicReference inboundHeadersCalled = - new AtomicReference(); - protected final AtomicReference inboundTrailers = new AtomicReference(); + new AtomicReference<>(); + protected final AtomicReference inboundTrailers = new AtomicReference<>(); @Override public void await() throws InterruptedException { diff --git a/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java b/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java index 39665cada2..dc9e2df23a 100644 --- a/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java +++ b/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference; public class TestServerStreamTracer extends ServerStreamTracer implements TestStreamTracer { private final TestBaseStreamTracer delegate = new TestBaseStreamTracer(); protected final AtomicReference> serverCallInfo = - new AtomicReference>(); + new AtomicReference<>(); @Override public void await() throws InterruptedException { diff --git a/testing/src/main/java/io/grpc/internal/testing/TestStreamTracer.java b/testing/src/main/java/io/grpc/internal/testing/TestStreamTracer.java index 8b9984e1ce..444537962e 100644 --- a/testing/src/main/java/io/grpc/internal/testing/TestStreamTracer.java +++ b/testing/src/main/java/io/grpc/internal/testing/TestStreamTracer.java @@ -91,10 +91,10 @@ public interface TestStreamTracer { protected final AtomicLong inboundWireSize = new AtomicLong(); protected final AtomicLong outboundUncompressedSize = new AtomicLong(); protected final AtomicLong inboundUncompressedSize = new AtomicLong(); - protected final LinkedBlockingQueue outboundEvents = new LinkedBlockingQueue(); - protected final LinkedBlockingQueue inboundEvents = new LinkedBlockingQueue(); - protected final AtomicReference streamClosedStatus = new AtomicReference(); - protected final AtomicReference streamClosedStack = new AtomicReference(); + protected final LinkedBlockingQueue outboundEvents = new LinkedBlockingQueue<>(); + protected final LinkedBlockingQueue inboundEvents = new LinkedBlockingQueue<>(); + protected final AtomicReference streamClosedStatus = new AtomicReference<>(); + protected final AtomicReference streamClosedStack = new AtomicReference<>(); protected final CountDownLatch streamClosed = new CountDownLatch(1); protected final AtomicBoolean failDuplicateCallbacks = new AtomicBoolean(true); diff --git a/testing/src/main/java/io/grpc/testing/StreamRecorder.java b/testing/src/main/java/io/grpc/testing/StreamRecorder.java index ae1d9d41d3..a1496a0dec 100644 --- a/testing/src/main/java/io/grpc/testing/StreamRecorder.java +++ b/testing/src/main/java/io/grpc/testing/StreamRecorder.java @@ -41,7 +41,7 @@ public class StreamRecorder implements StreamObserver { * Creates a new recorder. */ public static StreamRecorder create() { - return new StreamRecorder(); + return new StreamRecorder<>(); } private final CountDownLatch latch; diff --git a/testing/src/test/java/io/grpc/testing/GrpcServerRuleTest.java b/testing/src/test/java/io/grpc/testing/GrpcServerRuleTest.java index 469aa26117..10a1687126 100644 --- a/testing/src/test/java/io/grpc/testing/GrpcServerRuleTest.java +++ b/testing/src/test/java/io/grpc/testing/GrpcServerRuleTest.java @@ -182,7 +182,7 @@ public class GrpcServerRuleTest { private static class TestServiceImpl extends SimpleServiceGrpc.SimpleServiceImplBase { private final Collection unaryCallRequests = - new ConcurrentLinkedQueue(); + new ConcurrentLinkedQueue<>(); private volatile Thread lastServerStreamingRpcThread;