From fe1cfc9b966abf64d3a68ca99f9c7ed343f99ec2 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Fri, 8 Jul 2022 18:00:48 -0700 Subject: [PATCH] okhttp: Comment out VisibleForTesting annotation (#9352) Android linters can't recognize the difference when VisibleForTesting is used because the method has different visibility, or because the method only intended for testing. Because of that linter complains when VisibleForTesting methods are used in the production code. Ideally we want to replace or remove this annotation, as its usage for marking altered visibility for testing purposes is discouraged since guava v30.0. --- okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java | 2 +- okhttp/src/main/java/io/grpc/okhttp/OkHttpServerBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java index bb2e66c965..a3f99b67cf 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java @@ -104,7 +104,7 @@ public final class OkHttpChannelBuilder extends PLAINTEXT } - @VisibleForTesting + // @VisibleForTesting static final ConnectionSpec INTERNAL_DEFAULT_CONNECTION_SPEC = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS) .cipherSuites( diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpServerBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpServerBuilder.java index 6026e5989c..5928a2e38c 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpServerBuilder.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpServerBuilder.java @@ -125,7 +125,7 @@ public final class OkHttpServerBuilder extends ForwardingServerBuilder