Skip to content

Commit e67207d

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1931 from aws/staging/7e6a3cfe-274c-4505-b32c-ff1f8f81c462
Pull request: release <- staging/7e6a3cfe-274c-4505-b32c-ff1f8f81c462
2 parents c183bed + 723e766 commit e67207d

File tree

369 files changed

+853
-403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+853
-403
lines changed

‎.changes/2.17.129.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": "2.17.129",
3+
"date": "2022-02-11",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Simple Systems Manager (SSM)",
8+
"contributor": "",
9+
"description": "Documentation updates for AWS Systems Manager."
10+
},
11+
{
12+
"type": "bugfix",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Always return an empty SDK bytes when services model their response payload as a blob. Previously, it would either return null, empty bytes or throw an exception depending on the protocol, HTTP client and whether the service was using chunked encoding for their responses."
16+
}
17+
]
18+
}

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# __2.17.129__ __2022-02-11__
2+
## __AWS SDK for Java v2__
3+
- ### Bugfixes
4+
- Always return an empty SDK bytes when services model their response payload as a blob. Previously, it would either return null, empty bytes or throw an exception depending on the protocol, HTTP client and whether the service was using chunked encoding for their responses.
5+
6+
## __Amazon Simple Systems Manager (SSM)__
7+
- ### Features
8+
- Documentation updates for AWS Systems Manager.
9+
110
# __2.17.128__ __2022-02-10__
211
## __AWS CloudFormation__
312
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
5252
<dependency>
5353
<groupId>software.amazon.awssdk</groupId>
5454
<artifactId>bom</artifactId>
55-
<version>2.17.128</version>
55+
<version>2.17.129</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
8686
<dependency>
8787
<groupId>software.amazon.awssdk</groupId>
8888
<artifactId>ec2</artifactId>
89-
<version>2.17.128</version>
89+
<version>2.17.129</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.128</version>
94+
<version>2.17.129</version>
9595
</dependency>
9696
```
9797

@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103103
<dependency>
104104
<groupId>software.amazon.awssdk</groupId>
105105
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.17.128</version>
106+
<version>2.17.129</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.17.128</version>
20+
<version>2.17.129</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

@@ -292,10 +292,17 @@
292292
</dependency>
293293
<dependency>
294294
<groupId>com.github.tomakehurst</groupId>
295-
<artifactId>wiremock</artifactId>
295+
<artifactId>wiremock-jre8</artifactId>
296296
<version>${wiremock.version}</version>
297297
<scope>test</scope>
298298
</dependency>
299+
<!-- Only use wiremock instead of wiremock-jre8 when working around bugs in the newer version -->
300+
<dependency>
301+
<groupId>com.github.tomakehurst</groupId>
302+
<artifactId>wiremock</artifactId>
303+
<version>2.18.0</version>
304+
<scope>compile</scope>
305+
</dependency>
299306
<dependency>
300307
<groupId>com.google.guava</groupId>
301308
<artifactId>guava</artifactId>

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.17.128</version>
20+
<version>2.17.129</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.17.128</version>
24+
<version>2.17.129</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.17.128</version>
25+
<version>2.17.129</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.17.128</version>
24+
<version>2.17.129</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.17.128</version>
25+
<version>2.17.129</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.17.128</version>
24+
<version>2.17.129</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth-crt/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.128</version>
25+
<version>2.17.129</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>
@@ -80,7 +80,7 @@
8080
</dependency>
8181
<dependency>
8282
<groupId>com.github.tomakehurst</groupId>
83-
<artifactId>wiremock</artifactId>
83+
<artifactId>wiremock-jre8</artifactId>
8484
<scope>test</scope>
8585
</dependency>
8686
<dependency>

‎core/auth/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.128</version>
25+
<version>2.17.129</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>
@@ -84,7 +84,7 @@
8484
</dependency>
8585
<dependency>
8686
<groupId>com.github.tomakehurst</groupId>
87-
<artifactId>wiremock</artifactId>
87+
<artifactId>wiremock-jre8</artifactId>
8888
<scope>test</scope>
8989
</dependency>
9090
<dependency>

‎core/aws-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.128</version>
25+
<version>2.17.129</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>
@@ -111,7 +111,7 @@
111111
</dependency>
112112
<dependency>
113113
<groupId>com.github.tomakehurst</groupId>
114-
<artifactId>wiremock</artifactId>
114+
<artifactId>wiremock-jre8</artifactId>
115115
<scope>test</scope>
116116
</dependency>
117117
<dependency>

‎core/json-utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/metrics-spi/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.17.128</version>
8+
<version>2.17.129</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -44,7 +44,7 @@
4444
</dependency>
4545
<dependency>
4646
<groupId>com.github.tomakehurst</groupId>
47-
<artifactId>wiremock</artifactId>
47+
<artifactId>wiremock-jre8</artifactId>
4848
<scope>test</scope>
4949
</dependency>
5050
<dependency>

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.17.128</version>
24+
<version>2.17.129</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.128</version>
25+
<version>2.17.129</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/protocols/aws-cbor-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-json-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.HashMap;
2424
import java.util.List;
2525
import java.util.Map;
26+
import java.util.Optional;
2627
import java.util.stream.Collectors;
2728
import software.amazon.awssdk.annotations.SdkInternalApi;
2829
import software.amazon.awssdk.annotations.ThreadSafe;
@@ -36,6 +37,7 @@
3637
import software.amazon.awssdk.core.traits.MapTrait;
3738
import software.amazon.awssdk.core.traits.PayloadTrait;
3839
import software.amazon.awssdk.core.traits.TimestampFormatTrait;
40+
import software.amazon.awssdk.http.AbortableInputStream;
3941
import software.amazon.awssdk.http.SdkHttpFullResponse;
4042
import software.amazon.awssdk.protocols.core.StringToInstant;
4143
import software.amazon.awssdk.protocols.core.StringToValueConverter;
@@ -225,9 +227,13 @@ private static <TypeT extends SdkPojo> TypeT unmarshallStructured(SdkPojo sdkPoj
225227
JsonNode jsonContent,
226228
JsonUnmarshallerContext context) {
227229
for (SdkField<?> field : sdkPojo.sdkFields()) {
228-
if (isExplicitPayloadMember(field) && field.marshallingType() == MarshallingType.SDK_BYTES &&
229-
context.response().content().isPresent()) {
230-
field.set(sdkPojo, SdkBytes.fromInputStream(context.response().content().get()));
230+
if (isExplicitPayloadMember(field) && field.marshallingType() == MarshallingType.SDK_BYTES) {
231+
Optional<AbortableInputStream> responseContent = context.response().content();
232+
if (responseContent.isPresent()) {
233+
field.set(sdkPojo, SdkBytes.fromInputStream(responseContent.get()));
234+
} else {
235+
field.set(sdkPojo, SdkBytes.fromByteArrayUnsafe(new byte[0]));
236+
}
231237
} else {
232238
JsonNode jsonFieldContent = getJsonNode(jsonContent, field);
233239
JsonUnmarshaller<Object> unmarshaller = context.getUnmarshaller(field.location(), field.marshallingType());

‎core/protocols/aws-query-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.128</version>
23+
<version>2.17.129</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

0 commit comments

Comments
 (0)