Skip to content

Commit 5ec40bd

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #709 from aws/staging/61aa01ae-0e09-48bc-9174-f11fd8453453
Pull request: release <- staging/61aa01ae-0e09-48bc-9174-f11fd8453453
2 parents 5023a15 + 3b7b189 commit 5ec40bd

File tree

285 files changed

+740
-342
lines changed

Some content is hidden

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

285 files changed

+740
-342
lines changed

‎.changes/2.10.42.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.10.42",
3+
"date": "2020-01-02",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Lightsail",
8+
"description": "This release adds support for Certificate Authority (CA) certificate identifier to managed databases in Amazon Lightsail."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon EC2 Container Registry",
13+
"description": "Adds waiters for ImageScanComplete and LifecyclePolicyPreviewComplete"
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Amazon Lex Model Building Service",
18+
"description": "Documentation updates for Amazon Lex."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "AWS Cost Explorer Service",
23+
"description": "Documentation updates for GetReservationUtilization for the Cost Explorer API."
24+
},
25+
{
26+
"type": "bugfix",
27+
"category": "AWS SDK for Java v2",
28+
"description": "Fix unmarshalling for models with xml attributes. See [#1488](https://github.com/aws/aws-sdk-java-v2/issues/1488)."
29+
},
30+
{
31+
"type": "bugfix",
32+
"category": "Netty NIO Http Client",
33+
"description": "Propagate exception properly when an exception is thrown from protocol initialization."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
# __2.10.42__ __2020-01-02__
2+
## __AWS Cost Explorer Service__
3+
- ### Features
4+
- Documentation updates for GetReservationUtilization for the Cost Explorer API.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Bugfixes
8+
- Fix unmarshalling for models with xml attributes. See [#1488](https://github.com/aws/aws-sdk-java-v2/issues/1488).
9+
10+
## __Amazon EC2 Container Registry__
11+
- ### Features
12+
- Adds waiters for ImageScanComplete and LifecyclePolicyPreviewComplete
13+
14+
## __Amazon Lex Model Building Service__
15+
- ### Features
16+
- Documentation updates for Amazon Lex.
17+
18+
## __Amazon Lightsail__
19+
- ### Features
20+
- This release adds support for Certificate Authority (CA) certificate identifier to managed databases in Amazon Lightsail.
21+
22+
## __Netty NIO Http Client__
23+
- ### Bugfixes
24+
- Propagate exception properly when an exception is thrown from protocol initialization.
25+
126
# __2.10.41__ __2019-12-23__
227
## __AWS Health APIs and Notifications__
328
- ### Features

‎CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Please keep the following in mind when considering a code contribution:
8888

8989
Any code you submit will be released under this license. If you are
9090
contributing a large/substantial feature, you may be asked to sign a
91-
[Contributor License Agreement (CLA)][cla].
91+
Contributor License Agreement (CLA).
9292
* For anything but very small or quick changes, you should always start by
9393
checking the [Issues][issues] page to see if the work is already being done
9494
by another person.
@@ -165,7 +165,6 @@ when contributing to the SDK.
165165
[markdown]: https://guides.github.com/features/mastering-markdown/
166166
[issues]: https://github.com/aws/aws-sdk-java-v2/issues
167167
[pull-requests]: https://github.com/aws/aws-sdk-java-v2/pulls
168-
[cla]: https://github.com/aws/aws-cla
169168
[label-bug]: https://github.com/aws/aws-sdk-java-v2/labels/Bug
170169
[label-doc-issue]: https://github.com/aws/aws-sdk-java-v2/labels/Documentation%20Issue
171170
[label-feature-request]: https://github.com/aws/aws-sdk-java-v2/labels/Feature%20Request

‎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.41</version>
51+
<version>2.10.42</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.41</version>
85+
<version>2.10.42</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>software.amazon.awssdk</groupId>
8989
<artifactId>s3</artifactId>
90-
<version>2.10.41</version>
90+
<version>2.10.42</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.41</version>
102+
<version>2.10.42</version>
103103
</dependency>
104104
```
105105

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.10.41</version>
7+
<version>2.10.42</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>aws-sdk-java-pom</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.10.41</version>
8+
<version>2.10.42</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.10.41</version>
7+
<version>2.10.42</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<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.41</version>
24+
<version>2.10.42</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
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>aws-sdk-java-pom</artifactId>
10-
<version>2.10.41</version>
10+
<version>2.10.42</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>software.amazon.awssdk</groupId>
88
<artifactId>aws-sdk-java-pom</artifactId>
9-
<version>2.10.41</version>
9+
<version>2.10.42</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<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.41</version>
25+
<version>2.10.42</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.41</version>
24+
<version>2.10.42</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
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.10.41</version>
8+
<version>2.10.42</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎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.41</version>
23+
<version>2.10.42</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
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.10.41</version>
10+
<version>2.10.42</version>
1111
</parent>
1212

1313
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.10.41</version>
10+
<version>2.10.42</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsErrorCode.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public final class AwsErrorCode {
4444
throttlingErrorCodes.add("BandwidthLimitExceeded");
4545
throttlingErrorCodes.add("RequestThrottled");
4646
throttlingErrorCodes.add("RequestThrottledException");
47+
throttlingErrorCodes.add("LimitExceededException");
4748
THROTTLING_ERROR_CODES = unmodifiableSet(throttlingErrorCodes);
4849

4950
Set<String> definiteClockSkewErrorCodes = new HashSet<>(3);
@@ -60,6 +61,8 @@ public final class AwsErrorCode {
6061

6162
Set<String> retryableErrorCodes = new HashSet<>(1);
6263
retryableErrorCodes.add("PriorRequestNotComplete");
64+
retryableErrorCodes.add("RequestTimeout");
65+
retryableErrorCodes.add("RequestTimeoutException");
6366
RETRYABLE_ERROR_CODES = unmodifiableSet(retryableErrorCodes);
6467
}
6568

‎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.41</version>
24+
<version>2.10.42</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.41</version>
25+
<version>2.10.42</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
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.10.41</version>
8+
<version>2.10.42</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.10.41</version>
8+
<version>2.10.42</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.10.41</version>
8+
<version>2.10.42</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.10.41</version>
8+
<version>2.10.42</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlDomParser.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616
package software.amazon.awssdk.protocols.query.unmarshall;
1717

1818
import java.io.InputStream;
19+
import java.util.HashMap;
20+
import java.util.Iterator;
21+
import java.util.Map;
1922
import javax.xml.stream.XMLEventReader;
2023
import javax.xml.stream.XMLInputFactory;
2124
import javax.xml.stream.XMLStreamException;
25+
import javax.xml.stream.events.Attribute;
2226
import javax.xml.stream.events.StartElement;
2327
import javax.xml.stream.events.XMLEvent;
2428
import software.amazon.awssdk.annotations.SdkProtectedApi;
@@ -59,6 +63,11 @@ public static XmlElement parse(InputStream inputStream) {
5963
private static XmlElement parseElement(StartElement startElement, XMLEventReader reader) throws XMLStreamException {
6064
XmlElement.Builder elementBuilder = XmlElement.builder()
6165
.elementName(startElement.getName().getLocalPart());
66+
67+
if (startElement.getAttributes().hasNext()) {
68+
parseAttributes(startElement, elementBuilder);
69+
}
70+
6271
XMLEvent nextEvent;
6372
do {
6473
nextEvent = reader.nextEvent();
@@ -71,6 +80,21 @@ private static XmlElement parseElement(StartElement startElement, XMLEventReader
7180
return elementBuilder.build();
7281
}
7382

83+
/**
84+
* Parse the attributes of the element.
85+
*/
86+
@SuppressWarnings("unchecked")
87+
private static void parseAttributes(StartElement startElement, XmlElement.Builder elementBuilder) {
88+
Iterator<Attribute> iterator = startElement.getAttributes();
89+
Map<String, String> attributes = new HashMap<>();
90+
iterator.forEachRemaining(a -> {
91+
String key = a.getName().getPrefix() + ":" + a.getName().getLocalPart();
92+
attributes.put(key, a.getValue());
93+
});
94+
95+
elementBuilder.attributes(attributes);
96+
}
97+
7498
/**
7599
* Reads all characters until the next end element event.
76100
*

0 commit comments

Comments
 (0)