From e92b2275f95c89cc99921f6c70a821de529e14bf Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 3 Aug 2020 12:51:05 -0700 Subject: [PATCH] Update to Error Prone 2.4 Most of the changes should be semi-clear why they were made. However, BadImport may not be as obvious: https://errorprone.info/bugpattern/BadImport . That impacted classes named Type, Entry, and Factory. Also PublicContructorForAbstractClass: https://errorprone.info/bugpattern/PublicConstructorForAbstractClass The JdkObsolete issue is already resolved but is not yet in a release. --- .../java/io/grpc/alts/AltsServerBuilder.java | 4 ++-- .../java/io/grpc/alts/internal/TsiPeer.java | 2 +- api/src/main/java/io/grpc/Attributes.java | 7 +++---- .../java/io/grpc/DecompressorRegistry.java | 3 +-- .../main/java/io/grpc/InternalMetadata.java | 5 ++--- .../main/java/io/grpc/InternalWithLogId.java | 2 +- api/src/main/java/io/grpc/Metadata.java | 6 +++--- api/src/test/java/io/grpc/MetadataTest.java | 20 +++++++++---------- .../benchmarks/netty/AbstractBenchmark.java | 3 ++- build.gradle | 4 +++- .../io/grpc/census/CensusTracingModule.java | 9 ++++----- .../io/grpc/census/CensusModulesTest.java | 17 +++++++++------- .../java/io/grpc/AttachDetachBenchmark.java | 3 +-- context/src/main/java/io/grpc/Context.java | 2 ++ .../grpc/internal/AbstractClientStream.java | 2 +- .../io/grpc/internal/AtomicLongCounter.java | 2 +- .../java/io/grpc/internal/BackoffPolicy.java | 2 +- .../grpc/internal/ClientTransportFactory.java | 8 ++++---- .../io/grpc/internal/ContextRunnable.java | 2 +- .../io/grpc/internal/DnsNameResolver.java | 3 +-- .../internal/ForwardingReadableBuffer.java | 2 +- .../internal/JndiResourceResolverFactory.java | 3 ++- .../io/grpc/internal/RetriableStream.java | 4 ++-- .../io/grpc/internal/ServiceConfigState.java | 1 - .../inprocess/InProcessServerBuilderTest.java | 10 +++++----- .../io/grpc/internal/ClientCallImplTest.java | 5 ++--- .../io/grpc/internal/DelayedStreamTest.java | 3 +-- ...ManagedChannelImplGetNameResolverTest.java | 7 +++---- .../test/java/io/grpc/internal/TestUtils.java | 2 +- .../grpc/internal/TransportFrameUtilTest.java | 16 ++++++++------- .../grpc/grpclb/GrpclbClientLoadRecorder.java | 3 +-- .../main/java/io/grpc/grpclb/GrpclbState.java | 3 +-- .../integration/AbstractInteropTest.java | 2 +- .../GrpclbLongLivedAffinityTestClient.java | 4 ++-- .../grpc/testing/integration/Http2Client.java | 6 +++--- .../io/grpc/netty/AbstractHttp2Headers.java | 4 ++-- .../netty/GrpcHttp2ConnectionHandler.java | 2 +- .../grpc/netty/GrpcHttp2OutboundHeaders.java | 12 +++++------ .../java/io/grpc/netty/NettyClientStream.java | 2 +- .../io/grpc/netty/ProtocolNegotiator.java | 2 +- netty/src/main/java/io/grpc/netty/Utils.java | 5 ++--- .../io/grpc/netty/NettyClientHandlerTest.java | 3 ++- .../io/grpc/netty/NettyServerBuilderTest.java | 5 +++-- .../io/grpc/okhttp/OkHttpClientTransport.java | 3 ++- .../io/grpc/okhttp/OkHttpTlsUpgrader.java | 2 +- .../io/grpc/okhttp/internal/Platform.java | 13 +++++++++++- .../java/io/grpc/okhttp/internal/Util.java | 3 +++ .../okhttp/internal/framed/FrameReader.java | 2 +- .../okhttp/internal/framed/FrameWriter.java | 2 +- .../io/grpc/rls/CachingRlsLbClientTest.java | 4 ++-- .../java/io/grpc/rls/RlsLoadBalancerTest.java | 4 ++-- .../java/io/grpc/services/BinlogHelper.java | 9 ++++----- .../io/grpc/services/ChannelzProtoUtil.java | 4 ++-- .../HealthCheckingLoadBalancerFactory.java | 7 +++---- .../HealthCheckingLoadBalancerUtil.java | 12 +++++------ .../io/grpc/services/BinlogHelperTest.java | 9 ++++----- .../grpc/services/ChannelzProtoUtilTest.java | 4 ++-- ...HealthCheckingLoadBalancerFactoryTest.java | 9 ++++----- .../java/io/grpc/xds/LoadStatsStoreImpl.java | 2 ++ .../MeshCaCertificateProvider.java | 2 +- .../internal/sds/ReferenceCountingMap.java | 2 +- .../grpc/xds/internal/sts/StsCredentials.java | 1 + .../io/grpc/xds/ClientLoadCounterTest.java | 4 ++-- 63 files changed, 162 insertions(+), 148 deletions(-) diff --git a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java index fdda8caac6..f23e6612f9 100644 --- a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java +++ b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java @@ -30,7 +30,7 @@ import io.grpc.ServerCall.Listener; import io.grpc.ServerCallHandler; import io.grpc.ServerInterceptor; import io.grpc.ServerServiceDefinition; -import io.grpc.ServerStreamTracer.Factory; +import io.grpc.ServerStreamTracer; import io.grpc.ServerTransportFilter; import io.grpc.Status; import io.grpc.alts.internal.AltsProtocolNegotiator; @@ -102,7 +102,7 @@ public final class AltsServerBuilder extends ServerBuilder { /** {@inheritDoc} */ @Override - public AltsServerBuilder addStreamTracerFactory(Factory factory) { + public AltsServerBuilder addStreamTracerFactory(ServerStreamTracer.Factory factory) { delegate.addStreamTracerFactory(factory); return this; } diff --git a/alts/src/main/java/io/grpc/alts/internal/TsiPeer.java b/alts/src/main/java/io/grpc/alts/internal/TsiPeer.java index 01e3c821ad..c02188c50a 100644 --- a/alts/src/main/java/io/grpc/alts/internal/TsiPeer.java +++ b/alts/src/main/java/io/grpc/alts/internal/TsiPeer.java @@ -54,7 +54,7 @@ public final class TsiPeer { private final String name; private final T value; - public Property(@Nonnull String name, @Nonnull T value) { + protected Property(@Nonnull String name, @Nonnull T value) { this.name = name; this.value = value; } diff --git a/api/src/main/java/io/grpc/Attributes.java b/api/src/main/java/io/grpc/Attributes.java index cadafece3e..b70cc2bc8c 100644 --- a/api/src/main/java/io/grpc/Attributes.java +++ b/api/src/main/java/io/grpc/Attributes.java @@ -22,7 +22,6 @@ import com.google.common.base.Objects; import java.util.Collections; import java.util.IdentityHashMap; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; @@ -179,7 +178,7 @@ public final class Attributes { if (data.size() != that.data.size()) { return false; } - for (Entry, Object> e : data.entrySet()) { + for (Map.Entry, Object> e : data.entrySet()) { if (!that.data.containsKey(e.getKey())) { return false; } @@ -202,7 +201,7 @@ public final class Attributes { @Override public int hashCode() { int hashCode = 0; - for (Entry, Object> e : data.entrySet()) { + for (Map.Entry, Object> e : data.entrySet()) { hashCode += Objects.hashCode(e.getKey(), e.getValue()); } return hashCode; @@ -262,7 +261,7 @@ public final class Attributes { */ public Attributes build() { if (newdata != null) { - for (Entry, Object> entry : base.data.entrySet()) { + for (Map.Entry, Object> entry : base.data.entrySet()) { if (!newdata.containsKey(entry.getKey())) { newdata.put(entry.getKey(), entry.getValue()); } diff --git a/api/src/main/java/io/grpc/DecompressorRegistry.java b/api/src/main/java/io/grpc/DecompressorRegistry.java index 305c5700aa..ea0433d8d0 100644 --- a/api/src/main/java/io/grpc/DecompressorRegistry.java +++ b/api/src/main/java/io/grpc/DecompressorRegistry.java @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; @@ -116,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()); - for (Entry entry : decompressors.entrySet()) { + for (Map.Entry entry : decompressors.entrySet()) { if (entry.getValue().advertised) { advertisedDecompressors.add(entry.getKey()); } diff --git a/api/src/main/java/io/grpc/InternalMetadata.java b/api/src/main/java/io/grpc/InternalMetadata.java index d011eb9e8c..2823882952 100644 --- a/api/src/main/java/io/grpc/InternalMetadata.java +++ b/api/src/main/java/io/grpc/InternalMetadata.java @@ -19,7 +19,6 @@ package io.grpc; import com.google.common.io.BaseEncoding; import io.grpc.Metadata.AsciiMarshaller; import io.grpc.Metadata.BinaryStreamMarshaller; -import io.grpc.Metadata.Key; import java.nio.charset.Charset; /** @@ -53,13 +52,13 @@ public final class InternalMetadata { = Metadata.BASE64_ENCODING_OMIT_PADDING; @Internal - public static Key keyOf(String name, TrustedAsciiMarshaller marshaller) { + public static Metadata.Key keyOf(String name, TrustedAsciiMarshaller marshaller) { boolean isPseudo = name != null && !name.isEmpty() && name.charAt(0) == ':'; return Metadata.Key.of(name, isPseudo, marshaller); } @Internal - public static Key keyOf(String name, AsciiMarshaller marshaller) { + public static Metadata.Key keyOf(String name, AsciiMarshaller marshaller) { boolean isPseudo = name != null && !name.isEmpty() && name.charAt(0) == ':'; return Metadata.Key.of(name, isPseudo, marshaller); } diff --git a/api/src/main/java/io/grpc/InternalWithLogId.java b/api/src/main/java/io/grpc/InternalWithLogId.java index 930c34583f..e5051233e3 100644 --- a/api/src/main/java/io/grpc/InternalWithLogId.java +++ b/api/src/main/java/io/grpc/InternalWithLogId.java @@ -28,7 +28,7 @@ public interface InternalWithLogId { * numeric ID that is unique among the instances. * *

