Create a UriWrapper abstraction for the migration

Author: jdcormie

core/src/main/java/io/grpc/internal/ManagedChannelImpl.java

@@ -94,7 +94,6 @@
 import io.grpc.internal.ManagedChannelServiceConfig.ServiceConfigConvertedSelector;
 import io.grpc.internal.RetriableStream.ChannelBufferMeter;
 import io.grpc.internal.RetriableStream.Throttle;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -159,7 +158,7 @@ public Result selectConfig(PickSubchannelArgs args) {
   @Nullable
   private final String authorityOverride;
   private final NameResolverRegistry nameResolverRegistry;
-  private final URI targetUri;
+  private final UriWrapper targetUri;
   private final NameResolverProvider nameResolverProvider;
   private final NameResolver.Args nameResolverArgs;
   private final AutoConfiguredLoadBalancerFactory loadBalancerFactory;
@@ -546,7 +545,7 @@ ClientStream newSubstream(
   ManagedChannelImpl(
       ManagedChannelImplBuilder builder,
       ClientTransportFactory clientTransportFactory,
-      URI targetUri,
+      UriWrapper targetUri,
       NameResolverProvider nameResolverProvider,
       BackoffPolicy.Provider backoffPolicyProvider,
       ObjectPool<? extends Executor> balancerRpcExecutorPool,
@@ -677,9 +676,9 @@ public CallTracer create() {
 
   @VisibleForTesting
   static NameResolver getNameResolver(
-      URI targetUri, @Nullable final String overrideAuthority,
+      UriWrapper targetUri, @Nullable final String overrideAuthority,
       NameResolverProvider provider, NameResolver.Args nameResolverArgs) {
-    NameResolver resolver = provider.newNameResolver(targetUri, nameResolverArgs);
+    NameResolver resolver = targetUri.newNameResolver(provider, nameResolverArgs);
     if (resolver == null) {
       throw new IllegalArgumentException("cannot create a NameResolver for " + targetUri);
     }

core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java

@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static io.grpc.internal.UriWrapper.wrap;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -814,10 +815,10 @@ int getDefaultPort() {
 
   @VisibleForTesting
   static class ResolvedNameResolver {
-    public final URI targetUri;
+    public final UriWrapper targetUri;
     public final NameResolverProvider provider;
 
-    public ResolvedNameResolver(URI targetUri, NameResolverProvider provider) {
+    public ResolvedNameResolver(UriWrapper targetUri, NameResolverProvider provider) {
       this.targetUri = checkNotNull(targetUri, "targetUri");
       this.provider = checkNotNull(provider, "provider");
     }
@@ -872,7 +873,7 @@ static ResolvedNameResolver getNameResolverProvider(
       }
     }
 
-    return new ResolvedNameResolver(targetUri, provider);
+    return new ResolvedNameResolver(wrap(targetUri), provider);
   }
 
   private static class DirectAddressNameResolverProvider extends NameResolverProvider {

core/src/main/java/io/grpc/internal/UriWrapper.java

@@ -0,0 +1,139 @@
+/*
+ * Copyright 2025 The gRPC Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.grpc.internal;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import io.grpc.NameResolver;
+import io.grpc.Uri;
+import java.net.URI;
+import javax.annotation.Nullable;
+
+/** Temporary wrapper for a URI-like object to ease the migration to io.grpc.Uri. */
+interface UriWrapper {
+
+  static UriWrapper wrap(URI uri) {
+    return new JavaNetUriWrapper(uri);
+  }
+
+  static UriWrapper wrap(Uri uri) {
+    return new IoGrpcUriWrapper(uri);
+  }
+
+  /** Uses the given factory and args to create a {@link NameResolver} for this URI. */
+  NameResolver newNameResolver(NameResolver.Factory factory, NameResolver.Args args);
+
+  /** Returns the scheme component of this URI, e.g. "http", "mailto" or "dns". */
+  String getScheme();
+
+  /**
+   * Returns the authority component of this URI, e.g. "google.com", "127.0.0.1:8080", or null if
+   * not present.
+   */
+  @Nullable
+  String getAuthority();
+
+  /** Wraps an instance of java.net.URI. */
+  final class JavaNetUriWrapper implements UriWrapper {
+    private final URI uri;
+
+    private JavaNetUriWrapper(URI uri) {
+      this.uri = checkNotNull(uri);
+    }
+
+    @Override
+    public NameResolver newNameResolver(NameResolver.Factory factory, NameResolver.Args args) {
+      return factory.newNameResolver(uri, args);
+    }
+
+    @Override
+    public String getScheme() {
+      return uri.getScheme();
+    }
+
+    @Override
+    public String getAuthority() {
+      return uri.getAuthority();
+    }
+
+    @Override
+    public String toString() {
+      return uri.toString();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+      if (other == this) {
+        return true;
+      }
+      if (!(other instanceof JavaNetUriWrapper)) {
+        return false;
+      }
+      return uri.equals(((JavaNetUriWrapper) other).uri);
+    }
+
+    @Override
+    public int hashCode() {
+      return uri.hashCode();
+    }
+  }
+
+  /** Wraps an instance of io.grpc.Uri. */
+  final class IoGrpcUriWrapper implements UriWrapper {
+    private final Uri uri;
+
+    private IoGrpcUriWrapper(Uri uri) {
+      this.uri = checkNotNull(uri);
+    }
+
+    @Override
+    public NameResolver newNameResolver(NameResolver.Factory factory, NameResolver.Args args) {
+      return factory.newNameResolver(uri, args);
+    }
+
+    @Override
+    public String getScheme() {
+      return uri.getScheme();
+    }
+
+    @Override
+    public String getAuthority() {
+      return uri.getAuthority();
+    }
+
+    @Override
+    public String toString() {
+      return uri.toString();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+      if (other == this) {
+        return true;
+      }
+      if (!(other instanceof IoGrpcUriWrapper)) {
+        return false;
+      }
+      return uri.equals(((IoGrpcUriWrapper) other).uri);
+    }
+
+    @Override
+    public int hashCode() {
+      return uri.hashCode();
+    }
+  }
+}

core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java

@@ -17,6 +17,7 @@
 package io.grpc.internal;
 
 import static com.google.common.truth.Truth.assertThat;
+import static io.grpc.internal.UriWrapper.wrap;
 import static org.junit.Assert.fail;
 
 import io.grpc.NameResolver;
@@ -125,7 +126,7 @@ private void testValidTarget(String target, String expectedUriString, URI expect
         ManagedChannelImplBuilder.getNameResolverProvider(
             target, nameResolverRegistry, Collections.singleton(InetSocketAddress.class));
     assertThat(resolved.provider).isInstanceOf(FakeNameResolverProvider.class);
-    assertThat(resolved.targetUri).isEqualTo(expectedUri);
+    assertThat(resolved.targetUri).isEqualTo(wrap(expectedUri));
     assertThat(resolved.targetUri.toString()).isEqualTo(expectedUriString);
   }
 

core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java

@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static io.grpc.ConnectivityState.READY;
 import static io.grpc.ConnectivityState.TRANSIENT_FAILURE;
+import static io.grpc.internal.UriWrapper.wrap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -185,7 +186,7 @@ public void setUp() {
     NameResolverProvider nameResolverProvider =
         builder.nameResolverRegistry.getProviderForScheme(targetUri.getScheme());
     channel = new ManagedChannelImpl(
-        builder, mockTransportFactory, targetUri, nameResolverProvider,
+        builder, mockTransportFactory, wrap(targetUri), nameResolverProvider,
         new FakeBackoffPolicyProvider(),
         oobExecutorPool, timer.getStopwatchSupplier(),
         Collections.<ClientInterceptor>emptyList(),

core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java

@@ -28,6 +28,7 @@
 import static io.grpc.EquivalentAddressGroup.ATTR_AUTHORITY_OVERRIDE;
 import static io.grpc.PickSubchannelArgsMatcher.eqPickSubchannelArgs;
 import static io.grpc.internal.ClientStreamListener.RpcProgress.PROCESSED;
+import static io.grpc.internal.UriWrapper.wrap;
 import static junit.framework.TestCase.assertNotSame;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -319,7 +320,7 @@ private void createChannel(boolean nameResolutionExpectedToFail,
     NameResolverProvider nameResolverProvider =
         channelBuilder.nameResolverRegistry.getProviderForScheme(expectedUri.getScheme());
     channel = new ManagedChannelImpl(
-        channelBuilder, mockTransportFactory, expectedUri, nameResolverProvider,
+        channelBuilder, mockTransportFactory, wrap(expectedUri), nameResolverProvider,
         new FakeBackoffPolicyProvider(),
         balancerRpcExecutorPool, timer.getStopwatchSupplier(), Arrays.asList(interceptors),
         timer.getTimeProvider());
@@ -508,7 +509,7 @@ public void startCallBeforeNameResolution() throws Exception {
     when(mockTransportFactory.getSupportedSocketAddressTypes()).thenReturn(Collections.singleton(
         InetSocketAddress.class));
     channel = new ManagedChannelImpl(
-        channelBuilder, mockTransportFactory, expectedUri, nameResolverFactory,
+        channelBuilder, mockTransportFactory, wrap(expectedUri), nameResolverFactory,
         new FakeBackoffPolicyProvider(),
         balancerRpcExecutorPool, timer.getStopwatchSupplier(),
         Collections.<ClientInterceptor>emptyList(), timer.getTimeProvider());
@@ -573,7 +574,7 @@ public void newCallWithConfigSelector() {
     when(mockTransportFactory.getSupportedSocketAddressTypes()).thenReturn(Collections.singleton(
         InetSocketAddress.class));
     channel = new ManagedChannelImpl(
-        channelBuilder, mockTransportFactory, expectedUri, nameResolverFactory,
+        channelBuilder, mockTransportFactory, wrap(expectedUri), nameResolverFactory,
         new FakeBackoffPolicyProvider(),
         balancerRpcExecutorPool, timer.getStopwatchSupplier(),
         Collections.<ClientInterceptor>emptyList(), timer.getTimeProvider());
@@ -4830,11 +4831,11 @@ public void validAuthorityTarget_overrideAuthority() throws Exception {
 
     URI targetUri = new URI("defaultscheme", "", "/foo.googleapis.com:8080", null);
     NameResolver nameResolver = ManagedChannelImpl.getNameResolver(
-        targetUri, null, nameResolverProvider, NAMERESOLVER_ARGS);
+        wrap(targetUri), null, nameResolverProvider, NAMERESOLVER_ARGS);
     assertThat(nameResolver.getServiceAuthority()).isEqualTo(serviceAuthority);
 
     nameResolver = ManagedChannelImpl.getNameResolver(
-        targetUri, overrideAuthority, nameResolverProvider, NAMERESOLVER_ARGS);
+        wrap(targetUri), overrideAuthority, nameResolverProvider, NAMERESOLVER_ARGS);
     assertThat(nameResolver.getServiceAuthority()).isEqualTo(overrideAuthority);
   }
 
@@ -4863,7 +4864,7 @@ public String getDefaultScheme() {
     };
     try {
       ManagedChannelImpl.getNameResolver(
-          URI.create("defaultscheme:///foo.gogoleapis.com:8080"),
+          wrap(URI.create("defaultscheme:///foo.gogoleapis.com:8080")),
           null, nameResolverProvider, NAMERESOLVER_ARGS);
       fail("Should fail");
     } catch (IllegalArgumentException e) {

core/src/test/java/io/grpc/internal/ServiceConfigErrorHandlingTest.java

@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static io.grpc.internal.UriWrapper.wrap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.AdditionalAnswers.delegatesTo;
@@ -168,7 +169,7 @@ private void createChannel(ClientInterceptor... interceptors) {
         new ManagedChannelImpl(
             channelBuilder,
             mockTransportFactory,
-            expectedUri,
+            wrap(expectedUri),
             nameResolverProvider,
             new FakeBackoffPolicyProvider(),
             balancerRpcExecutorPool,