Skip to content

Merging bug fixes for release 1.1.1 #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 20, 2018
Merged

Merging bug fixes for release 1.1.1 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7678d3c
Changes to address query string encoding/reading from issues #146, #1…
sapessi Jun 18, 2018
38d0154
Merging changes from master - forgot to do it earlier so going the wr…
sapessi Jun 18, 2018
f18176f
Addressed bug with Spark requests to the root resource not being rout…
sapessi Jun 18, 2018
c0b3b29
Fixed issues with set content encoding header reported in #150
sapessi Jun 19, 2018
e4266e1
Added unit test to verify that issue #158 is actually supported in th…
sapessi Jun 20, 2018
486ed1c
Preparing for 1.1.1 release to address bugs
sapessi Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions archetypes/jersey/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/spark/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/spring/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/springboot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/springboot/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions aws-serverless-java-container-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 12 additions & 4 deletions .../src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,17 +290,25 @@ protected Cookie[] parseCookieHeaderValue(String headerValue) {
* @param parameters A Map&lt;String, String&gt; 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;
}

Expand Down
Loading