Skip to content

Commit 1252fda

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1541 from aws/staging/2abb2a11-c747-41b3-99a3-1bcce917e438
Pull request: release <- staging/2abb2a11-c747-41b3-99a3-1bcce917e438
2 parents 6d172c0 + 1eff8a8 commit 1252fda

File tree

350 files changed

+1510
-533
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

+1510
-533
lines changed

‎.changes/2.16.103.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.16.103",
3+
"date": "2021-07-15",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Elastic Compute Cloud",
8+
"contributor": "",
9+
"description": "This feature enables customers to specify weekly recurring time window(s) for scheduled events that reboot, stop or terminate EC2 instances."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Add support for marshalling lists of strings in HTTP headers"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Cognito Identity Provider",
20+
"contributor": "",
21+
"description": "Documentation updates for cognito-idp"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Lex Model Building Service",
26+
"contributor": "",
27+
"description": "Lex now supports the en-IN locale"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon EC2 Container Service",
32+
"contributor": "",
33+
"description": "Documentation updates for support of awsvpc mode on Windows."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS IoT SiteWise",
38+
"contributor": "",
39+
"description": "Update the default endpoint for the APIs used to manage asset models, assets, gateways, tags, and account configurations. If you have firewalls with strict egress rules, configure the rules to grant you access to api.iotsitewise.[region].amazonaws.com or api.iotsitewise.[cn-region].amazonaws.com.cn."
40+
}
41+
]
42+
}

‎CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
# __2.16.103__ __2021-07-15__
2+
## __AWS IoT SiteWise__
3+
- ### Features
4+
- Update the default endpoint for the APIs used to manage asset models, assets, gateways, tags, and account configurations. If you have firewalls with strict egress rules, configure the rules to grant you access to api.iotsitewise.[region].amazonaws.com or api.iotsitewise.[cn-region].amazonaws.com.cn.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Add support for marshalling lists of strings in HTTP headers
9+
10+
## __Amazon Cognito Identity Provider__
11+
- ### Features
12+
- Documentation updates for cognito-idp
13+
14+
## __Amazon EC2 Container Service__
15+
- ### Features
16+
- Documentation updates for support of awsvpc mode on Windows.
17+
18+
## __Amazon Elastic Compute Cloud__
19+
- ### Features
20+
- This feature enables customers to specify weekly recurring time window(s) for scheduled events that reboot, stop or terminate EC2 instances.
21+
22+
## __Amazon Lex Model Building Service__
23+
- ### Features
24+
- Lex now supports the en-IN locale
25+
126
# __2.16.102__ __2021-07-14__
227
## __AWS Certificate Manager__
328
- ### 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.16.102</version>
55+
<version>2.16.103</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.16.102</version>
89+
<version>2.16.103</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.16.102</version>
94+
<version>2.16.103</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.16.102</version>
106+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
20+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
20+
<version>2.16.103</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.16.102</version>
24+
<version>2.16.103</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.16.102</version>
25+
<version>2.16.103</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.16.102</version>
24+
<version>2.16.103</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.16.102</version>
25+
<version>2.16.103</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.16.102</version>
24+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
25+
<version>2.16.103</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.16.102</version>
25+
<version>2.16.103</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.16.102</version>
8+
<version>2.16.103</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.16.102</version>
24+
<version>2.16.103</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.16.102</version>
25+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</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.16.102</version>
23+
<version>2.16.103</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@
1515

1616
package software.amazon.awssdk.protocols.json.internal.marshall;
1717

18+
import static software.amazon.awssdk.utils.CollectionUtils.isNullOrEmpty;
19+
1820
import java.nio.charset.StandardCharsets;
1921
import java.time.Instant;
22+
import java.util.List;
2023
import software.amazon.awssdk.annotations.SdkInternalApi;
2124
import software.amazon.awssdk.core.SdkField;
25+
import software.amazon.awssdk.core.protocol.MarshallLocation;
2226
import software.amazon.awssdk.core.traits.JsonValueTrait;
27+
import software.amazon.awssdk.core.traits.ListTrait;
2328
import software.amazon.awssdk.protocols.core.ValueToStringConverter;
2429
import software.amazon.awssdk.utils.BinaryUtils;
2530

