binder: Migrate IntentNameResolverProvider to io.grpc.Uri

Author: jdcormie

binder/src/main/java/io/grpc/binder/internal/IntentNameResolverProvider.java

@@ -20,6 +20,7 @@
 import android.content.Intent;
 import com.google.common.collect.ImmutableSet;
 import io.grpc.NameResolver;
+import io.grpc.Uri;
 import io.grpc.NameResolver.Args;
 import io.grpc.NameResolverProvider;
 import io.grpc.binder.AndroidComponentAddress;
@@ -46,7 +47,17 @@ public String getDefaultScheme() {
   @Override
   public NameResolver newNameResolver(URI targetUri, final Args args) {
     if (Objects.equals(targetUri.getScheme(), ANDROID_INTENT_SCHEME)) {
-      return new IntentNameResolver(parseUriArg(targetUri), args);
+      return new IntentNameResolver(parseUriArg(targetUri.toString()), args);
+    } else {
+      return null;
+    }
+  }
+
+  @Nullable
+  @Override
+  public NameResolver newNameResolver(Uri targetUri, final Args args) {
+    if (Objects.equals(targetUri.getScheme(), ANDROID_INTENT_SCHEME)) {
+      return new IntentNameResolver(parseUriArg(targetUri.toString()), args);
     } else {
       return null;
     }
@@ -67,9 +78,9 @@ public ImmutableSet<Class<? extends SocketAddress>> getProducedSocketAddressType
     return ImmutableSet.of(AndroidComponentAddress.class);
   }
 
-  private static Intent parseUriArg(URI targetUri) {
+  private static Intent parseUriArg(String targetUri) {
     try {
-      return Intent.parseUri(targetUri.toString(), URI_INTENT_SCHEME);
+      return Intent.parseUri(targetUri, URI_INTENT_SCHEME);
     } catch (URISyntaxException e) {
       throw new IllegalArgumentException(e);
     }

binder/src/test/java/io/grpc/binder/internal/IntentNameResolverProviderTest.java

@@ -30,6 +30,7 @@
 import io.grpc.NameResolver.ServiceConfigParser;
 import io.grpc.NameResolverProvider;
 import io.grpc.SynchronizationContext;
+import io.grpc.Uri;
 import io.grpc.binder.ApiConstants;
 import java.net.URI;
 import org.junit.Before;
@@ -70,18 +71,32 @@ public void testProviderScheme_returnsIntentScheme() throws Exception {
 
   @Test
   public void testNoResolverForUnknownScheme_returnsNull() throws Exception {
-    assertThat(provider.newNameResolver(new URI("random://uri"), args)).isNull();
+    assertThat(provider.newNameResolver(Uri.create("random://uri"), args)).isNull();
   }
 
   @Test
   public void testResolutionWithBadUri_throwsIllegalArg() throws Exception {
     assertThrows(
         IllegalArgumentException.class,
-        () -> provider.newNameResolver(new URI("intent:xxx#Intent;e.x=1;end;"), args));
+        () -> provider.newNameResolver(Uri.create("intent:xxx#Intent;e.x=1;end;"), args));
   }
 
   @Test
   public void testResolverForIntentScheme_returnsResolver() throws Exception {
+    Uri uri = Uri.create("intent:#Intent;action=action;end");
+    NameResolver resolver = provider.newNameResolver(uri, args);
+    assertThat(resolver).isNotNull();
+    assertThat(resolver.getServiceAuthority()).isEqualTo("localhost");
+    syncContext.execute(() -> resolver.start(mockListener));
+    shadowOf(getMainLooper()).idle();
+    verify(mockListener).onResult2(resultCaptor.capture());
+    assertThat(resultCaptor.getValue().getAddressesOrError()).isNotNull();
+    syncContext.execute(resolver::shutdown);
+    shadowOf(getMainLooper()).idle();
+  }
+
+  @Test
+  public void testResolverForIntentScheme_returnsResolver_javaNetUri() throws Exception {
     URI uri = new URI("intent://authority/path#Intent;action=action;scheme=scheme;end");
     NameResolver resolver = provider.newNameResolver(uri, args);
     assertThat(resolver).isNotNull();