Major chages to Jersey's implementation. Moved to using servlet requests and responses as underlying objects. This solves #62 and simplifies writers and readers by condensing everything in the servlet implementation

Author: sapessi

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/RequestReader.java

@@ -50,6 +50,11 @@ public abstract class RequestReader<RequestType, ContainerRequestType> {
      */
     public static final String LAMBDA_CONTEXT_PROPERTY = "com.amazonaws.lambda.context";
 
+    /**
+     * The key for the <strong>JAX RS security context</strong> properties stored in the request attributes
+     */
+    public static final String JAX_SECURITY_CONTEXT_PROPERTY = "com.amazonaws.serverless.jaxrs.securityContext";
+
 
     //-------------------------------------------------------------
     // Methods - Abstract

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

@@ -79,7 +79,7 @@ public class AwsProxyHttpServletRequest extends AwsHttpServletRequest {
     private SecurityContext securityContext;
     private Map<String, List<String>> urlEncodedFormParameters;
     private Map<String, Part> multipartFormParameters;
-    private Logger log = LoggerFactory.getLogger(AwsProxyHttpServletRequest.class);
+    private static Logger log = LoggerFactory.getLogger(AwsProxyHttpServletRequest.class);
     private ContainerConfig config;
 
 
@@ -749,9 +749,13 @@ private Map<String, List<String>> getFormUrlEncodedParametersMap() {
         return output;
     }
 
-    private String decodeValueIfEncoded(String value) {
+    public static String decodeValueIfEncoded(String value) {
+        if (value == null) {
+            return null;
+        }
+
         try {
-            return URLDecoder.decode(value, DEFAULT_CHARACTER_ENCODING);
+            return URLDecoder.decode(value, LambdaContainerHandler.getContainerConfig().getUriEncoding());
         } catch (UnsupportedEncodingException e) {
             log.warn("Could not decode body content - proceeding as if it was already decoded", e);
             return value;

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

@@ -38,6 +38,7 @@ public AwsProxyHttpServletRequest readRequest(AwsProxyRequest request, SecurityC
         servletRequest.setAttribute(API_GATEWAY_CONTEXT_PROPERTY, request.getRequestContext());
         servletRequest.setAttribute(API_GATEWAY_STAGE_VARS_PROPERTY, request.getStageVariables());
         servletRequest.setAttribute(LAMBDA_CONTEXT_PROPERTY, lambdaContext);
+        servletRequest.setAttribute(JAX_SECURITY_CONTEXT_PROPERTY, securityContext);
 
         return servletRequest;
     }