Fixup 12724: FilterContext -> FilterConfigParseContext

Author: sauravzg

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

@@ -105,7 +105,7 @@ public FaultFilter newInstance(String name) {
 
     @Override
     public ConfigOrError<FaultConfig> parseFilterConfig(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       HTTPFault httpFaultProto;
       if (!(rawProtoMessage instanceof Any)) {
         return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
@@ -121,7 +121,7 @@ public ConfigOrError<FaultConfig> parseFilterConfig(
 
     @Override
     public ConfigOrError<FaultConfig> parseFilterConfigOverride(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       return parseFilterConfig(rawProtoMessage, context);
     }
 

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

@@ -98,14 +98,14 @@ default boolean isServerFilter() {
      * com.google.protobuf.Any} or a {@link com.google.protobuf.Struct}.
      */
     ConfigOrError<? extends FilterConfig> parseFilterConfig(
-        Message rawProtoMessage, FilterContext context);
+        Message rawProtoMessage, FilterConfigParseContext context);
 
     /**
      * Parses the per-filter override filter config from raw proto message. The message may be
      * either a {@link com.google.protobuf.Any} or a {@link com.google.protobuf.Struct}.
      */
     ConfigOrError<? extends FilterConfig> parseFilterConfigOverride(
-        Message rawProtoMessage, FilterContext context);
+        Message rawProtoMessage, FilterConfigParseContext context);
   }
 
   /** Uses the FilterConfigs produced above to produce an HTTP filter interceptor for clients. */
@@ -133,13 +133,13 @@ default void close() {}
 
   /** Context carrying dynamic metadata for a filter. */
   @AutoValue
-  abstract static class FilterContext {
+  abstract static class FilterConfigParseContext {
     abstract BootstrapInfo bootstrapInfo();
 
     abstract ServerInfo serverInfo();
 
     static Builder builder() {
-      return new AutoValue_Filter_FilterContext.Builder();
+      return new AutoValue_Filter_FilterConfigParseContext.Builder();
     }
 
     @AutoValue.Builder
@@ -148,7 +148,7 @@ abstract static class Builder {
 
       abstract Builder serverInfo(ServerInfo info);
 
-      abstract FilterContext build();
+      abstract FilterConfigParseContext build();
     }
   }
 

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

@@ -87,7 +87,7 @@ public GcpAuthenticationFilter newInstance(String name) {
 
     @Override
     public ConfigOrError<GcpAuthenticationConfig> parseFilterConfig(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       GcpAuthnFilterConfig gcpAuthnProto;
       if (!(rawProtoMessage instanceof Any)) {
         return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
@@ -122,7 +122,7 @@ public ConfigOrError<GcpAuthenticationConfig> parseFilterConfig(
 
     @Override
     public ConfigOrError<GcpAuthenticationConfig> parseFilterConfigOverride(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       return parseFilterConfig(rawProtoMessage, context);
     }
   }

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

@@ -95,7 +95,7 @@ public RbacFilter newInstance(String name) {
 
     @Override
     public ConfigOrError<RbacConfig> parseFilterConfig(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       RBAC rbacProto;
       if (!(rawProtoMessage instanceof Any)) {
         return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
@@ -111,7 +111,7 @@ public ConfigOrError<RbacConfig> parseFilterConfig(
 
     @Override
     public ConfigOrError<RbacConfig> parseFilterConfigOverride(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       RBACPerRoute rbacPerRoute;
       if (!(rawProtoMessage instanceof Any)) {
         return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());

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

@@ -62,13 +62,13 @@ public RouterFilter newInstance(String name) {
 
     @Override
     public ConfigOrError<? extends FilterConfig> parseFilterConfig(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       return ConfigOrError.fromConfig(ROUTER_CONFIG);
     }
 
     @Override
     public ConfigOrError<? extends FilterConfig> parseFilterConfigOverride(
-        Message rawProtoMessage, FilterContext context) {
+        Message rawProtoMessage, FilterConfigParseContext context) {
       return ConfigOrError.fromError("Router Filter should not have override config");
     }
   }

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

@@ -618,7 +618,7 @@ static StructOrError<Filter.FilterConfig> parseHttpFilter(
               isForClient ? "client" : "server"));
     }
 
-    Filter.FilterContext filterContext = Filter.FilterContext.builder()
+    Filter.FilterConfigParseContext filterContext = Filter.FilterConfigParseContext.builder()
         .bootstrapInfo(args.getBootstrapInfo())
         .serverInfo(args.getServerInfo())
         .build();

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

@@ -211,7 +211,7 @@ private static StructOrError<VirtualHost> parseVirtualHost(
   static StructOrError<Map<String, FilterConfig>> parseOverrideFilterConfigs(
       Map<String, Any> rawFilterConfigMap, FilterRegistry filterRegistry,
       XdsResourceType.Args args) {
-    Filter.FilterContext context = Filter.FilterContext.builder()
+    Filter.FilterConfigParseContext context = Filter.FilterConfigParseContext.builder()
         .bootstrapInfo(args.getBootstrapInfo())
         .serverInfo(args.getServerInfo())
         .build();

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

@@ -105,8 +105,8 @@ public void parseFaultAbort_withGrpcStatus() {
     assertThat(faultAbort.status().getCode()).isEqualTo(Code.DEADLINE_EXCEEDED);
   }
 
-  private static Filter.FilterContext getFilterContext() {
-    return Filter.FilterContext.builder()
+  private static Filter.FilterConfigParseContext getFilterContext() {
+    return Filter.FilterConfigParseContext.builder()
         .bootstrapInfo(BootstrapInfo.builder()
             .servers(Collections.singletonList(
                 ServerInfo.create(

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

@@ -526,8 +526,8 @@ private static CdsUpdate getCdsUpdateWithIncorrectAudienceWrapper() throws IOExc
     return cdsUpdate.parsedMetadata(parsedMetadata.build()).build();
   }
 
-  private static Filter.FilterContext getFilterContext() {
-    return Filter.FilterContext.builder()
+  private static Filter.FilterConfigParseContext getFilterContext() {
+    return Filter.FilterConfigParseContext.builder()
         .bootstrapInfo(BootstrapInfo.builder()
             .servers(Collections.singletonList(
                 ServerInfo.create(

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

@@ -1297,13 +1297,13 @@ public TestFilter newInstance(String name) {
 
       @Override
       public ConfigOrError<SimpleFilterConfig> parseFilterConfig(Message rawProtoMessage,
-              FilterContext context) {
+              FilterConfigParseContext context) {
         return ConfigOrError.fromConfig(new SimpleFilterConfig(rawProtoMessage));
       }
 
       @Override
       public ConfigOrError<SimpleFilterConfig> parseFilterConfigOverride(Message rawProtoMessage,
-              FilterContext context) {
+              FilterConfigParseContext context) {
         return ConfigOrError.fromConfig(new SimpleFilterConfig(rawProtoMessage));
       }
     }