.

Author: kannanjgithub

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

@@ -27,16 +27,14 @@
 public abstract class HeaderValueOption {
 
   public static HeaderValueOption create(
-      HeaderValue header, HeaderAppendAction appendAction, boolean keepEmptyValue) {
-    return new AutoValue_HeaderValueOption(header, appendAction, keepEmptyValue);
+      HeaderValue header, HeaderAppendAction appendAction) {
+    return new AutoValue_HeaderValueOption(header, appendAction);
   }
 
   public abstract HeaderValue header();
 
   public abstract HeaderAppendAction appendAction();
 
-  public abstract boolean keepEmptyValue();
-
   /**
    * Defines the action to take when appending headers.
    * Mirrors io.envoyproxy.envoy.config.core.v3.HeaderValueOption.HeaderAppendAction.

xds/src/test/java/io/grpc/xds/internal/headermutations/HeaderMutationFilterTest.java

@@ -36,12 +36,12 @@ public class HeaderMutationFilterTest {
 
   private static HeaderValueOption header(String key, ByteString value) {
     return HeaderValueOption.create(io.grpc.xds.internal.grpcservice.HeaderValue.create(key, value),
-        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, false);
+        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
   }
 
   private static HeaderValueOption header(String key, String value) {
     return HeaderValueOption.create(io.grpc.xds.internal.grpcservice.HeaderValue.create(key, value),
-        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, false);
+        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
   }
 
   @Test

xds/src/test/java/io/grpc/xds/internal/headermutations/HeaderMutationsTest.java

@@ -31,7 +31,7 @@ public class HeaderMutationsTest {
   public void testCreate() {
     HeaderValueOption header = HeaderValueOption.create(
         HeaderValue.create("key", "value"),
-        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, false);
+        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
     HeaderMutations mutations = HeaderMutations.create(
         ImmutableList.of(header), ImmutableList.of("remove-key"));
     assertThat(mutations.headers()).containsExactly(header);

xds/src/test/java/io/grpc/xds/internal/headermutations/HeaderMutatorTest.java

@@ -73,7 +73,7 @@ public void tearDown() {
   }
 
   private static HeaderValueOption header(String key, String value, HeaderAppendAction action) {
-    return HeaderValueOption.create(HeaderValue.create(key, value), action, false);
+    return HeaderValueOption.create(HeaderValue.create(key, value), action);
   }
 
   @Test
@@ -147,8 +147,7 @@ public void applyMutations_binary() {
     HeaderValueOption option =
         HeaderValueOption.create(
             HeaderValue.create(BINARY_KEY.name(), ByteString.copyFrom(value)),
-            HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD,
-            false);
+            HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
     headerMutator.applyMutations(
         HeaderMutations.create(ImmutableList.of(option), ImmutableList.of()), headers);
     assertThat(headers.get(BINARY_KEY)).isEqualTo(value);
@@ -195,8 +194,7 @@ public void applyResponseMutations_binary() {
     HeaderValueOption option =
         HeaderValueOption.create(
             HeaderValue.create(BINARY_KEY.name(), ByteString.copyFrom(value)),
-            HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD,
-            false);
+            HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
     headerMutator.applyMutations(
         HeaderMutations.create(ImmutableList.of(option), ImmutableList.of()), headers);
     assertThat(headers.get(BINARY_KEY)).isEqualTo(value);
@@ -219,21 +217,19 @@ public void applyMutations_keepEmptyValue() {
                 header(OVERWRITE_IF_EXISTS_KEY.name(), "", HeaderAppendAction.OVERWRITE_IF_EXISTS),
                     HeaderValueOption.create(
                     HeaderValue.create("keep-empty-key", ""),
-                    HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD,
-                    true),
+                    HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD),
                 HeaderValueOption.create(
                     HeaderValue.create("keep-empty-overwrite-key", ""),
-                    HeaderAppendAction.OVERWRITE_IF_EXISTS_OR_ADD,
-                    true),
+                    HeaderAppendAction.OVERWRITE_IF_EXISTS_OR_ADD),
                     HeaderValueOption.create(
                     HeaderValue.create("keep-empty-bin-key-bin", ByteString.EMPTY),
-                    HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, true),
+                    HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD),
                 HeaderValueOption.create(
                     HeaderValue.create("ignore-empty-bin-key-bin", ByteString.EMPTY),
-                    HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, false),
+                    HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD),
                 HeaderValueOption.create(
                     HeaderValue.create("overwrite-empty-bin-key-bin", ByteString.EMPTY),
-                    HeaderAppendAction.OVERWRITE_IF_EXISTS_OR_ADD, false)),
+                    HeaderAppendAction.OVERWRITE_IF_EXISTS_OR_ADD)),
             ImmutableList.of());
 
     headers.put(
@@ -287,7 +283,7 @@ public void applyMutations_binaryRemoval() {
   public void applyMutations_stringValueWithBinaryKey_ignored() {
     Metadata headers = new Metadata();
     HeaderValueOption option = HeaderValueOption.create(HeaderValue.create("some-key-bin", "value"),
-        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, false);
+        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
 
     headerMutator.applyMutations(
         HeaderMutations.create(ImmutableList.of(option), ImmutableList.of()), headers);
@@ -301,7 +297,7 @@ public void applyMutations_binaryValueWithAsciiKey_ignored() {
     Metadata headers = new Metadata();
     HeaderValueOption option = HeaderValueOption.create(
         HeaderValue.create("some-key", ByteString.copyFrom(new byte[] {1})),
-        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, false);
+        HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
 
     headerMutator.applyMutations(
         HeaderMutations.create(ImmutableList.of(option), ImmutableList.of()), headers);

xds/src/test/java/io/grpc/xds/internal/headermutations/HeaderValueOptionTest.java

@@ -31,10 +31,9 @@ public class HeaderValueOptionTest {
   public void create_withAllFields_success() {
     HeaderValue header = HeaderValue.create("key1", "value1");
     HeaderValueOption option = HeaderValueOption.create(
-        header, HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD, true);
+        header, HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
 
     assertThat(option.header()).isEqualTo(header);
     assertThat(option.appendAction()).isEqualTo(HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD);
-    assertThat(option.keepEmptyValue()).isTrue();
   }
 }