Fixup 12724: Eliminate GrpcService..Provider classes

Author: sauravzg

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

@@ -17,11 +17,13 @@
 package io.grpc.xds;
 
 
+import com.google.auto.value.AutoValue;
 import com.google.common.base.MoreObjects;
 import com.google.protobuf.Message;
 import io.grpc.ClientInterceptor;
 import io.grpc.ServerInterceptor;
-import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
+import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
+import io.grpc.xds.client.Bootstrapper.ServerInfo;
 import java.io.Closeable;
 import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
@@ -130,21 +132,23 @@ default ServerInterceptor buildServerInterceptor(
   default void close() {}
 
   /** Context carrying dynamic metadata for a filter. */
-  @com.google.auto.value.AutoValue
-  abstract class FilterContext {
-    public abstract GrpcServiceXdsContextProvider grpcServiceContextProvider();
+  @AutoValue
+  abstract static class FilterContext {
+    abstract BootstrapInfo bootstrapInfo();
 
-    public static Builder builder() {
+    abstract ServerInfo serverInfo();
+
+    static Builder builder() {
       return new AutoValue_Filter_FilterContext.Builder();
     }
 
+    @AutoValue.Builder
+    abstract static class Builder {
+      abstract Builder bootstrapInfo(BootstrapInfo info);
 
-    @com.google.auto.value.AutoValue.Builder
-    public abstract static class Builder {
-      public abstract Builder grpcServiceContextProvider(
-          GrpcServiceXdsContextProvider provider);
+      abstract Builder serverInfo(ServerInfo info);
 
-      public abstract FilterContext build();
+      abstract FilterContext build();
     }
   }
 

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

@@ -618,10 +618,9 @@ static StructOrError<Filter.FilterConfig> parseHttpFilter(
               isForClient ? "client" : "server"));
     }
 
-    BootstrapInfoGrpcServiceContextProvider contextProvider =
-        new BootstrapInfoGrpcServiceContextProvider(args.getBootstrapInfo(), args.getServerInfo());
     Filter.FilterContext filterContext = Filter.FilterContext.builder()
-        .grpcServiceContextProvider(contextProvider)
+        .bootstrapInfo(args.getBootstrapInfo())
+        .serverInfo(args.getServerInfo())
         .build();
     ConfigOrError<? extends FilterConfig> filterConfig =
         provider.parseFilterConfig(rawConfig, filterContext);

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

@@ -212,10 +212,9 @@ private static StructOrError<VirtualHost> parseVirtualHost(
   static StructOrError<Map<String, FilterConfig>> parseOverrideFilterConfigs(
       Map<String, Any> rawFilterConfigMap, FilterRegistry filterRegistry,
       XdsResourceType.Args args) {
-    BootstrapInfoGrpcServiceContextProvider grpcServiceContextProvider =
-        new BootstrapInfoGrpcServiceContextProvider(args.getBootstrapInfo(), args.getServerInfo());
     Filter.FilterContext context = Filter.FilterContext.builder()
-        .grpcServiceContextProvider(grpcServiceContextProvider)
+        .bootstrapInfo(args.getBootstrapInfo())
+        .serverInfo(args.getServerInfo())
         .build();
     Map<String, FilterConfig> overrideConfigs = new HashMap<>();
     for (String name : rawFilterConfigMap.keySet()) {

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

@@ -17,7 +17,6 @@
 package io.grpc.xds;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
 
 import com.google.protobuf.Any;
 import io.envoyproxy.envoy.extensions.filters.http.fault.v3.FaultAbort;
@@ -27,7 +26,10 @@
 import io.envoyproxy.envoy.type.v3.FractionalPercent.DenominatorType;
 import io.grpc.Status.Code;
 import io.grpc.internal.GrpcUtil;
-import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
+import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
+import io.grpc.xds.client.Bootstrapper.ServerInfo;
+import io.grpc.xds.client.EnvoyProtoData.Node;
+import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -49,12 +51,14 @@ public void parseFaultAbort_convertHttpStatus() {
         HTTPFault.newBuilder().setAbort(FaultAbort.newBuilder().setHttpStatus(404)).build());
     FaultConfig faultConfig = FILTER_PROVIDER.parseFilterConfig(
             rawConfig, getFilterContext()).config;
+    assertThat(faultConfig.faultAbort()).isNotNull();
     assertThat(faultConfig.faultAbort().status().getCode())
         .isEqualTo(GrpcUtil.httpStatusToGrpcStatus(404).getCode());
 
     FaultConfig faultConfigOverride =
         FILTER_PROVIDER.parseFilterConfigOverride(
                     rawConfig, getFilterContext()).config;
+    assertThat(faultConfigOverride.faultAbort()).isNotNull();
     assertThat(faultConfigOverride.faultAbort().status().getCode())
         .isEqualTo(GrpcUtil.httpStatusToGrpcStatus(404).getCode());
   }
@@ -103,6 +107,14 @@ public void parseFaultAbort_withGrpcStatus() {
 
   private static Filter.FilterContext getFilterContext() {
     return Filter.FilterContext.builder()
-        .grpcServiceContextProvider(mock(GrpcServiceXdsContextProvider.class)).build();
+        .bootstrapInfo(BootstrapInfo.builder()
+            .servers(Collections.singletonList(
+                ServerInfo.create(
+                    "test_target", Collections.emptyMap())))
+            .node(Node.newBuilder().build())
+            .build())
+        .serverInfo(ServerInfo.create(
+            "test_target", Collections.emptyMap(), false, true, false, false))
+        .build();
   }
 }

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

@@ -65,10 +65,12 @@
 import io.grpc.xds.XdsEndpointResource.EdsUpdate;
 import io.grpc.xds.XdsListenerResource.LdsUpdate;
 import io.grpc.xds.XdsRouteConfigureResource.RdsUpdate;
+import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
+import io.grpc.xds.client.Bootstrapper.ServerInfo;
+import io.grpc.xds.client.EnvoyProtoData.Node;
 import io.grpc.xds.client.Locality;
 import io.grpc.xds.client.XdsResourceType;
 import io.grpc.xds.client.XdsResourceType.ResourceInvalidException;
-import io.grpc.xds.internal.grpcservice.GrpcServiceXdsContextProvider;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -526,7 +528,14 @@ private static CdsUpdate getCdsUpdateWithIncorrectAudienceWrapper() throws IOExc
 
   private static Filter.FilterContext getFilterContext() {
     return Filter.FilterContext.builder()
-        .grpcServiceContextProvider(Mockito.mock(GrpcServiceXdsContextProvider.class))
+        .bootstrapInfo(BootstrapInfo.builder()
+            .servers(Collections.singletonList(
+                ServerInfo.create(
+                    "test_target", Collections.emptyMap())))
+            .node(Node.newBuilder().build())
+            .build())
+        .serverInfo(ServerInfo.create(
+            "test_target", Collections.emptyMap(), false, true, false, false))
         .build();
   }
 }