From 37b0814c2ec34a041fca9542be5eb010ea21c6ff Mon Sep 17 00:00:00 2001 From: Sanjay Pujare Date: Thu, 1 Jun 2023 21:32:35 -0700 Subject: [PATCH 1/2] api: stabilize ManagedChannelBuilder.useTransportSecurity --- api/src/main/java/io/grpc/ManagedChannelBuilder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/io/grpc/ManagedChannelBuilder.java b/api/src/main/java/io/grpc/ManagedChannelBuilder.java index 982577c6228..488c553be40 100644 --- a/api/src/main/java/io/grpc/ManagedChannelBuilder.java +++ b/api/src/main/java/io/grpc/ManagedChannelBuilder.java @@ -195,12 +195,14 @@ public T usePlaintext() { /** * Makes the client use TLS. * + *

It is recommended to use the {@link ChannelCredentials} API + * instead of this method. + * * @return this * @throws IllegalStateException if ChannelCredentials were provided when constructing the builder * @throws UnsupportedOperationException if transport security is not supported. * @since 1.9.0 */ - @ExperimentalApi("https://github.com/grpc/grpc-java/issues/3713") public T useTransportSecurity() { throw new UnsupportedOperationException(); } From 405e7960dbc62df8569e173f7d6aee15c42b4f99 Mon Sep 17 00:00:00 2001 From: Sanjay Pujare Date: Thu, 1 Jun 2023 21:35:17 -0700 Subject: [PATCH 2/2] add a note in Java doc --- api/src/main/java/io/grpc/ManagedChannelBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/io/grpc/ManagedChannelBuilder.java b/api/src/main/java/io/grpc/ManagedChannelBuilder.java index 488c553be40..15d2fbdd317 100644 --- a/api/src/main/java/io/grpc/ManagedChannelBuilder.java +++ b/api/src/main/java/io/grpc/ManagedChannelBuilder.java @@ -193,7 +193,7 @@ public T usePlaintext() { } /** - * Makes the client use TLS. + * Makes the client use TLS. Note: this is enabled by default. * *

It is recommended to use the {@link ChannelCredentials} API * instead of this method.