core,netty,okhttp,alts,inprocess: deprecate usePlaintext(boolean)

2 files changed, 16 insertions, 4 deletions

diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
index 068ab0e87..24073b8e7 100644
--- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
+++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
@@ -273,7 +273,7 @@ public class OkHttpChannelBuilder extends
    * <p>By default {@link #DEFAULT_CONNECTION_SPEC} will be used.
    *
    * <p>This method is only used when building a secure connection. For plaintext
-   * connection, use {@link #usePlaintext} instead.
+   * connection, use {@link #usePlaintext()} instead.
    *
    * @throws IllegalArgumentException
    *         If {@code connectionSpec} is not with TLS
@@ -286,8 +286,11 @@ public class OkHttpChannelBuilder extends
 
   /**
    * Equivalent to using {@link #negotiationType(NegotiationType)} with {@code PLAINTEXT}.
+   *
+   * @deprecated use {@link #usePlaintext()} instead.
    */
   @Override
+  @Deprecated
   public final OkHttpChannelBuilder usePlaintext(boolean skipNegotiation) {
     if (skipNegotiation) {
       negotiationType(NegotiationType.PLAINTEXT);
@@ -298,6 +301,15 @@ public class OkHttpChannelBuilder extends
   }
 
   /**
+   * Equivalent to using {@link #negotiationType(NegotiationType)} with {@code PLAINTEXT}.
+   */
+  @Override
+  public final OkHttpChannelBuilder usePlaintext() {
+    negotiationType(NegotiationType.PLAINTEXT);
+    return this;
+  }
+
+  /**
    * Equivalent to using {@link #negotiationType(NegotiationType)} with {@code TLS}.
    */
   @Override
diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java
index 1f362eb6c..429e7f802 100644
--- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java
+++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java
@@ -108,14 +108,14 @@ public class OkHttpChannelBuilderTest {
 
   @Test
   public void usePlaintext_newClientTransportAllowed() {
-    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("host", 1234).usePlaintext(true);
+    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("host", 1234).usePlaintext();
     builder.buildTransportFactory().newClientTransport(new InetSocketAddress(5678),
         "dummy_authority", "dummy_userAgent", null /* proxy */);
   }
 
   @Test
   public void usePlaintextDefaultPort() {
-    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("host", 1234).usePlaintext(true);
+    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("host", 1234).usePlaintext();
     assertEquals(GrpcUtil.DEFAULT_PORT_PLAINTEXT,
         builder.getNameResolverParams().get(NameResolver.Factory.PARAMS_DEFAULT_PORT).intValue());
   }
@@ -125,7 +125,7 @@ public class OkHttpChannelBuilderTest {
     OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("host", 1234);
     assertNotNull(builder.createSocketFactory());
 
-    builder.usePlaintext(true);
+    builder.usePlaintext();
     assertNull(builder.createSocketFactory());
   }
 }