From 6cde3b220b9e97154feaee28ddd9d679eddae91c Mon Sep 17 00:00:00 2001 From: Jihun Cho Date: Thu, 7 May 2020 15:43:53 -0700 Subject: [PATCH] all: fix lint warnings (#7016) --- .../main/java/io/grpc/inprocess/InProcessChannelBuilder.java | 2 +- core/src/test/java/io/grpc/internal/AbstractTransportTest.java | 2 +- .../io/grpc/testing/integration/GrpclbFallbackTestClient.java | 2 +- rls/src/main/java/io/grpc/rls/RlsProtoConverters.java | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java b/core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java index ba66611511..3546e33357 100644 --- a/core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java +++ b/core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java @@ -193,7 +193,7 @@ public final class InProcessChannelBuilder extends private final boolean useSharedTimer; private final int maxInboundMetadataSize; private boolean closed; - private boolean includeCauseWithStatus; + private final boolean includeCauseWithStatus; private InProcessClientTransportFactory( String name, diff --git a/core/src/test/java/io/grpc/internal/AbstractTransportTest.java b/core/src/test/java/io/grpc/internal/AbstractTransportTest.java index 43f6273cde..cca994c105 100644 --- a/core/src/test/java/io/grpc/internal/AbstractTransportTest.java +++ b/core/src/test/java/io/grpc/internal/AbstractTransportTest.java @@ -2067,7 +2067,7 @@ public abstract class AbstractTransportTest { * Verifies that the client status is as expected. By default, the code and description should * be present, and the cause should be stripped away. */ - private void checkClientStatus(Status expectedStatus, Status clientStreamStatus) { + private static void checkClientStatus(Status expectedStatus, Status clientStreamStatus) { assertEquals(expectedStatus.getCode(), clientStreamStatus.getCode()); assertEquals(expectedStatus.getDescription(), clientStreamStatus.getDescription()); assertNull(clientStreamStatus.getCause()); diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbFallbackTestClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbFallbackTestClient.java index 4592bcdf10..e98f4c31d2 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbFallbackTestClient.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/GrpclbFallbackTestClient.java @@ -172,7 +172,7 @@ public final class GrpclbFallbackTestClient { } } - private void runShellCmd(String cmd) throws Exception { + private static void runShellCmd(String cmd) throws Exception { logger.info("Run shell command: " + cmd); ProcessBuilder pb = new ProcessBuilder("bash", "-c", cmd); pb.redirectErrorStream(true); diff --git a/rls/src/main/java/io/grpc/rls/RlsProtoConverters.java b/rls/src/main/java/io/grpc/rls/RlsProtoConverters.java index 00a216c654..87dd6006b6 100644 --- a/rls/src/main/java/io/grpc/rls/RlsProtoConverters.java +++ b/rls/src/main/java/io/grpc/rls/RlsProtoConverters.java @@ -189,4 +189,6 @@ final class RlsProtoConverters { return new GrpcKeyBuilder(names, nameMatchers); } } + + private RlsProtoConverters() {} }