Merge pull request #189 and renamed struts archetype to struts2

Author: sapessi

aws-serverless-java-container-core/pom.xml

@@ -12,6 +12,7 @@
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <properties>

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponse.java

@@ -265,14 +265,17 @@ public Collection<String> getHeaderNames() {
 
     @Override
     public String getCharacterEncoding() {
-        return headers.getFirst(HttpHeaders.CONTENT_ENCODING);
+        final String contentType = Optional.ofNullable(getContentType()).orElse("");
+        if (contentType.contains(";")) {
+            return contentType.split(";")[1].split("=")[1].trim().toLowerCase(Locale.getDefault());
+        } else {
+            return "";
+        }
     }
 
 
     @Override
-    public String getContentType() {
-        return headers.getFirst(HttpHeaders.CONTENT_TYPE);
-    }
+    public String getContentType() { return getHeader(HttpHeaders.CONTENT_TYPE); }
 
 
     @Override
@@ -334,7 +337,10 @@ public PrintWriter getWriter() throws IOException {
 
     @Override
     public void setCharacterEncoding(String s) {
-        setHeader(HttpHeaders.CONTENT_ENCODING, s, true);
+        final String characterEncoding = Optional.ofNullable(s).orElse("").toLowerCase(Locale.getDefault());
+        final String oldValue = Optional.ofNullable(getHeader(HttpHeaders.CONTENT_TYPE)).orElse("");
+        String contentType = oldValue.contains(";") ? oldValue.split(";")[0].trim(): oldValue;
+        setHeader(HttpHeaders.CONTENT_TYPE, String.format("%s; charset=%s", contentType, characterEncoding), true);
     }
 
 

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponseTest.java

@@ -265,6 +265,49 @@ public void headers_addIntHeader_expectMultipleHeaderValues() {
         assertEquals("15", resp.getHeader("Test"));
     }
 
+    @Test
+    public void characterEncoding_setCharacterEncoding() {
+        AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null);
+        resp.setContentType("application/json");
+        resp.setCharacterEncoding("UTF-8");
+        assertNotEquals("UTF-8", resp.getHeader("Content-Encoding"));
+        assertEquals("application/json; charset=utf-8", resp.getContentType());
+        assertEquals("application/json; charset=utf-8", resp.getHeader("Content-Type"));
+    }
+
+    @Test
+    public void characterEncoding_setContentType() {
+        AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null);
+        resp.setContentType("application/json; charset=utf-8");
+        resp.setCharacterEncoding("UTF-8");
+
+        assertEquals("application/json; charset=utf-8", resp.getContentType());
+        assertEquals("application/json; charset=utf-8", resp.getHeader("Content-Type"));
+        assertEquals("utf-8", resp.getCharacterEncoding());
+    }
+
+    @Test
+    public void characterEncoding_setContentTypeAndsetCharacterEncoding() {
+        AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null);
+        resp.setContentType("application/json");
+        resp.setCharacterEncoding("UTF-8");
+
+        assertEquals("application/json; charset=utf-8", resp.getContentType());
+        assertEquals("application/json; charset=utf-8", resp.getHeader("Content-Type"));
+        assertEquals("utf-8", resp.getCharacterEncoding());
+    }
+
+    @Test
+    public void characterEncoding_setCharacterEncodingAndsetContentType() {
+        AwsHttpServletResponse resp = new AwsHttpServletResponse(null, null);
+        resp.setCharacterEncoding("UTF-8");
+        resp.setContentType("application/json");
+
+        assertEquals("application/json", resp.getContentType());
+        assertEquals("application/json", resp.getHeader("Content-Type"));
+        assertEquals("", resp.getCharacterEncoding());
+    }
+
     private int getMaxAge(String header) {
         Matcher ageMatcher = MAX_AGE_PATTERN.matcher(header);
         assertTrue(ageMatcher.find());

aws-serverless-java-container-jersey/pom.xml

@@ -12,6 +12,7 @@
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <properties>

aws-serverless-java-container-spark/pom.xml

@@ -12,6 +12,7 @@
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <properties>

aws-serverless-java-container-spring/pom.xml

@@ -12,6 +12,7 @@
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <properties>

aws-serverless-struts-archetype/pom.xml renamed to aws-serverless-struts2-archetype/pom.xml

@@ -9,7 +9,7 @@
     </parent>
 
     <groupId>com.amazonaws.serverless.archetypes</groupId>
-    <artifactId>aws-serverless-struts-archetype</artifactId>
+    <artifactId>aws-serverless-struts2-archetype</artifactId>
     <version>1.2-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>