fix: suggested changes

Author: AgraVator

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

@@ -23,7 +23,6 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
 import io.envoyproxy.envoy.config.core.v3.TypedExtensionConfig;
-import io.grpc.xds.ThreadSafeRandom;
 import io.envoyproxy.envoy.extensions.common.matching.v3.ExtensionWithMatcher;
 import io.envoyproxy.envoy.extensions.common.matching.v3.ExtensionWithMatcherPerRoute;
 import io.envoyproxy.envoy.extensions.filters.http.composite.v3.Composite;
@@ -42,6 +41,7 @@
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
 import io.grpc.internal.GrpcUtil;
+import io.grpc.xds.ThreadSafeRandom;
 import io.grpc.xds.internal.UnifiedMatcher;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -199,7 +199,9 @@ private boolean isSupported() {
     }
 
     private static FilterDelegate createFilterDelegate(
-        com.github.xds.core.v3.TypedExtensionConfig config, FilterConfigParseContext context, int depth) {
+        com.github.xds.core.v3.TypedExtensionConfig config,
+        FilterConfigParseContext context,
+        int depth) {
       try {
         Any actionAny = config.getTypedConfig();
         if (actionAny.is(ExecuteFilterAction.class)) {
@@ -286,6 +288,7 @@ static final class FilterDelegate {
 
 
     FilterDelegate(List<DelegateEntry> delegates, @Nullable FractionalPercent samplePercent) {
+
       this.delegates = Collections.unmodifiableList(delegates);
       this.threshold = calculateThreshold(samplePercent);
     }

xds/src/main/java/io/grpc/xds/internal/MatcherParser.java

@@ -100,6 +100,7 @@ public static Matchers.StringMatcher parseStringMatcher(
     }
   }
 
+
   /** Translate StringMatcher xDS proto to internal StringMatcher. */
   public static Matchers.StringMatcher parseStringMatcher(
       com.github.xds.type.matcher.v3.StringMatcher proto) {
@@ -144,28 +145,4 @@ public static Matchers.FractionMatcher parseFractionMatcher(
     }
     return Matchers.FractionMatcher.create(proto.getNumerator(), denominator);
   }
-
-  /** Translate StringMatcher xDS proto to internal StringMatcher. */
-  public static Matchers.StringMatcher parseStringMatcher(
-      com.github.xds.type.matcher.v3.StringMatcher proto) {
-    switch (proto.getMatchPatternCase()) {
-      case EXACT:
-        return Matchers.StringMatcher.forExact(proto.getExact(), proto.getIgnoreCase());
-      case PREFIX:
-        return Matchers.StringMatcher.forPrefix(proto.getPrefix(), proto.getIgnoreCase());
-      case SUFFIX:
-        return Matchers.StringMatcher.forSuffix(proto.getSuffix(), proto.getIgnoreCase());
-      case SAFE_REGEX:
-        return Matchers.StringMatcher.forSafeRegEx(
-            Pattern.compile(proto.getSafeRegex().getRegex()));
-      case CONTAINS:
-        return Matchers.StringMatcher.forContains(proto.getContains());
-      case CUSTOM:
-        throw new IllegalArgumentException("custom string matcher is not supported");
-      case MATCHPATTERN_NOT_SET:
-      default:
-        throw new IllegalArgumentException(
-            "Unknown StringMatcher match pattern: " + proto.getMatchPatternCase());
-    }
-  }
 }

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

@@ -27,11 +27,6 @@
 import com.github.xds.type.matcher.v3.StringMatcher;
 import com.google.protobuf.Any;
 import io.envoyproxy.envoy.config.core.v3.TypedExtensionConfig;
-import io.grpc.xds.Filter.FilterConfigParseContext;
-import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
-import io.grpc.xds.client.Bootstrapper.ServerInfo;
-import io.envoyproxy.envoy.config.core.v3.Node;
-import java.util.Collections;
 import io.envoyproxy.envoy.extensions.common.matching.v3.ExtensionWithMatcher;
 import io.envoyproxy.envoy.extensions.common.matching.v3.ExtensionWithMatcherPerRoute;
 import io.envoyproxy.envoy.extensions.filters.http.composite.v3.Composite;
@@ -49,6 +44,8 @@
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
 import io.grpc.xds.Filter.FilterConfig;
+import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
+import io.grpc.xds.client.Bootstrapper.ServerInfo;
 import io.grpc.xds.internal.UnifiedMatcher;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -93,7 +90,10 @@ public void setUp() {
 
     when(fakeProvider.typeUrls()).thenReturn(new String[]{FAKE_TYPE_URL});
     ConfigOrError<? extends FilterConfig> configRes = ConfigOrError.fromConfig(fakeConfig);
-    when(fakeProvider.parseFilterConfig(any(Any.class), any(Filter.FilterConfigParseContext.class), org.mockito.ArgumentMatchers.anyInt()))
+    when(fakeProvider.parseFilterConfig(
+        any(Any.class),
+        any(Filter.FilterConfigParseContext.class),
+        org.mockito.ArgumentMatchers.anyInt()))
         .thenReturn((ConfigOrError) configRes);
     when(fakeProvider.newInstance(any(String.class))).thenReturn(fakeFilter);
     when(fakeFilter.buildClientInterceptor(any(), any(), any())).thenReturn(fakeClientInterceptor);
@@ -1028,7 +1028,8 @@ public void parseFilterConfigExceedsRecursionLimit() {
     final Any configAny = Any.pack(configProto);
 
     // Mock fakeProvider to call provider.parseFilterConfig recursively
-    when(fakeProvider.parseFilterConfig(any(), any(Filter.FilterConfigParseContext.class), org.mockito.ArgumentMatchers.anyInt()))
+    when(fakeProvider.parseFilterConfig(
+        any(), any(Filter.FilterConfigParseContext.class), org.mockito.ArgumentMatchers.anyInt()))
         .thenAnswer(new org.mockito.stubbing.Answer<ConfigOrError>() {
           @Override
           public ConfigOrError answer(
@@ -1233,7 +1234,8 @@ public void parseFilterConfigInvalidMessageType() {
   @Test
   public void parseFilterConfigOverrideInvalidMessageType() {
     ConfigOrError<CompositeFilter.CompositeFilterConfig> result = provider
-        .parseFilterConfigOverride(com.google.protobuf.Empty.getDefaultInstance(), getFilterContext(), 0);
+        .parseFilterConfigOverride(
+            com.google.protobuf.Empty.getDefaultInstance(), getFilterContext(), 0);
 
     assertThat(result.errorDetail).contains("Invalid message type");
   }