fixes #2345 Fix the transformer matching with encoding (#2346)

Author: stevehu

handler/src/main/java/com/networknt/handler/Interceptor.java

@@ -11,6 +11,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public interface Interceptor extends MiddlewareHandler {
 
@@ -90,5 +91,13 @@ default boolean parseJsonArrayObject(final HttpServerExchange ex, final Attachme
         }
     }
 
+    default Optional<String> findMatchingPrefix(String url, List<String> prefixes) {
+        return prefixes.stream()
+                .filter(prefix -> {
+                    String[] parts = prefix.split(" ", 2);
+                    return url.startsWith(parts[0]);
+                })
+                .findFirst();
+    }
 
 }

request-transformer/src/main/java/com/networknt/reqtrans/RequestTransformerInterceptor.java

@@ -86,7 +86,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
         String requestPath = exchange.getRequestPath();
         if (config.getAppliedPathPrefixes() != null) {
             // check if the path prefix has the second part of encoding to overwrite the defaultBodyEncoding.
-            Optional<String> match = config.getAppliedPathPrefixes().stream().filter(requestPath::startsWith).findFirst();
+            Optional<String> match = findMatchingPrefix(requestPath, config.getAppliedPathPrefixes());
             if(match.isPresent()) {
                 String encoding = StringUtils.getSecondPart(match.get());
                 if (encoding != null && logger.isTraceEnabled())

response-transformer/src/main/java/com/networknt/restrans/ResponseTransformerInterceptor.java

@@ -105,7 +105,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
         String requestPath = exchange.getRequestPath();
         if (config.getAppliedPathPrefixes() != null) {
             // check if the path prefix has the second part of encoding to overwrite the defaultBodyEncoding.
-            Optional<String> match = config.getAppliedPathPrefixes().stream().filter(requestPath::startsWith).findFirst();
+            Optional<String> match = findMatchingPrefix(requestPath, config.getAppliedPathPrefixes());
             if(match.isPresent()) {
                 String encoding = StringUtils.getSecondPart(match.get());
                 if(encoding != null && logger.isTraceEnabled()) logger.trace("Customized encoding {} found in the prefix {} for requestPath {}", encoding, match.get(), requestPath);

response-transformer/src/test/java/com/networknt/restrans/ResponseTransformerInterceptorTest.java

@@ -22,9 +22,11 @@
 import org.xnio.OptionMap;
 
 import java.net.URI;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
 
 public class ResponseTransformerInterceptorTest {
     static final Logger logger = LoggerFactory.getLogger(ResponseTransformerInterceptorTest.class);
@@ -144,4 +146,47 @@ public void run() {
         }
     }
 
+
+    @Test
+    public void testMatch() {
+        List<String> list = new ArrayList<>();
+        list.add("/corp/mras/1.0.0");
+        list.add("/corp/lab/1.0");
+        list.add("/gateway/partyInfo/1.0 ISO-8859-1");
+        String requestPath = "/gateway/partyInfo/1.0/salesforce";
+
+        // Optional<String> match = list.stream().filter(requestPath::startsWith).findFirst();
+        Optional<String> match = findMatchingPrefix(requestPath, list);
+        Assert.assertTrue(match.isPresent());
+        Assert.assertEquals("/gateway/partyInfo/1.0 ISO-8859-1", match.get());
+
+
+    }
+
+    @Test
+    public void testStarts() {
+        String url = "https://www.example.com/path/to/resource";
+        List<String> prefixes = Arrays.asList(
+                "https://www.otherdomain.com",
+                "https://www.example.com",
+                "http://www.example.com"
+        );
+
+        Optional<String> matchingPrefix = findMatchingPrefix(url, prefixes);
+
+        if (matchingPrefix.isPresent()) {
+            System.out.println("Matching prefix found: " + matchingPrefix.get());
+        } else {
+            System.out.println("No matching prefix found");
+        }
+    }
+
+    Optional<String> findMatchingPrefix(String url, List<String> prefixes) {
+        return prefixes.stream()
+                .filter(prefix -> {
+                    String[] parts = prefix.split(" ", 2);
+                    return url.startsWith(parts[0]);
+                })
+                .findFirst();
+    }
 }