Fixes to struts2 implementation and archetype

Author: sapessi

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

@@ -17,7 +17,7 @@
 
     <properties>
         <struts2.version>2.5.18</struts2.version>
-        <jackson.version>2.9.5</jackson.version>
+        <jackson.version>2.9.7</jackson.version>
     </properties>
 
     <dependencies>

aws-serverless-java-container-struts2/src/main/java/com/amazonaws/serverless/proxy/struts2/Struts2LambdaHandler.java

@@ -27,19 +27,8 @@ public class Struts2LambdaHandler implements RequestStreamHandler {
             .getAwsProxyHandler();
 
     @Override
-    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) {
-
-        try {
-            AwsProxyRequest request = LambdaContainerHandler.getObjectMapper()
-                    .readValue(inputStream, AwsProxyRequest.class);
-
-            AwsProxyResponse response = handler.proxy(request, context);
-            LambdaContainerHandler.getObjectMapper().writeValue(outputStream, response);
-
-            // just in case it wasn't closed by the mapper
-            outputStream.close();
-        } catch (IOException e) {
-            log.error("An unexpected exception happened while handling request", e);
-        }
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
+            throws IOException {
+        handler.proxyStream(inputStream, outputStream, context);
     }
 }

aws-serverless-struts2-archetype/src/main/resources/archetype-resources/pom.xml

@@ -9,20 +9,14 @@
     <version>${version}</version>
     <packaging>jar</packaging>
 
-    <name>Serverless Spring Boot API</name>
+    <name>Serverless Struts2 API</name>
     <url>https://github.com/awslabs/aws-serverless-java-container</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-    </parent>
-
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <struts2.version>2.5.17</struts2.version>
-        <jackson.version>2.9.5</jackson.version>
+        <jackson.version>2.9.7</jackson.version>
         <junit.version>4.12</junit.version>
         <log4j.version>2.8.2</log4j.version>
     </properties>
@@ -31,7 +25,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-struts2</artifactId>
-            <version>1.2.0</version>
+            <version>1.2</version>
         </dependency>
 
         <dependency>
@@ -82,17 +76,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.4</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.4</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.4</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>

aws-serverless-struts2-archetype/src/main/resources/archetype-resources/sam.yaml

@@ -23,6 +23,10 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: AWS::Serverless-2016-10-31
 Description: AWS Serverless Apache Struts2 API - ${groupId}::${artifactId}
+Globals:
+  Api:
+    EndpointConfiguration: REGIONAL
+
 Resources:
   ${resourceName}Function:
     Type: AWS::Serverless::Function

aws-serverless-struts2-archetype/src/main/resources/archetype-resources/src/main/java/actions/PingController.java

@@ -1,4 +1,4 @@
-package ${groupId}.controller;
+package ${groupId}.actions;
 
 
 import com.opensymphony.xwork2.ModelDriven;
@@ -32,13 +32,9 @@ public HttpHeaders index() {
 
     // POST /ping
     public HttpHeaders create() {
-        if (model.getName() == null || model.getBreed() == null) {
-            return null;
-        }
-
         this.model = UUID.randomUUID().toString();
         return new DefaultHttpHeaders("success")
-                .setLocationId(model.getId());
+                .setLocationId(model);
 
     }
 

aws-serverless-struts2-archetype/src/main/resources/archetype-resources/src/main/resources/struts.xml

@@ -16,7 +16,7 @@
     <!-- Define the package name where *Controller classes will be resolved in this case e.g. actions.PingController could also be com.your.company.actions.PingController -->
     <constant name="struts.convention.package.locators" value="actions"/>
     <constant name="struts.convention.action.mapAllMatches" value="true"/>
-    <constant name="struts.convention.default.parent.package" value="pets"/>
+    <constant name="struts.convention.default.parent.package" value="ping"/>
     <constant name="struts.action.extension" value=",,xml,json,action"/>
     <constant name="struts.rest.defaultExtension" value="json"/>
 
@@ -39,7 +39,7 @@
     <!-- Set encoding to UTF-8, default is ISO-8859-1 -->
     <constant name="struts.i18n.encoding" value="UTF-8"/>
 
-    <package name="pets" extends="struts-lambda-support" namespace="/">
+    <package name="ping" extends="struts-lambda-support" namespace="/">
     </package>
 
 </struts>

samples/struts/pet-store/pom.xml

@@ -27,7 +27,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <struts2.version>2.5.17</struts2.version>
-        <jackson.version>2.9.5</jackson.version>
+        <jackson.version>2.9.7</jackson.version>
         <junit.version>4.12</junit.version>
         <log4j.version>2.8.2</log4j.version>
     </properties>
@@ -87,17 +87,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.4</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.4</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.4</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>