Fixup 12492: Eliminate bootstrap dependency on grpc

Author: sauravzg

xds/src/main/java/io/grpc/xds/GrpcBootstrapperImpl.java

@@ -173,11 +173,11 @@ private static ConfiguredChannelCredentials parseChannelCredentials(List<Map<Str
   }
 
   @Override
-  protected Object parseAllowedGrpcServices(
-      Map<String, ?> rawAllowedGrpcServices)
+  protected Optional<Object> parseAllowedGrpcServices(
+      @Nullable Map<String, ?> rawAllowedGrpcServices)
       throws XdsInitializationException {
     if (rawAllowedGrpcServices == null || rawAllowedGrpcServices.isEmpty()) {
-      return AllowedGrpcServices.empty();
+      return Optional.of(AllowedGrpcServices.empty());
     }
 
     ImmutableMap.Builder<String, AllowedGrpcService> builder =
@@ -203,7 +203,7 @@ protected Object parseAllowedGrpcServices(
       callCredentials.ifPresent(b::callCredentials);
       builder.put(targetUri, b.build());
     }
-    return AllowedGrpcServices.create(builder.build());
+    return Optional.of(AllowedGrpcServices.create(builder.build()));
   }
 
   @SuppressWarnings("unused")

xds/src/main/java/io/grpc/xds/client/Bootstrapper.java

@@ -24,9 +24,9 @@
 import com.google.common.collect.ImmutableMap;
 import io.grpc.Internal;
 import io.grpc.xds.client.EnvoyProtoData.Node;
-import io.grpc.xds.internal.grpcservice.AllowedGrpcServices;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import javax.annotation.Nullable;
 
 /**
@@ -210,14 +210,14 @@ public abstract static class BootstrapInfo {
      * Parsed allowed_grpc_services configuration.
      * Returns an opaque object containing the parsed configuration.
      */
-    public abstract Object allowedGrpcServices();
+    public abstract Optional<Object> allowedGrpcServices();
 
     @VisibleForTesting
     public static Builder builder() {
       return new AutoValue_Bootstrapper_BootstrapInfo.Builder()
           .clientDefaultListenerResourceNameTemplate("%s")
           .authorities(ImmutableMap.<String, AuthorityInfo>of())
-          .allowedGrpcServices(AllowedGrpcServices.empty());
+          .allowedGrpcServices(Optional.empty());
     }
 
     @AutoValue.Builder
@@ -239,7 +239,7 @@ public abstract Builder clientDefaultListenerResourceNameTemplate(
 
       public abstract Builder authorities(Map<String, AuthorityInfo> authorities);
 
-      public abstract Builder allowedGrpcServices(Object allowedGrpcServices);
+      public abstract Builder allowedGrpcServices(Optional<Object> allowedGrpcServices);
 
       public abstract BootstrapInfo build();
     }

xds/src/main/java/io/grpc/xds/client/BootstrapperImpl.java

@@ -34,6 +34,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nullable;
 
 /**
  * A {@link Bootstrapper} implementation that reads xDS configurations from local file system.
@@ -245,10 +247,10 @@ protected BootstrapInfo.Builder bootstrapBuilder(Map<String, ?> rawData)
     return builder;
   }
 
-  protected Object parseAllowedGrpcServices(
-      Map<String, ?> rawAllowedGrpcServices)
+  protected Optional<Object> parseAllowedGrpcServices(
+      @Nullable Map<String, ?> rawAllowedGrpcServices)
       throws XdsInitializationException {
-    return io.grpc.xds.internal.grpcservice.AllowedGrpcServices.empty();
+    return Optional.empty();
   }
 
   private List<ServerInfo> parseServerInfos(List<?> rawServerConfigs, XdsLogger logger)

xds/src/test/java/io/grpc/xds/GrpcBootstrapperImplTest.java

@@ -118,7 +118,7 @@ public void parseBootstrap_allowedGrpcServices() throws XdsInitializationExcepti
 
     bootstrapper.setFileReader(createFileReader(BOOTSTRAP_FILE_PATH, rawData));
     BootstrapInfo info = bootstrapper.bootstrap();
-    AllowedGrpcServices allowed = (AllowedGrpcServices) info.allowedGrpcServices();
+    AllowedGrpcServices allowed = (AllowedGrpcServices) info.allowedGrpcServices().get();
     assertThat(allowed).isNotNull();
     assertThat(allowed.services()).containsKey("dns:///foo.com:443");
     AllowedGrpcService service = allowed.services().get("dns:///foo.com:443");