missed a few places

grpc · Nov 1, 2023 · 81045dd · 81045dd
1 parent 883fb0e
commit 81045dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java
@@ -32,7 +32,7 @@
 import io.grpc.ClientCall;
 import io.grpc.ConnectivityState;
 import io.grpc.ExperimentalApi;
-import io.grpc.ForwardingChannelBuilder;
+import io.grpc.ForwardingChannelBuilder2;
 import io.grpc.InternalManagedChannelProvider;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -53,7 +53,7 @@
  *
  * @since 1.12.0
  */
-public final class AndroidChannelBuilder extends ForwardingChannelBuilder<AndroidChannelBuilder> {
+public final class AndroidChannelBuilder extends ForwardingChannelBuilder2<AndroidChannelBuilder> {
 
   private static final String LOG_TAG = "AndroidChannelBuilder";
 

diff --git a/binder/src/main/java/io/grpc/binder/BinderChannelBuilder.java b/binder/src/main/java/io/grpc/binder/BinderChannelBuilder.java
@@ -26,7 +26,7 @@
 import io.grpc.ChannelCredentials;
 import io.grpc.ChannelLogger;
 import io.grpc.ExperimentalApi;
-import io.grpc.ForwardingChannelBuilder;
+import io.grpc.ForwardingChannelBuilder2;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.binder.internal.BinderTransport;
@@ -51,8 +51,7 @@
  *     Services</a>
  */
 @ExperimentalApi("/~https://github.com/grpc/grpc-java/issues/8022")
-public final class BinderChannelBuilder
-    extends ForwardingChannelBuilder<BinderChannelBuilder> {
+public final class BinderChannelBuilder extends ForwardingChannelBuilder2<BinderChannelBuilder> {
 
   /**
    * Creates a channel builder that will bind to a remote Android service.

diff --git a/interop-testing/src/test/java/io/grpc/ChannelAndServerBuilderTest.java b/interop-testing/src/test/java/io/grpc/ChannelAndServerBuilderTest.java
@@ -68,9 +68,8 @@ public static Collection<Object[]> params() throws Exception {
         classes.add(new Object[]{clazz});
         continue;
       }
-      // ForwardingChannelBuilder extends ForwardingChannelBuilder2, not need for extra checks.
       if (ManagedChannelBuilder.class.isAssignableFrom(clazz)
-          && clazz != ManagedChannelBuilder.class && clazz != ForwardingChannelBuilder.class) {
+          && clazz != ManagedChannelBuilder.class && clazz != ForwardingChannelBuilder2.class) {
         classes.add(new Object[]{clazz});
       }
     }