Skip to content

Commit 69d0d60

Browse files
zoewanggzoewangg
committed
Merge branch 'master' into aws-crt-dev-preview
2 parents ab747a5 + aad63f4 commit 69d0d60

File tree

302 files changed

+1677
-596
lines changed

Some content is hidden

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

302 files changed

+1677
-596
lines changed

‎.changes/2.14.3.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "2.14.3",
3+
"date": "2020-08-20",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon FSx",
8+
"description": "Documentation updates for Amazon FSx"
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon Chime",
13+
"description": "Documentation updates for chime"
14+
},
15+
{
16+
"type": "feature",
17+
"category": "AmazonApiGatewayV2",
18+
"description": "Customers can now create Amazon API Gateway HTTP APIs that route requests to AWS AppConfig, Amazon EventBridge, Amazon Kinesis Data Streams, Amazon SQS, and AWS Step Functions."
19+
},
20+
{
21+
"type": "bugfix",
22+
"category": "Amazon DynamoDB Streaming Client",
23+
"description": "Fix for CRC not working correctly for compressed responses"
24+
}
25+
]
26+
}

‎.changes/2.14.4.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"version": "2.14.4",
3+
"date": "2020-08-24",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS IoT SiteWise",
8+
"description": "Add traversalDirection to ListAssociatedAssetsRequest and add portal status to ListPortalsResponse"
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon CloudWatch Logs",
13+
"description": "Documentation updates for CloudWatch Logs"
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Managed Streaming for Kafka",
18+
"description": "Add UpdateConfiguration and DeleteConfiguration operations."
19+
},
20+
{
21+
"type": "bugfix",
22+
"category": "AWS SDK for Java v2",
23+
"description": "For JSON protocols, when unmarshalling a response, if a member is declared to be located in the URI, the member is treated as being located in the payload instead."
24+
},
25+
{
26+
"type": "feature",
27+
"category": "Amazon Simple Systems Manager (SSM)",
28+
"description": "Add string length constraints to OpsDataAttributeName and OpsFilterValue."
29+
},
30+
{
31+
"type": "feature",
32+
"category": "AWS Database Migration Service",
33+
"description": "Added new endpoint settings to include columns with Null and Empty value when using Kinesis and Kafka as target. Added a new endpoint setting to set maximum message size when using Kafka as target."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Elastic Compute Cloud",
38+
"description": "This release enables customers to use VPC prefix lists in their transit gateway route tables, and it adds support for Provisioned IOPS SSD (io2) EBS volumes."
39+
},
40+
{
41+
"type": "feature",
42+
"category": "AWS X-Ray",
43+
"description": "AWS X-Ray now supports tagging on sampling rules and groups."
44+
},
45+
{
46+
"type": "feature",
47+
"category": "AWS SDK for Java v2",
48+
"description": "Updated service endpoint metadata."
49+
}
50+
]
51+
}

‎CHANGELOG.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,56 @@
1+
# __2.14.4__ __2020-08-24__
2+
## __AWS Database Migration Service__
3+
- ### Features
4+
- Added new endpoint settings to include columns with Null and Empty value when using Kinesis and Kafka as target. Added a new endpoint setting to set maximum message size when using Kafka as target.
5+
6+
## __AWS IoT SiteWise__
7+
- ### Features
8+
- Add traversalDirection to ListAssociatedAssetsRequest and add portal status to ListPortalsResponse
9+
10+
## __AWS SDK for Java v2__
11+
- ### Features
12+
- Updated service endpoint metadata.
13+
14+
- ### Bugfixes
15+
- For JSON protocols, when unmarshalling a response, if a member is declared to be located in the URI, the member is treated as being located in the payload instead.
16+
17+
## __AWS X-Ray__
18+
- ### Features
19+
- AWS X-Ray now supports tagging on sampling rules and groups.
20+
21+
## __Amazon CloudWatch Logs__
22+
- ### Features
23+
- Documentation updates for CloudWatch Logs
24+
25+
## __Amazon Elastic Compute Cloud__
26+
- ### Features
27+
- This release enables customers to use VPC prefix lists in their transit gateway route tables, and it adds support for Provisioned IOPS SSD (io2) EBS volumes.
28+
29+
## __Amazon Simple Systems Manager (SSM)__
30+
- ### Features
31+
- Add string length constraints to OpsDataAttributeName and OpsFilterValue.
32+
33+
## __Managed Streaming for Kafka__
34+
- ### Features
35+
- Add UpdateConfiguration and DeleteConfiguration operations.
36+
37+
# __2.14.3__ __2020-08-20__
38+
## __Amazon Chime__
39+
- ### Features
40+
- Documentation updates for chime
41+
42+
## __Amazon DynamoDB Streaming Client__
43+
- ### Bugfixes
44+
- Fix for CRC not working correctly for compressed responses
45+
46+
## __Amazon FSx__
47+
- ### Features
48+
- Documentation updates for Amazon FSx
49+
50+
## __AmazonApiGatewayV2__
51+
- ### Features
52+
- Customers can now create Amazon API Gateway HTTP APIs that route requests to AWS AppConfig, Amazon EventBridge, Amazon Kinesis Data Streams, Amazon SQS, and AWS Step Functions.
53+
154
# __2.14.2__ __2020-08-19__
255
## __AWS Lake Formation__
356
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
4949
<dependency>
5050
<groupId>software.amazon.awssdk</groupId>
5151
<artifactId>bom</artifactId>
52-
<version>2.14.2</version>
52+
<version>2.14.4</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>
@@ -83,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only:
8383
<dependency>
8484
<groupId>software.amazon.awssdk</groupId>
8585
<artifactId>ec2</artifactId>
86-
<version>2.14.2</version>
86+
<version>2.14.4</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.14.2</version>
91+
<version>2.14.4</version>
9292
</dependency>
9393
```
9494

@@ -100,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
100100
<dependency>
101101
<groupId>software.amazon.awssdk</groupId>
102102
<artifactId>aws-sdk-java</artifactId>
103-
<version>2.14.2</version>
103+
<version>2.14.4</version>
104104
</dependency>
105105
```
106106

‎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.14.3-SNAPSHOT</version>
23+
<version>2.14.5-SNAPSHOT</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎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.14.3-SNAPSHOT</version>
23+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
20+
<version>2.14.5-SNAPSHOT</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<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.14.3-SNAPSHOT</version>
23+
<version>2.14.5-SNAPSHOT</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
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.14.3-SNAPSHOT</version>
20+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
24+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
25+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
24+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
25+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
24+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
23+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
23+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
25+
<version>2.14.5-SNAPSHOT</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.14.3-SNAPSHOT</version>
25+
<version>2.14.5-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/metrics-spi/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.3-SNAPSHOT</version>
8+
<version>2.14.5-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.protocols.json.internal;
17+
18+
import software.amazon.awssdk.annotations.SdkInternalApi;
19+
import software.amazon.awssdk.core.protocol.MarshallLocation;
20+
21+
@SdkInternalApi
22+
public final class MarshallerUtil {
23+
private MarshallerUtil() {
24+
}
25+
26+
/**
27+
* @return true if the location is in the URI, false otherwise.
28+
*/
29+
public static boolean locationInUri(MarshallLocation location) {
30+
switch (location) {
31+
case PATH:
32+
case QUERY_PARAM:
33+
return true;
34+
default:
35+
return false;
36+
}
37+
}
38+
}

0 commit comments

Comments
 (0)