Skip to content

Commit 8a46c90

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #739 from aws/staging/31122040-75c0-4a6b-a751-8925bd1fd12b
Pull request: release <- staging/31122040-75c0-4a6b-a751-8925bd1fd12b
2 parents 18b13f1 + 014c387 commit 8a46c90

File tree

350 files changed

+3316
-1070
lines changed

Some content is hidden

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

350 files changed

+3316
-1070
lines changed

‎.changes/2.10.70.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "2.10.70",
3+
"date": "2020-02-21",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon DynamoDB Enhanced Client [Preview]",
8+
"description": "Improves discoverability by adding consumer-style methods for all client, table and index operations."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "EC2 Image Builder",
13+
"description": "This release of EC2 Image Builder increases the maximum policy document size for Image Builder resource-based policy APIs."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Amazon Redshift",
18+
"description": "Extend elastic resize to support resizing clusters to different instance types."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "AWS WAFV2",
23+
"description": "Documentation updates for AWS WAF (wafv2) to correct the guidance for associating a web ACL to a CloudFront distribution."
24+
}
25+
]
26+
}

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# __2.10.70__ __2020-02-21__
2+
## __AWS WAFV2__
3+
- ### Features
4+
- Documentation updates for AWS WAF (wafv2) to correct the guidance for associating a web ACL to a CloudFront distribution.
5+
6+
## __Amazon DynamoDB Enhanced Client [Preview]__
7+
- ### Features
8+
- Improves discoverability by adding consumer-style methods for all client, table and index operations.
9+
10+
## __Amazon Redshift__
11+
- ### Features
12+
- Extend elastic resize to support resizing clusters to different instance types.
13+
14+
## __EC2 Image Builder__
15+
- ### Features
16+
- This release of EC2 Image Builder increases the maximum policy document size for Image Builder resource-based policy APIs.
17+
118
# __2.10.69__ __2020-02-20__
219
## __AWS Savings Plans__
320
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
4848
<dependency>
4949
<groupId>software.amazon.awssdk</groupId>
5050
<artifactId>bom</artifactId>
51-
<version>2.10.69</version>
51+
<version>2.10.70</version>
5252
<type>pom</type>
5353
<scope>import</scope>
5454
</dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
8282
<dependency>
8383
<groupId>software.amazon.awssdk</groupId>
8484
<artifactId>ec2</artifactId>
85-
<version>2.10.69</version>
85+
<version>2.10.70</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>software.amazon.awssdk</groupId>
8989
<artifactId>s3</artifactId>
90-
<version>2.10.69</version>
90+
<version>2.10.70</version>
9191
</dependency>
9292
```
9393

@@ -99,7 +99,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
9999
<dependency>
100100
<groupId>software.amazon.awssdk</groupId>
101101
<artifactId>aws-sdk-java</artifactId>
102-
<version>2.10.69</version>
102+
<version>2.10.70</version>
103103
</dependency>
104104
```
105105

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>software.amazon.awssdk</groupId>
2121
<artifactId>aws-sdk-java-pom</artifactId>
22-
<version>2.10.69</version>
22+
<version>2.10.70</version>
2323
<relativePath>../pom.xml</relativePath>
2424
</parent>
2525
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>software.amazon.awssdk</groupId>
2121
<artifactId>aws-sdk-java-pom</artifactId>
22-
<version>2.10.69</version>
22+
<version>2.10.70</version>
2323
<relativePath>../pom.xml</relativePath>
2424
</parent>
2525
<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.10.69</version>
24+
<version>2.10.70</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.10.69</version>
25+
<version>2.10.70</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.10.69</version>
24+
<version>2.10.70</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.10.69</version>
25+
<version>2.10.70</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.10.69</version>
24+
<version>2.10.70</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.10.69</version>
23+
<version>2.10.70</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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth/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.10.69</version>
25+
<version>2.10.70</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/aws-core/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.10.69</version>
25+
<version>2.10.70</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎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.10.69</version>
24+
<version>2.10.70</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.10.69</version>
25+
<version>2.10.70</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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-ion-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.10.69</version>
23+
<version>2.10.70</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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
@SdkProtectedApi
2525
public class DefaultJsonContentTypeResolver implements JsonContentTypeResolver {
2626

27+
private static final String REST_JSON_CONTENT_TYPE = "application/json";
28+
2729
private final String prefix;
2830

2931
public DefaultJsonContentTypeResolver(String prefix) {
@@ -32,6 +34,11 @@ public DefaultJsonContentTypeResolver(String prefix) {
3234

3335
@Override
3436
public String resolveContentType(AwsJsonProtocolMetadata protocolMetadata) {
35-
return prefix + protocolMetadata.protocolVersion();
37+
switch (protocolMetadata.protocol()) {
38+
case REST_JSON:
39+
return REST_JSON_CONTENT_TYPE;
40+
default:
41+
return prefix + protocolMetadata.protocolVersion();
42+
}
3643
}
3744
}

‎core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonGenerator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public interface StructuredJsonGenerator {
3232
*/
3333
StructuredJsonGenerator NO_OP = new StructuredJsonGenerator() {
3434

35-
private final byte[] emptyBytes = new byte[0];
36-
3735
@Override
3836
public StructuredJsonGenerator writeStartArray() {
3937
return this;
@@ -126,7 +124,7 @@ public StructuredJsonGenerator writeNumber(String number) {
126124

127125
@Override
128126
public byte[] getBytes() {
129-
return emptyBytes;
127+
return null;
130128
}
131129

132130
@Override

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,12 @@ private SdkHttpFullRequest finishMarshalling() {
201201
}
202202

203203
byte[] content = jsonGenerator.getBytes();
204-
request.contentStreamProvider(() -> new ByteArrayInputStream(content));
205-
if (content.length > 0) {
206-
request.putHeader(CONTENT_LENGTH, Integer.toString(content.length));
204+
205+
if (content != null) {
206+
request.contentStreamProvider(() -> new ByteArrayInputStream(content));
207+
if (content.length > 0) {
208+
request.putHeader(CONTENT_LENGTH, Integer.toString(content.length));
209+
}
207210
}
208211
}
209212

@@ -214,7 +217,7 @@ private SdkHttpFullRequest finishMarshalling() {
214217
if (!request.headers().containsKey(CONTENT_TYPE) && !hasEvent) {
215218
if (hasEventStreamingInput) {
216219
request.putHeader(CONTENT_TYPE, MIMETYPE_EVENT_STREAM);
217-
} else if (contentType != null && !hasStreamingInput) {
220+
} else if (contentType != null && !hasStreamingInput && request.contentStreamProvider() != null) {
218221
request.putHeader(CONTENT_TYPE, contentType);
219222
}
220223
}

‎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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-xml-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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/protocol-core/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.10.69</version>
23+
<version>2.10.70</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/regions/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.10.69</version>
25+
<version>2.10.70</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

‎core/sdk-core/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>core</artifactId>
24-
<version>2.10.69</version>
24+
<version>2.10.70</version>
2525
</parent>
2626
<artifactId>sdk-core</artifactId>
2727
<name>AWS Java SDK :: SDK Core</name>

‎http-client-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>aws-sdk-java-pom</artifactId>
2424
<groupId>software.amazon.awssdk</groupId>
25-
<version>2.10.69</version>
25+
<version>2.10.70</version>
2626
</parent>
2727
<artifactId>http-client-spi</artifactId>
2828
<name>AWS Java SDK :: HTTP Client Interface</name>

‎http-clients/apache-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>http-clients</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.10.69</version>
24+
<version>2.10.70</version>
2525
</parent>
2626

2727
<artifactId>apache-client</artifactId>

‎http-clients/netty-nio-client/pom.xml

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

‎http-clients/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.10.69</version>
24+
<version>2.10.70</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎http-clients/url-connection-client/pom.xml

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

0 commit comments

Comments
 (0)