fixes #2315 make the request response transformer body encoding confi…

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

@@ -107,6 +107,10 @@ public static String toString(final PooledByteBuffer[] srcs, Charset cs) throws
         return new String(toByteArray(srcs), cs);
     }
 
+    public static String toString(final PooledByteBuffer[] srcs, String charsetName) throws IOException {
+        return new String(toByteArray(srcs), charsetName);
+    }
+
     public static String toString(final byte[] src, Charset cs) throws IOException {
         return new String(src, cs);
     }

reqtrans-config/src/main/java/com/networknt/reqtrans/RequestTransformerConfig.java

@@ -24,12 +24,14 @@ public class RequestTransformerConfig {
 
     private static final String ENABLED = "enabled";
     private static final String REQUIRED_CONTENT = "requiredContent";
+    private static final String DEFAULT_BODY_ENCODING = "defaultBodyEncoding";
     private static final String APPLIED_PATH_PREFIXES = "appliedPathPrefixes";
 
     private Map<String, Object> mappedConfig;
-    private Config config;
+    private final Config config;
     private boolean enabled;
     private boolean requiredContent;
+    private String defaultBodyEncoding;
     List<String> appliedPathPrefixes;
 
     private RequestTransformerConfig() {
@@ -63,6 +65,11 @@ public boolean isEnabled() {
     }
 
     public boolean isRequiredContent() { return requiredContent; }
+
+    public String getDefaultBodyEncoding() {
+        return defaultBodyEncoding;
+    }
+
     public List<String> getAppliedPathPrefixes() {
         return appliedPathPrefixes;
     }
@@ -92,6 +99,8 @@ private void setConfigData() {
                 throw new ConfigException("requiredContent must be a boolean value.");
             }
         }
+        object = mappedConfig.get(DEFAULT_BODY_ENCODING);
+        if (object != null) defaultBodyEncoding = (String) object;
     }
 
     private void setConfigList() {

reqtrans-config/src/main/resources/config/request-transformer.yml

@@ -3,6 +3,8 @@
 enabled: ${request-transformer.enabled:true}
 # indicate if the transform interceptor needs to change the request body
 requiredContent: ${request-transformer.requiredContent:true}
+# default body encoding for the request body. The default value is UTF-8. Other options are ISO-8859-1 and US-ASCII.
+defaultBodyEncoding: ${request-transformer.defaultBodyEncoding:UTF-8}
 # A list of applied request path prefixes, other requests will skip this handler. The value can be a string
 # if there is only one request path prefix needs this handler. or a list of strings if there are multiple.
 appliedPathPrefixes: ${request-transformer.appliedPathPrefixes:}

reqtrans-config/src/test/java/com/networknt/reqtrans/RequestTransformerConfigTest.java

@@ -8,5 +8,6 @@ public class RequestTransformerConfigTest {
     public void testConfigLoad() {
         RequestTransformerConfig config = RequestTransformerConfig.load();
         Assert.assertTrue(config.getMappedConfig().size() > 0);
+        Assert.assertEquals(config.getDefaultBodyEncoding(), "UTF-8");
     }
 }

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

@@ -132,7 +132,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
                                 if (shouldAttachBody(exchange.getRequestHeaders())) {
                                     if(logger.isTraceEnabled()) logger.trace("shouldAttachBody is true");
                                     PooledByteBuffer[] requestData = this.getBuffer(exchange);
-                                    String s = BuffersUtils.toString(requestData, StandardCharsets.UTF_8);
+                                    String s = BuffersUtils.toString(requestData, config.getDefaultBodyEncoding());
                                     // Transform the request body with the rule engine.
                                     if(logger.isDebugEnabled()) logger.debug("original request body = " + s);
                                     objMap.put("requestBody", s);

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

@@ -98,7 +98,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
         if (logger.isDebugEnabled()) logger.trace("ResponseTransformerInterceptor.handleRequest starts.");
         String requestPath = exchange.getRequestPath();
         if (config.getAppliedPathPrefixes() != null && config.getAppliedPathPrefixes().stream().anyMatch(requestPath::startsWith)) {
-            String responseBody = BuffersUtils.toString(getBuffer(exchange), StandardCharsets.UTF_8);
+            String responseBody = BuffersUtils.toString(getBuffer(exchange), config.getDefaultBodyEncoding());
             if (logger.isTraceEnabled())
                 logger.trace("original response body = " + responseBody);
 

restrans-config/src/main/java/com/networknt/restrans/ResponseTransformerConfig.java

@@ -17,12 +17,14 @@ public class ResponseTransformerConfig {
 
     private static final String ENABLED = "enabled";
     private static final String REQUIRED_CONTENT = "requiredContent";
+    private static final String DEFAULT_BODY_ENCODING = "defaultBodyEncoding";
     private static final String APPLIED_PATH_PREFIXES = "appliedPathPrefixes";
 
     private Map<String, Object> mappedConfig;
     private Config config;
     private boolean enabled;
     private boolean requiredContent;
+    private String defaultBodyEncoding;
     List<String> appliedPathPrefixes;
 
     private ResponseTransformerConfig() {
@@ -55,6 +57,7 @@ public boolean isEnabled() {
         return enabled;
     }
     public boolean isRequiredContent() { return requiredContent; }
+    public String getDefaultBodyEncoding() { return defaultBodyEncoding; }
     public List<String> getAppliedPathPrefixes() {
         return appliedPathPrefixes;
     }
@@ -84,6 +87,8 @@ private void setConfigData() {
                 throw new ConfigException("requiredContent must be a boolean value.");
             }
         }
+        object = mappedConfig.get(DEFAULT_BODY_ENCODING);
+        if (object != null) defaultBodyEncoding = (String) object;
     }
 
     private void setConfigList() {

restrans-config/src/main/resources/config/response-transformer.yml

@@ -4,6 +4,8 @@
 enabled: ${response-transformer.enabled:true}
 # indicate if the transformer needs to modify the response body in the transform rules.
 requiredContent: ${response-transformer.requiredContent:true}
+# default body encoding for the response body. The default value is UTF-8. Other options are ISO-8859-1 and US-ASCII.
+defaultBodyEncoding: ${response-transformer.defaultBodyEncoding:UTF-8}
 # A list of applied request path prefixes, other requests will skip this handler. The value can be a string
 # if there is only one request path prefix needs this handler. or a list of strings if there are multiple.
 appliedPathPrefixes: ${response-transformer.appliedPathPrefixes:}

restrans-config/src/test/java/com/networknt/restrans/ResponseTransformerConfigTest.java

@@ -8,6 +8,7 @@ public class ResponseTransformerConfigTest {
     public void testConfigLoad() {
         ResponseTransformerConfig config = ResponseTransformerConfig.load();
         Assert.assertTrue(config.getMappedConfig().size() > 0);
+        Assert.assertEquals(config.getDefaultBodyEncoding(), "UTF-8");
     }
 
 }