Fixup 12494: Remove Authz specific abstractions away from the generic headermutations libraries

Author: sauravzg

xds/src/main/java/io/grpc/xds/internal/headermutations/HeaderMutationFilter.java

@@ -18,8 +18,6 @@
 
 import com.google.common.collect.ImmutableList;
 import io.grpc.xds.internal.grpcservice.HeaderValueValidationUtils;
-import io.grpc.xds.internal.headermutations.HeaderMutations.RequestHeaderMutations;
-import io.grpc.xds.internal.headermutations.HeaderMutations.ResponseHeaderMutations;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -48,18 +46,12 @@ public HeaderMutationFilter(Optional<HeaderMutationRulesConfig> mutationRules) {
    */
   public HeaderMutations filter(HeaderMutations mutations)
       throws HeaderMutationDisallowedException {
-    ImmutableList<HeaderValueOption> allowedRequestHeaders =
-        filterCollection(mutations.requestMutations().headers(),
-            this::shouldIgnore, this::isHeaderMutationAllowed);
-    ImmutableList<String> allowedRequestHeadersToRemove =
-        filterCollection(mutations.requestMutations().headersToRemove(),
-            this::shouldIgnore, this::isHeaderMutationAllowed);
-    ImmutableList<HeaderValueOption> allowedResponseHeaders =
-        filterCollection(mutations.responseMutations().headers(),
-            this::shouldIgnore, this::isHeaderMutationAllowed);
-    return HeaderMutations.create(
-        RequestHeaderMutations.create(allowedRequestHeaders, allowedRequestHeadersToRemove),
-        ResponseHeaderMutations.create(allowedResponseHeaders));
+    ImmutableList<HeaderValueOption> allowedHeaders =
+        filterCollection(mutations.headers(), this::shouldIgnore, this::isHeaderMutationAllowed);
+    ImmutableList<String> allowedHeadersToRemove =
+        filterCollection(mutations.headersToRemove(), this::shouldIgnore,
+            this::isHeaderMutationAllowed);
+    return HeaderMutations.create(allowedHeaders, allowedHeadersToRemove);
   }
 
   /**

xds/src/main/java/io/grpc/xds/internal/headermutations/HeaderMutations.java

@@ -19,39 +19,16 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 
-/** A collection of header mutations for both request and response headers. */
+/** A collection of header mutations. */
 @AutoValue
 public abstract class HeaderMutations {
 
-  public static HeaderMutations create(RequestHeaderMutations requestMutations,
-      ResponseHeaderMutations responseMutations) {
-    return new AutoValue_HeaderMutations(requestMutations, responseMutations);
+  public static HeaderMutations create(ImmutableList<HeaderValueOption> headers,
+      ImmutableList<String> headersToRemove) {
+    return new AutoValue_HeaderMutations(headers, headersToRemove);
   }
 
-  public abstract RequestHeaderMutations requestMutations();
+  public abstract ImmutableList<HeaderValueOption> headers();
 
-  public abstract ResponseHeaderMutations responseMutations();
-
-  /** Represents mutations for request headers. */
-  @AutoValue
-  public abstract static class RequestHeaderMutations {
-    public static RequestHeaderMutations create(ImmutableList<HeaderValueOption> headers,
-        ImmutableList<String> headersToRemove) {
-      return new AutoValue_HeaderMutations_RequestHeaderMutations(headers, headersToRemove);
-    }
-
-    public abstract ImmutableList<HeaderValueOption> headers();
-
-    public abstract ImmutableList<String> headersToRemove();
-  }
-
-  /** Represents mutations for response headers. */
-  @AutoValue
-  public abstract static class ResponseHeaderMutations {
-    public static ResponseHeaderMutations create(ImmutableList<HeaderValueOption> headers) {
-      return new AutoValue_HeaderMutations_ResponseHeaderMutations(headers);
-    }
-
-    public abstract ImmutableList<HeaderValueOption> headers();
-  }
+  public abstract ImmutableList<String> headersToRemove();
 }

xds/src/main/java/io/grpc/xds/internal/headermutations/HeaderMutator.java

@@ -19,8 +19,6 @@
 
 import io.grpc.Metadata;
 import io.grpc.xds.internal.grpcservice.HeaderValue;
-import io.grpc.xds.internal.headermutations.HeaderMutations.RequestHeaderMutations;
-import io.grpc.xds.internal.headermutations.HeaderMutations.ResponseHeaderMutations;
 import io.grpc.xds.internal.headermutations.HeaderValueOption.HeaderAppendAction;
 import java.util.logging.Logger;
 
@@ -47,7 +45,7 @@ public static HeaderMutator create() {
    * @param mutations The header mutations to apply.
    * @param headers The metadata headers to which the mutations will be applied.
    */
-  public void applyRequestMutations(final RequestHeaderMutations mutations, Metadata headers) {
+  public void applyMutations(final HeaderMutations mutations, Metadata headers) {
     // TODO(sauravzg): The specification is not clear on order of header removals and additions.
     // in case of conflicts. Copying the order from Envoy here, which does removals at the end.
     applyHeaderUpdates(mutations.headers(), headers);
@@ -56,16 +54,6 @@ public void applyRequestMutations(final RequestHeaderMutations mutations, Metada
     }
   }
 
-  /**
-   * Applies the given header mutations to the provided metadata headers.
-   *
-   * @param mutations The header mutations to apply.
-   * @param headers The metadata headers to which the mutations will be applied.
-   */
-  public void applyResponseMutations(final ResponseHeaderMutations mutations, Metadata headers) {
-    applyHeaderUpdates(mutations.headers(), headers);
-  }
-
   private void applyHeaderUpdates(final Iterable<HeaderValueOption> headerOptions,
       Metadata headers) {
     for (HeaderValueOption headerOption : headerOptions) {