From 3002a23a0ff9f72cc29c81b3be456d2ee1fa6bc4 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 27 Feb 2018 16:35:26 -0800 Subject: [PATCH] Lint fixes --- .../grpc/alts/InternalNettyTsiHandshakerTest.java | 1 - core/src/main/java/io/grpc/internal/Channelz.java | 2 -- .../internal/ManagedChannelOrphanWrapper.java | 15 +++++++-------- .../io/grpc/internal/BinaryLogProviderTest.java | 4 ++-- .../java/io/grpc/internal/ServerCallImplTest.java | 1 - .../java/io/grpc/internal/ServerImplTest.java | 7 ------- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/alts/src/test/java/io/grpc/alts/InternalNettyTsiHandshakerTest.java b/alts/src/test/java/io/grpc/alts/InternalNettyTsiHandshakerTest.java index 1ad5462d9c..5074057bac 100644 --- a/alts/src/test/java/io/grpc/alts/InternalNettyTsiHandshakerTest.java +++ b/alts/src/test/java/io/grpc/alts/InternalNettyTsiHandshakerTest.java @@ -33,7 +33,6 @@ import java.nio.ByteBuffer; import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.List; -import java.util.function.Function; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/main/java/io/grpc/internal/Channelz.java b/core/src/main/java/io/grpc/internal/Channelz.java index 464d358f0b..883974068f 100644 --- a/core/src/main/java/io/grpc/internal/Channelz.java +++ b/core/src/main/java/io/grpc/internal/Channelz.java @@ -23,11 +23,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.logging.Logger; import javax.annotation.concurrent.Immutable; public final class Channelz { - private static final Logger log = Logger.getLogger(Channelz.class.getName()); private static final Channelz INSTANCE = new Channelz(); private final ConcurrentMap> servers = diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java b/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java index e1df4cd111..eeea956ee0 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java @@ -148,15 +148,14 @@ final class ManagedChannelOrphanWrapper extends ForwardingManagedChannel { orphanedChannels++; Level level = ref.shutdownNow ? Level.FINE : Level.SEVERE; if (logger.isLoggable(level)) { - String fmt = new StringBuilder() - .append("*~*~*~ Channel {0} was not ") + String fmt = + "*~*~*~ Channel {0} was not " // Prefer to complain about shutdown if neither has been called. - .append(!ref.shutdown ? "shutdown" : "terminated") - .append(" properly!!! ~*~*~*") - .append(System.getProperty("line.separator")) - .append(" Make sure to call shutdown()/shutdownNow() and wait " - + "until awaitTermination() returns true.") - .toString(); + + (!ref.shutdown ? "shutdown" : "terminated") + + " properly!!! ~*~*~*" + + System.getProperty("line.separator") + + " Make sure to call shutdown()/shutdownNow() and wait " + + "until awaitTermination() returns true."; LogRecord lr = new LogRecord(level, fmt); lr.setLoggerName(logger.getName()); lr.setParameters(new Object[]{ref.channel.toString()}); diff --git a/core/src/test/java/io/grpc/internal/BinaryLogProviderTest.java b/core/src/test/java/io/grpc/internal/BinaryLogProviderTest.java index 3b753330f9..edb9327077 100644 --- a/core/src/test/java/io/grpc/internal/BinaryLogProviderTest.java +++ b/core/src/test/java/io/grpc/internal/BinaryLogProviderTest.java @@ -140,7 +140,7 @@ public class BinaryLogProviderTest { } }; Channel wChannel = binlogProvider.wrapChannel(channel); - ClientCall ignoredClientCall = wChannel.newCall(method, CallOptions.DEFAULT); + ClientCall unusedClientCall = wChannel.newCall(method, CallOptions.DEFAULT); validateWrappedMethod(methodRef.get()); } @@ -486,4 +486,4 @@ public class BinaryLogProviderTest { return delegate().parse(stream); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java index 378bbabf7e..d3b1165e8f 100644 --- a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java +++ b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java @@ -235,7 +235,6 @@ public class ServerCallImplTest { serverCall.sendMessage(1L); verify(stream, times(1)).writeMessage(any(InputStream.class)); ArgumentCaptor statusCaptor = ArgumentCaptor.forClass(Status.class); - ArgumentCaptor metadataCaptor = ArgumentCaptor.forClass(Metadata.class); verify(stream, times(1)).cancel(statusCaptor.capture()); assertEquals(Status.Code.INTERNAL, statusCaptor.getValue().getCode()); assertEquals(ServerCallImpl.TOO_MANY_RESPONSES, statusCaptor.getValue().getDescription()); diff --git a/core/src/test/java/io/grpc/internal/ServerImplTest.java b/core/src/test/java/io/grpc/internal/ServerImplTest.java index 0121590313..dcac51afa2 100644 --- a/core/src/test/java/io/grpc/internal/ServerImplTest.java +++ b/core/src/test/java/io/grpc/internal/ServerImplTest.java @@ -1420,13 +1420,6 @@ public class ServerImplTest { verifyNoMoreInteractions(executorPool); } - private void ensureServerStateNotLeaked() { - verify(stream).close(statusCaptor.capture(), metadataCaptor.capture()); - assertEquals(Status.UNKNOWN, statusCaptor.getValue()); - assertNull(statusCaptor.getValue().getCause()); - assertTrue(metadataCaptor.getValue().keys().isEmpty()); - } - private void ensureServerStateIsCancelled() { verify(stream).cancel(statusCaptor.capture()); assertEquals(Status.INTERNAL, statusCaptor.getValue());