@@ -45,6 +50,19 @@ public final class HeaderMarshaller {
4550
public static final JsonMarshaller<Instant> INSTANT
4651
= new SimpleHeaderMarshaller<>(JsonProtocolMarshaller.INSTANT_VALUE_TO_STRING);
4752

53+
public static final JsonMarshaller<List<?>> LIST = (list, context, paramName, sdkField) -> {
54+
// Null or empty lists cannot be meaningfully (or safely) represented in an HTTP header message since header-fields must
55+
// typically have a non-empty field-value. https://datatracker.ietf.org/doc/html/rfc7230#section-3.2
56+
if (isNullOrEmpty(list)) {
57+
return;
58+
}
59+
SdkField memberFieldInfo = sdkField.getRequiredTrait(ListTrait.class).memberFieldInfo();
60+
for (Object listValue : list) {
61+
JsonMarshaller marshaller = context.marshallerRegistry().getMarshaller(MarshallLocation.HEADER, listValue);
62+
marshaller.marshall(listValue, context, paramName, memberFieldInfo);
63+
}
64+
};
65+
4866
private HeaderMarshaller() {
4967
}
5068

@@ -58,8 +76,7 @@ private SimpleHeaderMarshaller(ValueToStringConverter.ValueToString<T> converter
5876

5977
@Override
6078
public void marshall(T val, JsonMarshallerContext context, String paramName, SdkField<T> sdkField) {
61-
context.request().putHeader(paramName, converter.convert(val, sdkField));
79+
context.request().appendHeader(paramName, converter.convert(val, sdkField));
6280
}
6381
}
64-
6582
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ private static JsonMarshallerRegistry createMarshallerRegistry() {
110110
.headerMarshaller(MarshallingType.FLOAT, HeaderMarshaller.FLOAT)
111111
.headerMarshaller(MarshallingType.BOOLEAN, HeaderMarshaller.BOOLEAN)
112112
.headerMarshaller(MarshallingType.INSTANT, HeaderMarshaller.INSTANT)
113+
.headerMarshaller(MarshallingType.LIST, HeaderMarshaller.LIST)
113114
.headerMarshaller(MarshallingType.NULL, JsonMarshaller.NULL)
114115

115116
.queryParamMarshaller(MarshallingType.STRING, QueryParamMarshaller.STRING)

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515

1616
package software.amazon.awssdk.protocols.json.internal.unmarshall;
1717

18+
import static java.util.stream.Collectors.toList;
19+
1820
import java.nio.charset.StandardCharsets;
1921
import java.time.Instant;
22+
import java.util.List;
2023
import software.amazon.awssdk.annotations.SdkInternalApi;
2124
import software.amazon.awssdk.core.SdkField;
2225
import software.amazon.awssdk.core.traits.JsonValueTrait;
2326
import software.amazon.awssdk.protocols.core.StringToValueConverter;
2427
import software.amazon.awssdk.protocols.json.internal.dom.SdkJsonNode;
2528
import software.amazon.awssdk.utils.BinaryUtils;
29+
import software.amazon.awssdk.utils.http.SdkHttpUtils;
2630

2731
/**
2832
* Header unmarshallers for all the simple types we support.
@@ -39,6 +43,11 @@ final class HeaderUnmarshaller {
3943
public static final JsonUnmarshaller<Boolean> BOOLEAN = new SimpleHeaderUnmarshaller<>(StringToValueConverter.TO_BOOLEAN);
4044
public static final JsonUnmarshaller<Float> FLOAT = new SimpleHeaderUnmarshaller<>(StringToValueConverter.TO_FLOAT);
4145

46+
// Only supports string value type
47+
public static final JsonUnmarshaller<List<?>> LIST = (context, jsonContent, field) -> {
48+
return SdkHttpUtils.allMatchingHeaders(context.response().headers(), field.locationName()).collect(toList());
49+
};
50+
4251
private HeaderUnmarshaller() {
4352
}
4453

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ private static JsonUnmarshallerRegistry createUnmarshallerRegistry(
8282
.headerUnmarshaller(MarshallingType.BOOLEAN, HeaderUnmarshaller.BOOLEAN)
8383
.headerUnmarshaller(MarshallingType.INSTANT, HeaderUnmarshaller.createInstantHeaderUnmarshaller(instantStringToValue))
8484
.headerUnmarshaller(MarshallingType.FLOAT, HeaderUnmarshaller.FLOAT)
85+
.headerUnmarshaller(MarshallingType.LIST, HeaderUnmarshaller.LIST)
8586

8687
.payloadUnmarshaller(MarshallingType.STRING, new SimpleTypeJsonUnmarshaller<>(StringToValueConverter.TO_STRING))
8788
.payloadUnmarshaller(MarshallingType.INTEGER, new SimpleTypeJsonUnmarshaller<>(StringToValueConverter.TO_INTEGER))

0 commit comments

Comments
 (0)