Skip to content

Commit 2abb20d

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1276 from aws/staging/874785a8-be94-4367-8c71-5c7e13f7f9c9
Pull request: release <- staging/874785a8-be94-4367-8c71-5c7e13f7f9c9
2 parents 9b78ecf + cd4d5f1 commit 2abb20d

File tree

360 files changed

+667
-332
lines changed

Some content is hidden

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

360 files changed

+667
-332
lines changed

‎.changes/2.16.44.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": "2.16.44",
3+
"date": "2021-04-19",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "duy310",
9+
"description": "Added support for short type in Code generator."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Updated service endpoint metadata."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Cost Explorer Service",
20+
"contributor": "",
21+
"description": "Adding support for Sagemaker savings plans in GetSavingsPlansPurchaseRecommendation API"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Savings Plans",
26+
"contributor": "",
27+
"description": "Added support for Amazon SageMaker in Machine Learning Savings Plans"
28+
}
29+
]
30+
}

‎.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: maven
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
# __2.16.44__ __2021-04-19__
2+
## __AWS Cost Explorer Service__
3+
- ### Features
4+
- Adding support for Sagemaker savings plans in GetSavingsPlansPurchaseRecommendation API
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Added support for short type in Code generator.
9+
- Contributed by: [@duy310](https://github.com/duy310)
10+
- Updated service endpoint metadata.
11+
12+
## __AWS Savings Plans__
13+
- ### Features
14+
- Added support for Amazon SageMaker in Machine Learning Savings Plans
15+
16+
## __Contributors__
17+
Special thanks to the following contributors to this release:
18+
19+
[@duy310](https://github.com/duy310)
120
# __2.16.43__ __2021-04-15__
221
## __AWS Database Migration Service__
322
- ### 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.43</version>
55+
<version>2.16.44</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.43</version>
89+
<version>2.16.44</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.16.43</version>
94+
<version>2.16.44</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.43</version>
106+
<version>2.16.44</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.43</version>
23+
<version>2.16.44</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.43</version>
23+
<version>2.16.44</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.43</version>
23+
<version>2.16.44</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.43</version>
23+
<version>2.16.44</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.43</version>
20+
<version>2.16.44</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.43</version>
23+
<version>2.16.44</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.43</version>
20+
<version>2.16.44</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.43</version>
24+
<version>2.16.44</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.43</version>
25+
<version>2.16.44</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.43</version>
24+
<version>2.16.44</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.43</version>
25+
<version>2.16.44</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.43</version>
24+
<version>2.16.44</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/internal/TypeUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public static final class TypeKey {
8383
MARSHALLING_TYPE_MAPPINGS.put("Boolean", "BOOLEAN");
8484
MARSHALLING_TYPE_MAPPINGS.put("BigDecimal", "BIG_DECIMAL");
8585
MARSHALLING_TYPE_MAPPINGS.put("InputStream", "STREAM");
86+
MARSHALLING_TYPE_MAPPINGS.put("Short", "SHORT");
8687
MARSHALLING_TYPE_MAPPINGS.put(null, "NULL");
8788
}
8889

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ public final class AllTypesRequest extends JsonProtocolTestsRequest implements
6363
.memberName("LongMember").getter(getter(AllTypesRequest::longMember)).setter(setter(Builder::longMember))
6464
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
6565

66+
private static final SdkField<Short> SHORT_MEMBER_FIELD = SdkField.<Short> builder(MarshallingType.SHORT)
67+
.memberName("ShortMember").getter(getter(AllTypesRequest::shortMember)).setter(setter(Builder::shortMember))
68+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ShortMember").build()).build();
69+
6670
private static final SdkField<List<String>> SIMPLE_LIST_FIELD = SdkField
6771
.<List<String>> builder(MarshallingType.LIST)
6872
.memberName("SimpleList")
@@ -422,7 +426,7 @@ SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
422426

423427
private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD,
424428
INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
425-
SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
429+
SHORT_MEMBER_FIELD, SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
426430
LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, LIST_OF_MAP_OF_STRING_TO_STRUCT_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD,
427431
MAP_OF_STRING_TO_STRING_FIELD, MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD,
428432
MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD,
@@ -443,6 +447,8 @@ SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
443447

444448
private final Long longMember;
445449

450+
private final Short shortMember;
451+
446452
private final List<String> simpleList;
447453

448454
private final List<String> listOfEnums;
@@ -503,6 +509,7 @@ private AllTypesRequest(BuilderImpl builder) {
503509
this.floatMember = builder.floatMember;
504510
this.doubleMember = builder.doubleMember;
505511
this.longMember = builder.longMember;
512+
this.shortMember = builder.shortMember;
506513
this.simpleList = builder.simpleList;
507514
this.listOfEnums = builder.listOfEnums;
508515
this.listOfMaps = builder.listOfMaps;
@@ -585,6 +592,15 @@ public final Long longMember() {
585592
return longMember;
586593
}
587594

595+
/**
596+
* Returns the value of the ShortMember property for this object.
597+
*
598+
* @return The value of the ShortMember property for this object.
599+
*/
600+
public final Short shortMember() {
601+
return shortMember;
602+
}
603+
588604
/**
589605
* Returns true if the SimpleList property was specified by the sender (it may be empty), or false if the sender did
590606
* not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
@@ -1232,6 +1248,7 @@ public final int hashCode() {
12321248
hashCode = 31 * hashCode + Objects.hashCode(floatMember());
12331249
hashCode = 31 * hashCode + Objects.hashCode(doubleMember());
12341250
hashCode = 31 * hashCode + Objects.hashCode(longMember());
1251+
hashCode = 31 * hashCode + Objects.hashCode(shortMember());
12351252
hashCode = 31 * hashCode + Objects.hashCode(hasSimpleList() ? simpleList() : null);
12361253
hashCode = 31 * hashCode + Objects.hashCode(hasListOfEnums() ? listOfEnumsAsStrings() : null);
12371254
hashCode = 31 * hashCode + Objects.hashCode(hasListOfMaps() ? listOfMaps() : null);
@@ -1282,6 +1299,7 @@ public final boolean equalsBySdkFields(Object obj) {
12821299
return Objects.equals(stringMember(), other.stringMember()) && Objects.equals(integerMember(), other.integerMember())
12831300
&& Objects.equals(booleanMember(), other.booleanMember()) && Objects.equals(floatMember(), other.floatMember())
12841301
&& Objects.equals(doubleMember(), other.doubleMember()) && Objects.equals(longMember(), other.longMember())
1302+
&& Objects.equals(shortMember(), other.shortMember())
12851303
&& hasSimpleList() == other.hasSimpleList() && Objects.equals(simpleList(), other.simpleList())
12861304
&& hasListOfEnums() == other.hasListOfEnums()
12871305
&& Objects.equals(listOfEnumsAsStrings(), other.listOfEnumsAsStrings())
@@ -1336,6 +1354,7 @@ public final String toString() {
13361354
.add("FloatMember", floatMember())
13371355
.add("DoubleMember", doubleMember())
13381356
.add("LongMember", longMember())
1357+
.add("ShortMember", shortMember())
13391358
.add("SimpleList", hasSimpleList() ? simpleList() : null)
13401359
.add("ListOfEnums", hasListOfEnums() ? listOfEnumsAsStrings() : null)
13411360
.add("ListOfMaps", hasListOfMaps() ? listOfMaps() : null)
@@ -1375,6 +1394,8 @@ public final <T> Optional<T> getValueForField(String fieldName, Class<T> clazz)
13751394
return Optional.ofNullable(clazz.cast(doubleMember()));
13761395
case "LongMember":
13771396
return Optional.ofNullable(clazz.cast(longMember()));
1397+
case "ShortMember":
1398+
return Optional.ofNullable(clazz.cast(shortMember()));
13781399
case "SimpleList":
13791400
return Optional.ofNullable(clazz.cast(simpleList()));
13801401
case "ListOfEnums":
@@ -1500,6 +1521,15 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
15001521
*/
15011522
Builder longMember(Long longMember);
15021523

1524+
/**
1525+
* Sets the value of the ShortMember property for this object.
1526+
*
1527+
* @param shortMember
1528+
* The new value for the ShortMember property for this object.
1529+
* @return Returns a reference to this object so that method calls can be chained together.
1530+
*/
1531+
Builder shortMember(Short shortMember);
1532+
15031533
/**
15041534
* Sets the value of the SimpleList property for this object.
15051535
*
@@ -2027,6 +2057,8 @@ static final class BuilderImpl extends JsonProtocolTestsRequest.BuilderImpl impl
20272057

20282058
private Long longMember;
20292059

2060+
private Short shortMember;
2061+
20302062
private List<String> simpleList = DefaultSdkAutoConstructList.getInstance();
20312063

20322064
private List<String> listOfEnums = DefaultSdkAutoConstructList.getInstance();
@@ -2090,6 +2122,7 @@ private BuilderImpl(AllTypesRequest model) {
20902122
floatMember(model.floatMember);
20912123
doubleMember(model.doubleMember);
20922124
longMember(model.longMember);
2125+
shortMember(model.shortMember);
20932126
simpleList(model.simpleList);
20942127
listOfEnumsWithStrings(model.listOfEnums);
20952128
listOfMaps(model.listOfMaps);
@@ -2202,6 +2235,20 @@ public final void setLongMember(Long longMember) {
22022235
this.longMember = longMember;
22032236
}
22042237

2238+
public final Short getShortMember() {
2239+
return shortMember;
2240+
}
2241+
2242+
@Override
2243+
public final Builder shortMember(Short shortMember) {
2244+
this.shortMember = shortMember;
2245+
return this;
2246+
}
2247+
2248+
public final void setShortMember(Short shortMember) {
2249+
this.shortMember = shortMember;
2250+
}
2251+
22052252
public final Collection<String> getSimpleList() {
22062253
if (simpleList instanceof SdkAutoConstructList) {
22072254
return null;

0 commit comments

Comments
 (0)