Merge pull request #161 from awslabs/core

Merging bug fixes for release 1.1.1

Author: sapessi

archetypes/jersey/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>com.amazonaws.serverless.archetypes</groupId>
     <artifactId>aws-serverless-jersey-archetype</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <scm>

archetypes/jersey/src/main/resources/archetype-resources/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-jersey</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>

archetypes/spark/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>com.amazonaws.serverless.archetypes</groupId>
     <artifactId>aws-serverless-spark-archetype</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <scm>

archetypes/spark/src/main/resources/archetype-resources/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spark</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>

archetypes/spring/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>com.amazonaws.serverless.archetypes</groupId>
     <artifactId>aws-serverless-spring-archetype</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <scm>

archetypes/spring/src/main/resources/archetype-resources/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spring</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>

archetypes/springboot/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>com.amazonaws.serverless.archetypes</groupId>
     <artifactId>aws-serverless-springboot-archetype</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <scm>

archetypes/springboot/src/main/resources/archetype-resources/pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spring</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>

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

@@ -6,12 +6,12 @@
     <name>AWS Serverless Java container support - Core</name>
     <description>Allows Java applications written for a servlet container to run in AWS Lambda</description>
     <url>https://aws.amazon.com/lambda</url>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <parent>
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>

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

@@ -290,17 +290,25 @@ protected Cookie[] parseCookieHeaderValue(String headerValue) {
      * @param parameters A Map<String, String> of query string parameters
      * @return The generated query string for the URI
      */
-    protected String generateQueryString(Map<String, String> parameters) {
+    protected String generateQueryString(EncodingQueryStringParameterMap parameters) {
         if (parameters == null || parameters.size() == 0) {
             return null;
         }
         if (queryString != null) {
             return queryString;
         }
 
-        queryString =  parameters.keySet().stream()
-                .map(key -> key + "=" + parameters.get(key))
-                .collect(Collectors.joining("&"));
+        StringBuilder queryStringBuilder = new StringBuilder();
+
+        parameters.keySet().stream().forEach(k -> parameters.get(k).stream().forEach(v -> {
+            queryStringBuilder.append("&");
+            queryStringBuilder.append(k);
+            queryStringBuilder.append("=");
+            queryStringBuilder.append(v);
+        }));
+
+        queryString = queryStringBuilder.toString();
+        queryString = queryString.substring(1); // remove the first & - faster to do it here than adding logic in the Lambda
         return queryString;
     }