Stabilize forwarding builders (#10586)

- `ForwardingServerBuilder` - `ForwardingChannelBuilder` - will be deprecated immidiatelly after stabilization - `ForwardingChannelBuilder2` - should be used instead of `ForwardingChannelBuilder`
grpc · Oct 6, 2023 · ab8210a · ab8210a
1 parent 8a247ad
commit ab8210a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/api/src/main/java/io/grpc/ForwardingChannelBuilder.java b/api/src/main/java/io/grpc/ForwardingChannelBuilder.java
@@ -36,7 +36,6 @@
  * @param <T> The type of the subclass extending this abstract class.
  * @since 1.7.0
  */
-@ExperimentalApi("https://github.com/grpc/grpc-java/issues/3363")
 public abstract class ForwardingChannelBuilder<T extends ForwardingChannelBuilder<T>>
     extends ForwardingChannelBuilder2<T> {
   // TODO(sergiitk): deprecate after stabilizing
@@ -237,8 +236,7 @@ public T disableServiceConfigLookUp() {
   /**
    * Returns the correctly typed version of the builder.
    */
-  protected final T thisT() {
-    // TODO(sergiitk): make private when stabilizing.
+  private T thisT() {
     @SuppressWarnings("unchecked")
     T thisT = (T) this;
     return thisT;

diff --git a/api/src/main/java/io/grpc/ForwardingChannelBuilder2.java b/api/src/main/java/io/grpc/ForwardingChannelBuilder2.java
@@ -34,7 +34,6 @@
  * @param <T> The type of the subclass extending this abstract class.
  * @since 1.59.0
  */
-@ExperimentalApi("https://github.com/grpc/grpc-java/issues/10585")
 public abstract class ForwardingChannelBuilder2<T extends ManagedChannelBuilder<T>>
     extends ManagedChannelBuilder<T> {
 

diff --git a/api/src/main/java/io/grpc/ForwardingServerBuilder.java b/api/src/main/java/io/grpc/ForwardingServerBuilder.java
@@ -30,7 +30,6 @@
  * @param <T> The type of the subclass extending this abstract class.
  * @since 1.34.0
  */
-@ExperimentalApi("https://github.com/grpc/grpc-java/issues/7393")
 public abstract class ForwardingServerBuilder<T extends ServerBuilder<T>> extends ServerBuilder<T> {
 
   /** The default constructor. */