The subclasses of this interface usually want to include the log ID in their {@link - * #toString} results. + * Object#toString} results. */ InternalLogId getLogId(); } diff --git a/api/src/main/java/io/grpc/Metadata.java b/api/src/main/java/io/grpc/Metadata.java index a9963cb5b8..e153fd5569 100644 --- a/api/src/main/java/io/grpc/Metadata.java +++ b/api/src/main/java/io/grpc/Metadata.java @@ -753,14 +753,14 @@ public final class Metadata { } /** - * @return The original name used to create this key. + * Returns the original name used to create this key. */ public final String originalName() { return originalName; } /** - * @return The normalized name for this key. + * Returns the normalized name for this key. */ public final String name() { return name; @@ -870,7 +870,7 @@ public final class Metadata { } } - /** A binary key for values which should be serialized lazily to {@Link InputStream}s. */ + /** A binary key for values which should be serialized lazily to {@link InputStream}s. */ private static class LazyStreamBinaryKey extends Key { private final BinaryStreamMarshaller marshaller; diff --git a/api/src/test/java/io/grpc/MetadataTest.java b/api/src/test/java/io/grpc/MetadataTest.java index c9095a82d5..122a11f85e 100644 --- a/api/src/test/java/io/grpc/MetadataTest.java +++ b/api/src/test/java/io/grpc/MetadataTest.java @@ -30,7 +30,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; -import io.grpc.Metadata.Key; import io.grpc.internal.GrpcUtil; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -115,9 +114,9 @@ public class MetadataTest { private static final byte[] LANCE_BYTES = LANCE.getBytes(US_ASCII); private static final Metadata.Key KEY = Metadata.Key.of("test-bin", FISH_MARSHALLER); private static final Metadata.Key KEY_STREAMED = - Key.of("streamed-bin", FISH_STREAM_MARSHALLER); + Metadata.Key.of("streamed-bin", FISH_STREAM_MARSHALLER); private static final Metadata.Key KEY_IMMUTABLE = - Key.of("immutable-bin", IMMUTABLE_FISH_MARSHALLER); + Metadata.Key.of("immutable-bin", IMMUTABLE_FISH_MARSHALLER); @Test public void noPseudoHeaders() { @@ -348,7 +347,7 @@ public class MetadataTest { public void removeIgnoresMissingValue() { Metadata m = new Metadata(); // Any key will work. - Key key = GrpcUtil.USER_AGENT_KEY; + Metadata.Key key = GrpcUtil.USER_AGENT_KEY; boolean success = m.remove(key, "agent"); assertFalse(success); @@ -358,7 +357,7 @@ public class MetadataTest { public void removeAllIgnoresMissingValue() { Metadata m = new Metadata(); // Any key will work. - Key key = GrpcUtil.USER_AGENT_KEY; + Metadata.Key key = GrpcUtil.USER_AGENT_KEY; Iterable removed = m.removeAll(key); assertNull(removed); @@ -366,9 +365,9 @@ public class MetadataTest { @Test public void keyEqualsHashNameWorks() { - Key k1 = Key.of("case", Metadata.ASCII_STRING_MARSHALLER); + Metadata.Key k1 = Metadata.Key.of("case", Metadata.ASCII_STRING_MARSHALLER); - Key k2 = Key.of("CASE", Metadata.ASCII_STRING_MARSHALLER); + Metadata.Key k2 = Metadata.Key.of("CASE", Metadata.ASCII_STRING_MARSHALLER); assertEquals(k1, k1); assertNotEquals(k1, null); assertNotEquals(k1, new Object(){}); @@ -383,7 +382,7 @@ public class MetadataTest { @Test public void invalidKeyName() { try { - Key.of("io.grpc/key1", Metadata.ASCII_STRING_MARSHALLER); + Metadata.Key.of("io.grpc/key1", Metadata.ASCII_STRING_MARSHALLER); fail("Should have thrown"); } catch (IllegalArgumentException e) { assertEquals("Invalid character '/' in key name 'io.grpc/key1'", e.getMessage()); @@ -512,7 +511,8 @@ public class MetadataTest { } } - private static Key copyKey(Key key, Metadata.BinaryStreamMarshaller marshaller) { - return Key.of(key.originalName(), marshaller); + private static Metadata.Key copyKey( + Metadata.Key key, Metadata.BinaryStreamMarshaller marshaller) { + return Metadata.Key.of(key.originalName(), marshaller); } } 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 09c5879018..0a4d4089d1 100644 --- a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java +++ b/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java @@ -137,6 +137,7 @@ public abstract class AbstractBenchmark { * sudo ip addr add dev lo 127.127.127.127/32 label lo:benchmark * */ + @SuppressWarnings("JdkObsolete") // No choice but to use Enumeration private static InetAddress buildBenchmarkAddr() { InetAddress tmp = null; try { @@ -180,7 +181,7 @@ public abstract class AbstractBenchmark { private MethodDescriptor flowControlledStreaming; protected ManagedChannel[] channels; - public AbstractBenchmark() { + protected AbstractBenchmark() { } /** diff --git a/build.gradle b/build.gradle index f7ea90dd5c..8eb98f21b0 100644 --- a/build.gradle +++ b/build.gradle @@ -295,7 +295,7 @@ subprojects { if (rootProject.properties.get('errorProne', true)) { dependencies { - errorprone 'com.google.errorprone:error_prone_core:2.3.4' + errorprone 'com.google.errorprone:error_prone_core:2.4.0' errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1' } } else { @@ -373,6 +373,8 @@ subprojects { options.errorprone.check("UnnecessaryAnonymousClass", CheckSeverity.OFF) // This project targets Java 7 (no time.Duration class) options.errorprone.check("PreferJavaTimeOverload", CheckSeverity.OFF) + // The warning fails to provide a source location + options.errorprone.check("MissingSummary", CheckSeverity.OFF) } compileTestJava { // LinkedList doesn't hurt much in tests and has lots of usages diff --git a/census/src/main/java/io/grpc/census/CensusTracingModule.java b/census/src/main/java/io/grpc/census/CensusTracingModule.java index e9e12941ed..fc35d89db5 100644 --- a/census/src/main/java/io/grpc/census/CensusTracingModule.java +++ b/census/src/main/java/io/grpc/census/CensusTracingModule.java @@ -34,7 +34,6 @@ import io.grpc.StreamTracer; import io.opencensus.trace.BlankSpan; import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.MessageEvent; -import io.opencensus.trace.MessageEvent.Type; import io.opencensus.trace.Span; import io.opencensus.trace.SpanContext; import io.opencensus.trace.Status; @@ -283,14 +282,14 @@ final class CensusTracingModule { public void outboundMessageSent( int seqNo, long optionalWireSize, long optionalUncompressedSize) { recordMessageEvent( - span, Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); + span, MessageEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); } @Override public void inboundMessageRead( int seqNo, long optionalWireSize, long optionalUncompressedSize) { recordMessageEvent( - span, Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize); + span, MessageEvent.Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize); } } @@ -349,14 +348,14 @@ final class CensusTracingModule { public void outboundMessageSent( int seqNo, long optionalWireSize, long optionalUncompressedSize) { recordMessageEvent( - span, Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); + span, MessageEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); } @Override public void inboundMessageRead( int seqNo, long optionalWireSize, long optionalUncompressedSize) { recordMessageEvent( - span, Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize); + span, MessageEvent.Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize); } } diff --git a/census/src/test/java/io/grpc/census/CensusModulesTest.java b/census/src/test/java/io/grpc/census/CensusModulesTest.java index 248195bc79..135d5012c9 100644 --- a/census/src/test/java/io/grpc/census/CensusModulesTest.java +++ b/census/src/test/java/io/grpc/census/CensusModulesTest.java @@ -84,7 +84,6 @@ import io.opencensus.tags.TagValue; import io.opencensus.trace.BlankSpan; import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.MessageEvent; -import io.opencensus.trace.MessageEvent.Type; import io.opencensus.trace.Span; import io.opencensus.trace.SpanBuilder; import io.opencensus.trace.SpanContext; @@ -542,11 +541,13 @@ public class CensusModulesTest { inOrder.verify(spyClientSpan, times(3)).addMessageEvent(messageEventCaptor.capture()); List events = messageEventCaptor.getAllValues(); assertEquals( - MessageEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); + MessageEvent.builder(MessageEvent.Type.SENT, 0).setCompressedMessageSize(882).build(), + events.get(0)); assertEquals( - MessageEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); + MessageEvent.builder(MessageEvent.Type.SENT, 1).setUncompressedMessageSize(27).build(), + events.get(1)); assertEquals( - MessageEvent.builder(Type.RECEIVED, 0) + MessageEvent.builder(MessageEvent.Type.RECEIVED, 0) .setCompressedMessageSize(255) .setUncompressedMessageSize(90) .build(), @@ -1065,11 +1066,13 @@ public class CensusModulesTest { inOrder.verify(spyServerSpan, times(3)).addMessageEvent(messageEventCaptor.capture()); List events = messageEventCaptor.getAllValues(); assertEquals( - MessageEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); + MessageEvent.builder(MessageEvent.Type.SENT, 0).setCompressedMessageSize(882).build(), + events.get(0)); assertEquals( - MessageEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); + MessageEvent.builder(MessageEvent.Type.SENT, 1).setUncompressedMessageSize(27).build(), + events.get(1)); assertEquals( - MessageEvent.builder(Type.RECEIVED, 0) + MessageEvent.builder(MessageEvent.Type.RECEIVED, 0) .setCompressedMessageSize(255) .setUncompressedMessageSize(90) .build(), diff --git a/context/src/jmh/java/io/grpc/AttachDetachBenchmark.java b/context/src/jmh/java/io/grpc/AttachDetachBenchmark.java index 8a9321e968..10e845e792 100644 --- a/context/src/jmh/java/io/grpc/AttachDetachBenchmark.java +++ b/context/src/jmh/java/io/grpc/AttachDetachBenchmark.java @@ -16,7 +16,6 @@ package io.grpc; -import io.grpc.Context.Key; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -30,7 +29,7 @@ import org.openjdk.jmh.annotations.State; @State(Scope.Benchmark) public class AttachDetachBenchmark { - private final Key key = Context.keyWithDefault("key", 9999); + private final Context.Key key = Context.keyWithDefault("key", 9999); private final Context cu = Context.current().withValue(key, 8888); /** diff --git a/context/src/main/java/io/grpc/Context.java b/context/src/main/java/io/grpc/Context.java index da540215be..ee926b4866 100644 --- a/context/src/main/java/io/grpc/Context.java +++ b/context/src/main/java/io/grpc/Context.java @@ -943,6 +943,8 @@ public class Context { */ public interface CancellationListener { /** + * Notifies that a context was cancelled. + * * @param context the newly cancelled context. */ void cancelled(Context context); diff --git a/core/src/main/java/io/grpc/internal/AbstractClientStream.java b/core/src/main/java/io/grpc/internal/AbstractClientStream.java index 88d5be6eaf..bf032da314 100644 --- a/core/src/main/java/io/grpc/internal/AbstractClientStream.java +++ b/core/src/main/java/io/grpc/internal/AbstractClientStream.java @@ -75,7 +75,7 @@ public abstract class AbstractClientStream extends AbstractStream * @param endOfStream {@code true} if this is the last frame; {@code flush} is guaranteed to be * {@code true} if this is {@code true} * @param flush {@code true} if more data may not be arriving soon - * @Param numMessages the number of messages this series of frames represents, must be >= 0. + * @param numMessages the number of messages this series of frames represents, must be >= 0. */ void writeFrame( @Nullable WritableBuffer frame, boolean endOfStream, boolean flush, int numMessages); diff --git a/core/src/main/java/io/grpc/internal/AtomicLongCounter.java b/core/src/main/java/io/grpc/internal/AtomicLongCounter.java index 83c685afde..6fab7930a0 100644 --- a/core/src/main/java/io/grpc/internal/AtomicLongCounter.java +++ b/core/src/main/java/io/grpc/internal/AtomicLongCounter.java @@ -19,7 +19,7 @@ package io.grpc.internal; import java.util.concurrent.atomic.AtomicLong; /** - * An implementation of {@link LongCounter} that is just an {@Link AtomicLong}. + * An implementation of {@link LongCounter} that is just an {@link AtomicLong}. */ final class AtomicLongCounter implements LongCounter { private final AtomicLong counter = new AtomicLong(); diff --git a/core/src/main/java/io/grpc/internal/BackoffPolicy.java b/core/src/main/java/io/grpc/internal/BackoffPolicy.java index acbe84b6b3..cdca4a2260 100644 --- a/core/src/main/java/io/grpc/internal/BackoffPolicy.java +++ b/core/src/main/java/io/grpc/internal/BackoffPolicy.java @@ -25,7 +25,7 @@ public interface BackoffPolicy { } /** - * @return The number of nanoseconds to wait. + * Returns the number of nanoseconds to wait. */ long nextBackoffNanos(); } diff --git a/core/src/main/java/io/grpc/internal/ClientTransportFactory.java b/core/src/main/java/io/grpc/internal/ClientTransportFactory.java index 80767ddb0b..9be5431144 100644 --- a/core/src/main/java/io/grpc/internal/ClientTransportFactory.java +++ b/core/src/main/java/io/grpc/internal/ClientTransportFactory.java @@ -63,10 +63,10 @@ public interface ClientTransportFactory extends Closeable { void close(); /** - * Options passed to {@link #newClientTransport(SocketAddress, ClientTransportOptions)}. Although - * it is safe to save this object if received, it is generally expected that the useful fields are - * copied and then the options object is discarded. This allows using {@code final} for those - * fields as well as avoids retaining unused objects contained in the options. + * Options passed to {@link #newClientTransport}. Although it is safe to save this object if + * received, it is generally expected that the useful fields are copied and then the options + * object is discarded. This allows using {@code final} for those fields as well as avoids + * retaining unused objects contained in the options. */ final class ClientTransportOptions { private ChannelLogger channelLogger; diff --git a/core/src/main/java/io/grpc/internal/ContextRunnable.java b/core/src/main/java/io/grpc/internal/ContextRunnable.java index 9d82b3962b..b4c16a3249 100644 --- a/core/src/main/java/io/grpc/internal/ContextRunnable.java +++ b/core/src/main/java/io/grpc/internal/ContextRunnable.java @@ -26,7 +26,7 @@ abstract class ContextRunnable implements Runnable { private final Context context; - public ContextRunnable(Context context) { + protected ContextRunnable(Context context) { this.context = context; } diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java index 7241b31e7c..bc994a0103 100644 --- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java +++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java @@ -46,7 +46,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Random; import java.util.Set; import java.util.concurrent.Executor; @@ -488,7 +487,7 @@ public class DnsNameResolver extends NameResolver { @VisibleForTesting static Map maybeChooseServiceConfig( Map choice, Random random, String hostname) { - for (Entry entry : choice.entrySet()) { + for (Map.Entry entry : choice.entrySet()) { Verify.verify(SERVICE_CONFIG_CHOICE_KEYS.contains(entry.getKey()), "Bad key: %s", entry); } diff --git a/core/src/main/java/io/grpc/internal/ForwardingReadableBuffer.java b/core/src/main/java/io/grpc/internal/ForwardingReadableBuffer.java index 03fafee768..954d0ac548 100644 --- a/core/src/main/java/io/grpc/internal/ForwardingReadableBuffer.java +++ b/core/src/main/java/io/grpc/internal/ForwardingReadableBuffer.java @@ -37,7 +37,7 @@ public abstract class ForwardingReadableBuffer implements ReadableBuffer { * * @param buf the underlying buffer */ - public ForwardingReadableBuffer(ReadableBuffer buf) { + protected ForwardingReadableBuffer(ReadableBuffer buf) { this.buf = Preconditions.checkNotNull(buf, "buf"); } diff --git a/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java b/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java index c9cb567b9c..a13c9fe466 100644 --- a/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java +++ b/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java @@ -194,6 +194,8 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol @VisibleForTesting @IgnoreJRERequirement + // Hashtable is required. https://github.com/google/error-prone/issues/1766 + @SuppressWarnings("JdkObsolete") // javax.naming.* is only loaded reflectively and is never loaded for Android // The lint issue id is supposed to be "InvalidPackage" but it doesn't work, don't know why. // Use "all" as the lint issue id to suppress all types of lint error. @@ -205,7 +207,6 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol String[] rrType = new String[]{recordType}; List records = new ArrayList<>(); - @SuppressWarnings("JdkObsolete") Hashtable env = new Hashtable<>(); env.put("com.sun.jndi.ldap.connect.timeout", "5000"); env.put("com.sun.jndi.ldap.read.timeout", "5000"); diff --git a/core/src/main/java/io/grpc/internal/RetriableStream.java b/core/src/main/java/io/grpc/internal/RetriableStream.java index f9705edbfd..cf3c9afe48 100644 --- a/core/src/main/java/io/grpc/internal/RetriableStream.java +++ b/core/src/main/java/io/grpc/internal/RetriableStream.java @@ -469,8 +469,8 @@ abstract class RetriableStream implements ClientStream { } /** - * Do not use it directly. Use {@link #sendMessage(ReqT)} instead because we don't use InputStream - * for buffering. + * Do not use it directly. Use {@link #sendMessage(Object)} instead because we don't use + * InputStream for buffering. */ @Override public final void writeMessage(InputStream message) { diff --git a/core/src/main/java/io/grpc/internal/ServiceConfigState.java b/core/src/main/java/io/grpc/internal/ServiceConfigState.java index da4c4ce101..73486bb0bd 100644 --- a/core/src/main/java/io/grpc/internal/ServiceConfigState.java +++ b/core/src/main/java/io/grpc/internal/ServiceConfigState.java @@ -37,7 +37,6 @@ final class ServiceConfigState { /** * @param defaultServiceConfig The initial service config, or {@code null} if absent. * @param lookUpServiceConfig {@code true} if service config updates might occur. - * @param syncCtx The synchronization context that this is accessed from. */ ServiceConfigState( @Nullable ManagedChannelServiceConfig defaultServiceConfig, diff --git a/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java b/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java index 769f0f28fe..9f56a3562d 100644 --- a/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java +++ b/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import com.google.common.collect.Iterables; -import io.grpc.ServerStreamTracer.Factory; +import io.grpc.ServerStreamTracer; import io.grpc.internal.FakeClock; import io.grpc.internal.ObjectPool; import io.grpc.internal.SharedResourcePool; @@ -55,8 +55,8 @@ public class InProcessServerBuilderTest { @Test public void scheduledExecutorService_default() { InProcessServerBuilder builder = InProcessServerBuilder.forName("foo"); - InProcessServer server = - Iterables.getOnlyElement(builder.buildTransportServers(new ArrayList())); + InProcessServer server = Iterables.getOnlyElement( + builder.buildTransportServers(new ArrayList())); ObjectPool scheduledExecutorServicePool = server.getScheduledExecutorServicePool(); @@ -80,8 +80,8 @@ public class InProcessServerBuilderTest { InProcessServerBuilder builder1 = builder.scheduledExecutorService(scheduledExecutorService); assertSame(builder, builder1); - InProcessServer server = - Iterables.getOnlyElement(builder1.buildTransportServers(new ArrayList())); + InProcessServer server = Iterables.getOnlyElement( + builder1.buildTransportServers(new ArrayList())); ObjectPool scheduledExecutorServicePool = server.getScheduledExecutorServicePool(); diff --git a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java index e5c944646f..ac49f9e3c8 100644 --- a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java +++ b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java @@ -42,7 +42,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import io.grpc.Attributes; -import io.grpc.Attributes.Key; import io.grpc.CallOptions; import io.grpc.ClientCall; import io.grpc.ClientStreamTracer; @@ -1007,8 +1006,8 @@ public class ClientCallImplTest { ClientCallImpl call = new ClientCallImpl<>( method, MoreExecutors.directExecutor(), baseCallOptions, clientStreamProvider, deadlineCancellationExecutor, channelCallTracer); - Attributes attrs = - Attributes.newBuilder().set(Key.create("fake key"), "fake value").build(); + Attributes attrs = Attributes.newBuilder().set( + Attributes.Key.create("fake key"), "fake value").build(); when(stream.getAttributes()).thenReturn(attrs); assertNotEquals(attrs, call.getAttributes()); diff --git a/core/src/test/java/io/grpc/internal/DelayedStreamTest.java b/core/src/test/java/io/grpc/internal/DelayedStreamTest.java index 564b7e59ce..393a6c6e6d 100644 --- a/core/src/test/java/io/grpc/internal/DelayedStreamTest.java +++ b/core/src/test/java/io/grpc/internal/DelayedStreamTest.java @@ -33,7 +33,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import io.grpc.Attributes; -import io.grpc.Attributes.Key; import io.grpc.Codec; import io.grpc.DecompressorRegistry; import io.grpc.Metadata; @@ -184,7 +183,7 @@ public class DelayedStreamTest { @Test public void setStream_getAttributes() { Attributes attributes = - Attributes.newBuilder().set(Key.create("fakeKey"), "fakeValue").build(); + Attributes.newBuilder().set(Attributes.Key.create("fakeKey"), "fakeValue").build(); when(realStream.getAttributes()).thenReturn(attributes); stream.start(listener); diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java index c1d84eb76b..ff0659db16 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.mock; import io.grpc.ChannelLogger; import io.grpc.NameResolver; -import io.grpc.NameResolver.Factory; import io.grpc.NameResolver.ServiceConfigParser; import io.grpc.ProxyDetector; import io.grpc.SynchronizationContext; @@ -104,7 +103,7 @@ public class ManagedChannelImplGetNameResolverTest { @Test public void validTargetNoResovler() { - Factory nameResolverFactory = new NameResolver.Factory() { + NameResolver.Factory nameResolverFactory = new NameResolver.Factory() { @Override public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) { return null; @@ -125,7 +124,7 @@ public class ManagedChannelImplGetNameResolverTest { } private void testValidTarget(String target, String expectedUriString, URI expectedUri) { - Factory nameResolverFactory = new FakeNameResolverFactory(expectedUri.getScheme()); + NameResolver.Factory nameResolverFactory = new FakeNameResolverFactory(expectedUri.getScheme()); FakeNameResolver nameResolver = (FakeNameResolver) ManagedChannelImpl.getNameResolver( target, nameResolverFactory, NAMERESOLVER_ARGS); assertNotNull(nameResolver); @@ -134,7 +133,7 @@ public class ManagedChannelImplGetNameResolverTest { } private void testInvalidTarget(String target) { - Factory nameResolverFactory = new FakeNameResolverFactory("dns"); + NameResolver.Factory nameResolverFactory = new FakeNameResolverFactory("dns"); try { FakeNameResolver nameResolver = (FakeNameResolver) ManagedChannelImpl.getNameResolver( diff --git a/core/src/test/java/io/grpc/internal/TestUtils.java b/core/src/test/java/io/grpc/internal/TestUtils.java index 8ea9afc28a..7152b4931f 100644 --- a/core/src/test/java/io/grpc/internal/TestUtils.java +++ b/core/src/test/java/io/grpc/internal/TestUtils.java @@ -47,7 +47,7 @@ public final class TestUtils { public abstract static class StandardLoadBalancerProvider extends LoadBalancerProvider { private final String policyName; - public StandardLoadBalancerProvider(String policyName) { + protected StandardLoadBalancerProvider(String policyName) { this.policyName = policyName; } diff --git a/core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java b/core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java index 8d6bba0f74..3de0a207dd 100644 --- a/core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java +++ b/core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java @@ -31,7 +31,6 @@ import com.google.common.io.BaseEncoding; import io.grpc.InternalMetadata; import io.grpc.Metadata; import io.grpc.Metadata.BinaryMarshaller; -import io.grpc.Metadata.Key; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,11 +57,14 @@ public class TransportFrameUtilTest { } }; - private static final Key PLAIN_STRING = Key.of("plainstring", ASCII_STRING_MARSHALLER); - private static final Key BINARY_STRING = Key.of("string-bin", UTF8_STRING_MARSHALLER); - private static final Key BINARY_STRING_WITHOUT_SUFFIX = - Key.of("string", ASCII_STRING_MARSHALLER); - private static final Key BINARY_BYTES = Key.of("bytes-bin", BINARY_BYTE_MARSHALLER); + private static final Metadata.Key PLAIN_STRING = + Metadata.Key.of("plainstring", ASCII_STRING_MARSHALLER); + private static final Metadata.Key BINARY_STRING = + Metadata.Key.of("string-bin", UTF8_STRING_MARSHALLER); + private static final Metadata.Key BINARY_STRING_WITHOUT_SUFFIX = + Metadata.Key.of("string", ASCII_STRING_MARSHALLER); + private static final Metadata.Key BINARY_BYTES = + Metadata.Key.of("bytes-bin", BINARY_BYTE_MARSHALLER); @Test public void testToHttp2Headers() { @@ -86,7 +88,7 @@ public class TransportFrameUtilTest { @Test(expected = IllegalArgumentException.class) public void binaryHeaderWithoutSuffix() { - Key.of("plainstring", UTF8_STRING_MARSHALLER); + Metadata.Key.of("plainstring", UTF8_STRING_MARSHALLER); } @Test diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java index e29296ad30..d27c485dc1 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbClientLoadRecorder.java @@ -28,7 +28,6 @@ import io.grpc.lb.v1.ClientStatsPerToken; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; @@ -115,7 +114,7 @@ final class GrpclbClientLoadRecorder extends ClientStreamTracer.Factory { callsDroppedPerToken = new HashMap<>(localCallsDroppedPerToken.size()); } } - for (Entry entry : localCallsDroppedPerToken.entrySet()) { + for (Map.Entry entry : localCallsDroppedPerToken.entrySet()) { statsBuilder.addCallsFinishedWithDrop( ClientStatsPerToken.newBuilder() .setLoadBalanceToken(entry.getKey()) diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java index a713b7f768..b6c99135e2 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java @@ -71,7 +71,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -424,7 +423,7 @@ final class GrpclbState { newBackendList.add(entry); } // Close Subchannels whose addresses have been delisted - for (Entry, Subchannel> entry : subchannels.entrySet()) { + for (Map.Entry, Subchannel> entry : subchannels.entrySet()) { List eagList = entry.getKey(); if (!newSubchannelMap.containsKey(eagList)) { returnSubchannelToPool(entry.getValue()); diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java index 14b4b923d1..46122d5f25 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java @@ -193,7 +193,7 @@ public abstract class AbstractInteropTest { /** * Constructor for tests. */ - public AbstractInteropTest() { + protected AbstractInteropTest() { TestRule timeout = Timeout.seconds(60); try { timeout = new DisableOnDebug(timeout); diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbLongLivedAffinityTestClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbLongLivedAffinityTestClient.java index 4cf8dedbeb..b98e4f67d3 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbLongLivedAffinityTestClient.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbLongLivedAffinityTestClient.java @@ -72,8 +72,8 @@ public final class GrpclbLongLivedAffinityTestClient { private long rpcIntermissionSeconds = 1; private long totalTestSeconds = 60; - protected ManagedChannel channel; - protected TestServiceGrpc.TestServiceBlockingStub blockingStub; + ManagedChannel channel; + TestServiceGrpc.TestServiceBlockingStub blockingStub; private void parseArgs(String[] args) { boolean usage = false; diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/Http2Client.java b/interop-testing/src/main/java/io/grpc/testing/integration/Http2Client.java index d5423c9071..fbe9e3fa28 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/Http2Client.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/Http2Client.java @@ -85,9 +85,9 @@ public final class Http2Client { private Tester tester = new Tester(); private ListeningExecutorService threadpool; - protected ManagedChannel channel; - protected TestServiceGrpc.TestServiceBlockingStub blockingStub; - protected TestServiceGrpc.TestServiceStub asyncStub; + ManagedChannel channel; + TestServiceGrpc.TestServiceBlockingStub blockingStub; + TestServiceGrpc.TestServiceStub asyncStub; private void parseArgs(String[] args) { boolean usage = false; diff --git a/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java b/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java index 1dc3f1175a..7e3c714495 100644 --- a/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java +++ b/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java @@ -20,7 +20,7 @@ import io.netty.handler.codec.Headers; import io.netty.handler.codec.http2.Http2Headers; import java.util.Iterator; import java.util.List; -import java.util.Map.Entry; +import java.util.Map; import java.util.Set; abstract class AbstractHttp2Headers implements Http2Headers { @@ -496,7 +496,7 @@ abstract class AbstractHttp2Headers implements Http2Headers { } @Override - public Iterator> iterator() { + public Iterator> iterator() { throw new UnsupportedOperationException(); } diff --git a/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java b/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java index 2c127b16b1..65cac8d1ea 100644 --- a/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java +++ b/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java @@ -35,7 +35,7 @@ public abstract class GrpcHttp2ConnectionHandler extends Http2ConnectionHandler @Nullable protected final ChannelPromise channelUnused; - public GrpcHttp2ConnectionHandler( + protected GrpcHttp2ConnectionHandler( ChannelPromise channelUnused, Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder, diff --git a/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java b/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java index 1efbf234e7..0489e13581 100644 --- a/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java +++ b/netty/src/main/java/io/grpc/netty/GrpcHttp2OutboundHeaders.java @@ -19,7 +19,7 @@ package io.grpc.netty; import io.netty.handler.codec.http2.Http2Headers; import io.netty.util.AsciiString; import java.util.Iterator; -import java.util.Map.Entry; +import java.util.Map; import java.util.NoSuchElementException; /** @@ -77,7 +77,7 @@ final class GrpcHttp2OutboundHeaders extends AbstractHttp2Headers { } @Override - public Iterator> iterator() { + public Iterator> iterator() { return new Itr(); } @@ -86,8 +86,8 @@ final class GrpcHttp2OutboundHeaders extends AbstractHttp2Headers { return (normalHeaders.length + preHeaders.length) / 2; } - private class Itr implements Entry, - Iterator> { + private class Itr implements Map.Entry, + Iterator> { private int idx; private AsciiString[] current = preHeaders.length != 0 ? preHeaders : normalHeaders; private AsciiString key; @@ -104,7 +104,7 @@ final class GrpcHttp2OutboundHeaders extends AbstractHttp2Headers { * speeds before and after. */ @Override - public Entry next() { + public Map.Entry next() { if (hasNext()) { key = current[idx]; value = current[idx + 1]; @@ -144,7 +144,7 @@ final class GrpcHttp2OutboundHeaders extends AbstractHttp2Headers { public String toString() { StringBuilder builder = new StringBuilder(getClass().getSimpleName()).append('['); String separator = ""; - for (Entry e : this) { + for (Map.Entry e : this) { CharSequence name = e.getKey(); CharSequence value = e.getValue(); builder.append(separator); diff --git a/netty/src/main/java/io/grpc/netty/NettyClientStream.java b/netty/src/main/java/io/grpc/netty/NettyClientStream.java index 1b7ee1301c..3e044a3964 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientStream.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientStream.java @@ -231,7 +231,7 @@ class NettyClientStream extends AbstractClientStream { private Http2Stream http2Stream; private Tag tag; - public TransportState( + protected TransportState( NettyClientHandler handler, EventLoop eventLoop, int maxMessageSize, diff --git a/netty/src/main/java/io/grpc/netty/ProtocolNegotiator.java b/netty/src/main/java/io/grpc/netty/ProtocolNegotiator.java index 7dad1af20a..c0bf556480 100644 --- a/netty/src/main/java/io/grpc/netty/ProtocolNegotiator.java +++ b/netty/src/main/java/io/grpc/netty/ProtocolNegotiator.java @@ -40,7 +40,7 @@ interface ProtocolNegotiator { /** * Releases resources held by this negotiator. Called when the Channel transitions to terminated * or when InternalServer is shutdown (depending on client or server). That means handlers - * returned by {@link #newHandler()} can outlive their parent negotiator on server-side, but not + * returned by {@link #newHandler} can outlive their parent negotiator on server-side, but not * on client-side. */ void close(); diff --git a/netty/src/main/java/io/grpc/netty/Utils.java b/netty/src/main/java/io/grpc/netty/Utils.java index a3582b4004..ebc54a14da 100644 --- a/netty/src/main/java/io/grpc/netty/Utils.java +++ b/netty/src/main/java/io/grpc/netty/Utils.java @@ -56,7 +56,6 @@ import java.lang.reflect.Constructor; import java.nio.channels.ClosedChannelException; import java.nio.channels.UnresolvedAddressException; import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -455,7 +454,7 @@ class Utils { b.setSocketOptionTimeoutMillis(timeoutMillis); } - for (Entry, Object> opt : config.getOptions().entrySet()) { + for (Map.Entry, Object> opt : config.getOptions().entrySet()) { ChannelOption key = opt.getKey(); // Constants are pooled, so there should only be one instance of each constant if (key.equals(SO_LINGER) || key.equals(SO_TIMEOUT)) { @@ -470,7 +469,7 @@ class Utils { = NettySocketSupport.getNativeSocketOptions(channel); if (nativeOptions != null) { b.setTcpInfo(nativeOptions.tcpInfo); // may be null - for (Entry entry : nativeOptions.otherInfo.entrySet()) { + for (Map.Entry entry : nativeOptions.otherInfo.entrySet()) { b.addOption(entry.getKey(), entry.getValue()); } } diff --git a/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java index 324f073d97..17586ef925 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java @@ -62,6 +62,7 @@ import io.grpc.internal.ClientTransport; import io.grpc.internal.ClientTransport.PingCallback; import io.grpc.internal.GrpcUtil; import io.grpc.internal.KeepAliveManager; +import io.grpc.internal.ManagedClientTransport; import io.grpc.internal.StatsTraceContext; import io.grpc.internal.StreamListener; import io.grpc.internal.TransportTracer; @@ -129,7 +130,7 @@ public class NettyClientHandlerTest extends NettyHandlerTestBase servers = builder.buildTransportServers(ImmutableList.of()); + List servers = + builder.buildTransportServers(ImmutableList.of()); Truth.assertThat(servers).hasSize(2); } diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java index 8bfd50a2c2..78b1aa8206 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java @@ -75,6 +75,7 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.net.URI; import java.util.Collections; +import java.util.Deque; import java.util.EnumMap; import java.util.HashMap; import java.util.Iterator; @@ -188,7 +189,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep private int maxConcurrentStreams = 0; @SuppressWarnings("JdkObsolete") // Usage is bursty; want low memory usage when empty @GuardedBy("lock") - private final LinkedList pendingStreams = new LinkedList<>(); + private final Deque pendingStreams = new LinkedList<>(); private final ConnectionSpec connectionSpec; private FrameWriter testFrameWriter; private ScheduledExecutorService scheduler; diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java index d5cf69bba1..1004dcd93f 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java @@ -85,7 +85,7 @@ final class OkHttpTlsUpgrader { * @see RFC2732 * @see RFC5280 * - * @return {@param host} in a form consistent with X509 certificates + * @return {@code host} in a form consistent with X509 certificates */ @VisibleForTesting static String canonicalizeHost(String host) { 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 81dadb5d88..45d874e300 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 @@ -177,7 +177,9 @@ public class Platform { trafficStatsTagSocket = trafficStats.getMethod("tagSocket", Socket.class); trafficStatsUntagSocket = trafficStats.getMethod("untagSocket", Socket.class); } catch (ClassNotFoundException ignored) { + // On older Android } catch (NoSuchMethodException ignored) { + // On older Android } TlsExtensionType tlsExtensionType; @@ -244,10 +246,15 @@ public class Platform { }); return new JdkAlpnPlatform(sslProvider, setApplicationProtocols, getApplicationProtocol); } catch (NoSuchAlgorithmException ignored) { + // On older Java } catch (KeyManagementException ignored) { + // On older Java } catch (PrivilegedActionException ignored) { + // On older Java } catch (IllegalAccessException ignored) { + // On older Java } catch (InvocationTargetException ignored) { + // On older Java } // Find Jetty's ALPN extension for OpenJDK. @@ -264,7 +271,9 @@ public class Platform { putMethod, getMethod, removeMethod, clientProviderClass, serverProviderClass, sslProvider); } catch (ClassNotFoundException ignored) { + // No Jetty ALPN } catch (NoSuchMethodException ignored) { + // Weird Jetty ALPN } // TODO(ericgribkoff) Return null here @@ -512,7 +521,9 @@ public class Platform { removeMethod.invoke(null, sslSocket); } catch (IllegalAccessException ignored) { throw new AssertionError(); - } catch (InvocationTargetException ignored) { + } catch (InvocationTargetException ex) { + // This would be very surprising and there's not much to do about it + logger.log(Level.FINE, "Failed to remove SSLSocket from Jetty ALPN", ex); } } 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 d0239d1e71..556d849c70 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 @@ -74,6 +74,7 @@ public final class Util { } catch (RuntimeException rethrown) { throw rethrown; } catch (Exception ignored) { + // The method is defined to ignore checked exceptions } } } @@ -91,6 +92,7 @@ public final class Util { } catch (RuntimeException rethrown) { throw rethrown; } catch (Exception ignored) { + // The method is defined to ignore checked exceptions } } } @@ -106,6 +108,7 @@ public final class Util { } catch (RuntimeException rethrown) { throw rethrown; } catch (Exception ignored) { + // The method is defined to ignore checked exceptions } } } diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameReader.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameReader.java index 20c50f7cca..585ccb1535 100644 --- a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameReader.java +++ b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameReader.java @@ -111,7 +111,7 @@ public interface FrameReader extends Closeable { * @param promisedStreamId server-initiated stream ID. Must be an even * number. * @param requestHeaders minimally includes {@code :method}, {@code :scheme}, - * {@code :authority}, and (@code :path}. + * {@code :authority}, and {@code :path}. */ void pushPromise(int streamId, int promisedStreamId, List requestHeaders) throws IOException; diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameWriter.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameWriter.java index 333e06c86f..26087f3ce1 100644 --- a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameWriter.java +++ b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/framed/FrameWriter.java @@ -45,7 +45,7 @@ public interface FrameWriter extends Closeable { * @param promisedStreamId server-initiated stream ID. Must be an even * number. * @param requestHeaders minimally includes {@code :method}, {@code :scheme}, - * {@code :authority}, and (@code :path}. + * {@code :authority}, and {@code :path}. */ void pushPromise(int streamId, int promisedStreamId, List

requestHeaders) throws IOException; diff --git a/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java b/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java index c846f1e26d..554dcdd662 100644 --- a/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java +++ b/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java @@ -42,7 +42,7 @@ import io.grpc.LoadBalancer.SubchannelPicker; import io.grpc.LoadBalancerProvider; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; -import io.grpc.NameResolver.Factory; +import io.grpc.NameResolver; import io.grpc.Status; import io.grpc.SynchronizationContext; import io.grpc.inprocess.InProcessChannelBuilder; @@ -521,7 +521,7 @@ public class CachingRlsLbClientTest { @Override @Deprecated - public Factory getNameResolverFactory() { + public NameResolver.Factory getNameResolverFactory() { throw new UnsupportedOperationException(); } diff --git a/rls/src/test/java/io/grpc/rls/RlsLoadBalancerTest.java b/rls/src/test/java/io/grpc/rls/RlsLoadBalancerTest.java index a8ac6c3a05..045c00c303 100644 --- a/rls/src/test/java/io/grpc/rls/RlsLoadBalancerTest.java +++ b/rls/src/test/java/io/grpc/rls/RlsLoadBalancerTest.java @@ -52,7 +52,7 @@ import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor.Marshaller; import io.grpc.MethodDescriptor.MethodType; import io.grpc.NameResolver.ConfigOrError; -import io.grpc.NameResolver.Factory; +import io.grpc.NameResolver; import io.grpc.Status; import io.grpc.SynchronizationContext; import io.grpc.inprocess.InProcessChannelBuilder; @@ -509,7 +509,7 @@ public class RlsLoadBalancerTest { @Override @Deprecated - public Factory getNameResolverFactory() { + public NameResolver.Factory getNameResolverFactory() { throw new UnsupportedOperationException(); } diff --git a/services/src/main/java/io/grpc/services/BinlogHelper.java b/services/src/main/java/io/grpc/services/BinlogHelper.java index 27250f0534..d8923160e5 100644 --- a/services/src/main/java/io/grpc/services/BinlogHelper.java +++ b/services/src/main/java/io/grpc/services/BinlogHelper.java @@ -50,7 +50,6 @@ import io.grpc.ServerCallHandler; import io.grpc.ServerInterceptor; import io.grpc.Status; import io.grpc.binarylog.v1.Address; -import io.grpc.binarylog.v1.Address.Type; import io.grpc.binarylog.v1.GrpcLogEntry; import io.grpc.binarylog.v1.GrpcLogEntry.EventType; import io.grpc.binarylog.v1.Message; @@ -791,10 +790,10 @@ final class BinlogHelper { if (address instanceof InetSocketAddress) { InetAddress inetAddress = ((InetSocketAddress) address).getAddress(); if (inetAddress instanceof Inet4Address) { - builder.setType(Type.TYPE_IPV4) + builder.setType(Address.Type.TYPE_IPV4) .setAddress(InetAddressUtil.toAddrString(inetAddress)); } else if (inetAddress instanceof Inet6Address) { - builder.setType(Type.TYPE_IPV6) + builder.setType(Address.Type.TYPE_IPV6) .setAddress(InetAddressUtil.toAddrString(inetAddress)); } else { logger.log(Level.SEVERE, "unknown type of InetSocketAddress: {}", address); @@ -803,10 +802,10 @@ final class BinlogHelper { builder.setIpPort(((InetSocketAddress) address).getPort()); } else if (address.getClass().getName().equals("io.netty.channel.unix.DomainSocketAddress")) { // To avoid a compile time dependency on grpc-netty, we check against the runtime class name. - builder.setType(Type.TYPE_UNIX) + builder.setType(Address.Type.TYPE_UNIX) .setAddress(address.toString()); } else { - builder.setType(Type.TYPE_UNKNOWN).setAddress(address.toString()); + builder.setType(Address.Type.TYPE_UNKNOWN).setAddress(address.toString()); } return builder.build(); } diff --git a/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java b/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java index 16c4b045bd..349995d9f8 100644 --- a/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java +++ b/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java @@ -72,7 +72,7 @@ import java.security.cert.CertificateEncodingException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map.Entry; +import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.logging.Level; import java.util.logging.Logger; @@ -332,7 +332,7 @@ final class ChannelzProtoUtil { if (options.tcpInfo != null) { ret.add(toSocketOptionTcpInfo(options.tcpInfo)); } - for (Entry entry : options.others.entrySet()) { + for (Map.Entry entry : options.others.entrySet()) { ret.add(toSocketOptionAdditional(entry.getKey(), entry.getValue())); } return ret; diff --git a/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java b/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java index 6238ab62eb..e233d94a98 100644 --- a/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java +++ b/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerFactory.java @@ -35,7 +35,6 @@ import io.grpc.ClientCall; import io.grpc.ConnectivityStateInfo; import io.grpc.LoadBalancer; import io.grpc.LoadBalancer.CreateSubchannelArgs; -import io.grpc.LoadBalancer.Factory; import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.Subchannel; import io.grpc.LoadBalancer.SubchannelStateListener; @@ -69,16 +68,16 @@ import javax.annotation.Nullable; *

Note the original LoadBalancer must call {@code Helper.createSubchannel()} from the * SynchronizationContext, or it will throw. */ -final class HealthCheckingLoadBalancerFactory extends Factory { +final class HealthCheckingLoadBalancerFactory extends LoadBalancer.Factory { private static final Logger logger = Logger.getLogger(HealthCheckingLoadBalancerFactory.class.getName()); - private final Factory delegateFactory; + private final LoadBalancer.Factory delegateFactory; private final BackoffPolicy.Provider backoffPolicyProvider; private final Supplier stopwatchSupplier; public HealthCheckingLoadBalancerFactory( - Factory delegateFactory, BackoffPolicy.Provider backoffPolicyProvider, + LoadBalancer.Factory delegateFactory, BackoffPolicy.Provider backoffPolicyProvider, Supplier stopwatchSupplier) { this.delegateFactory = checkNotNull(delegateFactory, "delegateFactory"); this.backoffPolicyProvider = checkNotNull(backoffPolicyProvider, "backoffPolicyProvider"); diff --git a/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerUtil.java b/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerUtil.java index ab00b6e74d..c22716f46c 100644 --- a/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerUtil.java +++ b/services/src/main/java/io/grpc/services/HealthCheckingLoadBalancerUtil.java @@ -18,7 +18,6 @@ package io.grpc.services; import io.grpc.ExperimentalApi; import io.grpc.LoadBalancer; -import io.grpc.LoadBalancer.Factory; import io.grpc.LoadBalancer.Helper; import io.grpc.internal.ExponentialBackoffPolicy; import io.grpc.internal.GrpcUtil; @@ -35,7 +34,8 @@ public final class HealthCheckingLoadBalancerUtil { /** * Creates a health-checking-capable LoadBalancer. This method is used to implement - * health-checking-capable {@link Factory}s, which will typically written this way: + * health-checking-capable {@link io.grpc.LoadBalancer.Factory}s, which will typically written + * this way: * * 

    * public class HealthCheckingFooLbFactory extends LoadBalancer.Factory {
@@ -52,15 +52,15 @@ public final class HealthCheckingLoadBalancerUtil {
    *
* *

As a requirement for the original LoadBalancer, it must call - * {@code Helper.createSubchannel()} from the {@link - * io.grpc.LoadBalancer.Helper#getSynchronizationContext() Synchronization Context}, or - * {@code createSubchannel()} will throw. + * {@code Helper.createSubchannel()} from the {@link Helper#getSynchronizationContext() + * Synchronization Context}, or {@code createSubchannel()} will throw. * * @param factory the original factory that implements load-balancing logic without health * checking * @param helper the helper passed to the resulting health-checking LoadBalancer. */ - public static LoadBalancer newHealthCheckingLoadBalancer(Factory factory, Helper helper) { + public static LoadBalancer newHealthCheckingLoadBalancer( + LoadBalancer.Factory factory, Helper helper) { HealthCheckingLoadBalancerFactory hcFactory = new HealthCheckingLoadBalancerFactory( factory, new ExponentialBackoffPolicy.Provider(), diff --git a/services/src/test/java/io/grpc/services/BinlogHelperTest.java b/services/src/test/java/io/grpc/services/BinlogHelperTest.java index 8162143791..4229294d27 100644 --- a/services/src/test/java/io/grpc/services/BinlogHelperTest.java +++ b/services/src/test/java/io/grpc/services/BinlogHelperTest.java @@ -59,7 +59,6 @@ import io.grpc.ServerCallHandler; import io.grpc.Status; import io.grpc.StatusException; import io.grpc.binarylog.v1.Address; -import io.grpc.binarylog.v1.Address.Type; import io.grpc.binarylog.v1.ClientHeader; import io.grpc.binarylog.v1.GrpcLogEntry; import io.grpc.binarylog.v1.GrpcLogEntry.EventType; @@ -377,7 +376,7 @@ public final class BinlogHelperTest { assertEquals( Address .newBuilder() - .setType(Type.TYPE_IPV4) + .setType(Address.Type.TYPE_IPV4) .setAddress("127.0.0.1") .setIpPort(12345) .build(), @@ -393,7 +392,7 @@ public final class BinlogHelperTest { assertEquals( Address .newBuilder() - .setType(Type.TYPE_IPV6) + .setType(Address.Type.TYPE_IPV6) .setAddress("2001:db8::2:1") // RFC 5952 section 4: ipv6 canonical form required .setIpPort(12345) .build(), @@ -407,7 +406,7 @@ public final class BinlogHelperTest { assertEquals( Address .newBuilder() - .setType(Type.TYPE_UNIX) + .setType(Address.Type.TYPE_UNIX) .setAddress("/some/path") .build(), BinlogHelper.socketToProto(socketAddress) @@ -424,7 +423,7 @@ public final class BinlogHelperTest { }; assertEquals( Address.newBuilder() - .setType(Type.TYPE_UNKNOWN) + .setType(Address.Type.TYPE_UNKNOWN) .setAddress("some-socket-address") .build(), BinlogHelper.socketToProto(unknownSocket)); diff --git a/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java b/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java index 37a1ae56fc..45dd8056dd 100644 --- a/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java +++ b/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java @@ -85,7 +85,7 @@ import java.net.SocketAddress; import java.security.cert.Certificate; import java.util.Arrays; import java.util.Collections; -import java.util.Map.Entry; +import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -932,7 +932,7 @@ public final class ChannelzProtoUtilTest { SocketOptions.Builder builder = new SocketOptions.Builder() .setSocketOptionTimeoutMillis(options.soTimeoutMillis) .setSocketOptionLingerSeconds(options.lingerSeconds); - for (Entry entry : options.others.entrySet()) { + for (Map.Entry entry : options.others.entrySet()) { builder.addOption(entry.getKey(), entry.getValue()); } return builder; diff --git a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java index e8a80b6d90..d62ef14559 100644 --- a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java +++ b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java @@ -49,7 +49,6 @@ import io.grpc.Context.CancellationListener; import io.grpc.EquivalentAddressGroup; import io.grpc.LoadBalancer; import io.grpc.LoadBalancer.CreateSubchannelArgs; -import io.grpc.LoadBalancer.Factory; import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.ResolvedAddresses; import io.grpc.LoadBalancer.Subchannel; @@ -131,8 +130,8 @@ public class HealthCheckingLoadBalancerFactoryTest { private final Helper origHelper = mock(Helper.class, delegatesTo(new FakeHelper())); // The helper seen by the origLb private Helper wrappedHelper; - private final Factory origLbFactory = - mock(Factory.class, delegatesTo(new Factory() { + private final LoadBalancer.Factory origLbFactory = + mock(LoadBalancer.Factory.class, delegatesTo(new LoadBalancer.Factory() { @Override public LoadBalancer newLoadBalancer(Helper helper) { checkState(wrappedHelper == null, "LoadBalancer already created"); @@ -1056,8 +1055,8 @@ public class HealthCheckingLoadBalancerFactoryTest { @Test public void util_newHealthCheckingLoadBalancer() { - Factory hcFactory = - new Factory() { + LoadBalancer.Factory hcFactory = + new LoadBalancer.Factory() { @Override public LoadBalancer newLoadBalancer(Helper helper) { return HealthCheckingLoadBalancerUtil.newHealthCheckingLoadBalancer( diff --git a/xds/src/main/java/io/grpc/xds/LoadStatsStoreImpl.java b/xds/src/main/java/io/grpc/xds/LoadStatsStoreImpl.java index 42ba84e850..4483854cb4 100644 --- a/xds/src/main/java/io/grpc/xds/LoadStatsStoreImpl.java +++ b/xds/src/main/java/io/grpc/xds/LoadStatsStoreImpl.java @@ -39,6 +39,8 @@ import javax.annotation.concurrent.NotThreadSafe; * client's perspective by maintaining a set of locality counters for each locality it is tracking * loads for. */ +// https://github.com/google/error-prone/issues/1767 +@SuppressWarnings("ModifyCollectionInEnhancedForLoop") @NotThreadSafe final class LoadStatsStoreImpl implements LoadStatsStore { private final String clusterName; diff --git a/xds/src/main/java/io/grpc/xds/internal/certprovider/MeshCaCertificateProvider.java b/xds/src/main/java/io/grpc/xds/internal/certprovider/MeshCaCertificateProvider.java index a4d22faa6a..348f7013cd 100644 --- a/xds/src/main/java/io/grpc/xds/internal/certprovider/MeshCaCertificateProvider.java +++ b/xds/src/main/java/io/grpc/xds/internal/certprovider/MeshCaCertificateProvider.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; final class MeshCaCertificateProvider extends CertificateProvider { private static final Logger logger = Logger.getLogger(MeshCaCertificateProvider.class.getName()); - protected MeshCaCertificateProvider(DistributorWatcher watcher, boolean notifyCertUpdates, + MeshCaCertificateProvider(DistributorWatcher watcher, boolean notifyCertUpdates, String meshCaUrl, String zone, long validitySeconds, int keySize, String alg, String signatureAlg, MeshCaChannelFactory meshCaChannelFactory, BackoffPolicy.Provider backoffPolicyProvider, long renewalGracePeriodSeconds, diff --git a/xds/src/main/java/io/grpc/xds/internal/sds/ReferenceCountingMap.java b/xds/src/main/java/io/grpc/xds/internal/sds/ReferenceCountingMap.java index 9f520ea7bc..6a3a03a287 100644 --- a/xds/src/main/java/io/grpc/xds/internal/sds/ReferenceCountingMap.java +++ b/xds/src/main/java/io/grpc/xds/internal/sds/ReferenceCountingMap.java @@ -59,7 +59,7 @@ public final class ReferenceCountingMap { /** * Releases an instance of the given value. * - *

The instance must have been obtained from {@link #get(K)}. Otherwise will throw + *

The instance must have been obtained from {@link #get(Object)}. Otherwise will throw * IllegalArgumentException. * *

Caller must not release a reference more than once. It's advised that you clear the diff --git a/xds/src/main/java/io/grpc/xds/internal/sts/StsCredentials.java b/xds/src/main/java/io/grpc/xds/internal/sts/StsCredentials.java index fde5f1f0a9..9d85ffcecc 100644 --- a/xds/src/main/java/io/grpc/xds/internal/sts/StsCredentials.java +++ b/xds/src/main/java/io/grpc/xds/internal/sts/StsCredentials.java @@ -67,6 +67,7 @@ public final class StsCredentials extends GoogleCredentials { this.transportFactory = transportFactory; } + @SuppressWarnings("JdkObsolete") // We can't use java.time @Override public AccessToken refreshAccessToken() throws IOException { AccessToken tok = getSourceAccessTokenFromFileLocation(); diff --git a/xds/src/test/java/io/grpc/xds/ClientLoadCounterTest.java b/xds/src/test/java/io/grpc/xds/ClientLoadCounterTest.java index bedeaf4eae..23a9993888 100644 --- a/xds/src/test/java/io/grpc/xds/ClientLoadCounterTest.java +++ b/xds/src/test/java/io/grpc/xds/ClientLoadCounterTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import com.github.udpa.udpa.data.orca.v1.OrcaLoadReport; import io.grpc.ClientStreamTracer; -import io.grpc.ClientStreamTracer.Factory; import io.grpc.ClientStreamTracer.StreamInfo; import io.grpc.LoadBalancer.PickResult; import io.grpc.LoadBalancer.PickSubchannelArgs; @@ -224,7 +223,8 @@ public class ClientLoadCounterTest { } @Override - protected Factory wrapTracerFactory(Factory originFactory) { + protected ClientStreamTracer.Factory wrapTracerFactory( + ClientStreamTracer.Factory originFactory) { // NO-OP return originFactory; }