Skip to content

Commit 295f4ba

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #814 from aws/staging/b8449d8e-6506-4714-a7fa-7cf3fe288203
Pull request: release <- staging/b8449d8e-6506-4714-a7fa-7cf3fe288203
2 parents f474ad5 + 05aaf2c commit 295f4ba

File tree

277 files changed

+904
-378
lines changed

Some content is hidden

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

277 files changed

+904
-378
lines changed

‎.changes/2.13.3.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"version": "2.13.3",
3+
"date": "2020-04-24",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Data Lifecycle Manager",
8+
"description": "Enable 1hour frequency in the schedule creation for Data LifeCycle Manager."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "AWS SDK for Java v2",
13+
"description": "Updated service endpoint metadata."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "AWS IoT",
18+
"description": "This release adds a new exception type to the AWS IoT SetV2LoggingLevel API."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "Amazon Elastic Inference",
23+
"description": "This feature allows customers to describe the accelerator types and offerings on any region where Elastic Inference is available."
24+
},
25+
{
26+
"type": "bugfix",
27+
"category": "AWS SDK for Java v2",
28+
"description": "Fixed bean-style setter names on serializable builders to match bean-style getter names."
29+
}
30+
]
31+
}

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# __2.13.3__ __2020-04-24__
2+
## __AWS IoT__
3+
- ### Features
4+
- This release adds a new exception type to the AWS IoT SetV2LoggingLevel API.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated service endpoint metadata.
9+
10+
- ### Bugfixes
11+
- Fixed bean-style setter names on serializable builders to match bean-style getter names.
12+
13+
## __Amazon Data Lifecycle Manager__
14+
- ### Features
15+
- Enable 1hour frequency in the schedule creation for Data LifeCycle Manager.
16+
17+
## __Amazon Elastic Inference__
18+
- ### Features
19+
- This feature allows customers to describe the accelerator types and offerings on any region where Elastic Inference is available.
20+
121
# __2.13.2__ __2020-04-23__
222
## __AWS Elemental MediaPackage VOD__
323
- ### 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.13.2</version>
52+
<version>2.13.3</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.13.2</version>
86+
<version>2.13.3</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.13.2</version>
91+
<version>2.13.3</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.13.2</version>
103+
<version>2.13.3</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.13.2</version>
23+
<version>2.13.3</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.13.2</version>
23+
<version>2.13.3</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.13.2</version>
20+
<version>2.13.3</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.13.2</version>
23+
<version>2.13.3</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.13.2</version>
20+
<version>2.13.3</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.13.2</version>
24+
<version>2.13.3</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.13.2</version>
25+
<version>2.13.3</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.13.2</version>
24+
<version>2.13.3</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.13.2</version>
25+
<version>2.13.3</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.13.2</version>
24+
<version>2.13.3</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,20 @@ public String getExistenceCheckMethodName(String memberName, Shape parentShape)
299299

300300
@Override
301301
public String getBeanStyleGetterMethodName(String memberName, Shape parentShape, Shape c2jShape) {
302-
String fluentGetterMethodName = getFluentGetterMethodName(memberName, parentShape, c2jShape);
302+
String fluentGetterMethodName;
303+
if (Utils.isOrContainsEnumShape(c2jShape, serviceModel.getShapes())) {
304+
// Use the enum (modeled) name for bean-style getters
305+
fluentGetterMethodName = getFluentEnumGetterMethodName(memberName, parentShape, c2jShape);
306+
} else {
307+
fluentGetterMethodName = getFluentGetterMethodName(memberName, parentShape, c2jShape);
308+
}
303309
return String.format("get%s", Utils.capitalize(fluentGetterMethodName));
304310
}
305311

306312
@Override
307313
public String getBeanStyleSetterMethodName(String memberName, Shape parentShape, Shape c2jShape) {
308-
String fluentSetterMethodName = getFluentSetterMethodName(memberName, parentShape, c2jShape);
309-
return String.format("set%s", Utils.capitalize(fluentSetterMethodName));
314+
String beanStyleGetter = getBeanStyleGetterMethodName(memberName, parentShape, c2jShape);
315+
return String.format("set%s", beanStyleGetter.substring("get".length()));
310316
}
311317

312318
@Override

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2042,7 +2042,7 @@ public final void setSimpleList(Collection<String> simpleList) {
20422042
this.simpleList = ListOfStringsCopier.copy(simpleList);
20432043
}
20442044

2045-
public final Collection<String> getListOfEnumsAsStrings() {
2045+
public final Collection<String> getListOfEnums() {
20462046
return listOfEnums;
20472047
}
20482048

@@ -2072,7 +2072,7 @@ public final Builder listOfEnums(EnumType... listOfEnums) {
20722072
return this;
20732073
}
20742074

2075-
public final void setListOfEnumsWithStrings(Collection<String> listOfEnums) {
2075+
public final void setListOfEnums(Collection<String> listOfEnums) {
20762076
this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);
20772077
}
20782078

@@ -2127,7 +2127,7 @@ public final void setListOfStructs(Collection<SimpleStruct.BuilderImpl> listOfSt
21272127
this.listOfStructs = ListOfSimpleStructsCopier.copyFromBuilder(listOfStructs);
21282128
}
21292129

2130-
public final Collection<? extends Map<String, String>> getListOfMapOfEnumToStringAsStrings() {
2130+
public final Collection<? extends Map<String, String>> getListOfMapOfEnumToString() {
21312131
return listOfMapOfEnumToString;
21322132
}
21332133

@@ -2144,7 +2144,7 @@ public final Builder listOfMapOfEnumToStringWithStrings(Map<String, String>... l
21442144
return this;
21452145
}
21462146

2147-
public final void setListOfMapOfEnumToStringWithStrings(Collection<? extends Map<String, String>> listOfMapOfEnumToString) {
2147+
public final void setListOfMapOfEnumToString(Collection<? extends Map<String, String>> listOfMapOfEnumToString) {
21482148
this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString);
21492149
}
21502150

@@ -2191,7 +2191,7 @@ public final void setMapOfStringToSimpleStruct(Map<String, SimpleStruct.BuilderI
21912191
this.mapOfStringToSimpleStruct = MapOfStringToSimpleStructCopier.copyFromBuilder(mapOfStringToSimpleStruct);
21922192
}
21932193

2194-
public final Map<String, String> getMapOfEnumToEnumAsStrings() {
2194+
public final Map<String, String> getMapOfEnumToEnum() {
21952195
return mapOfEnumToEnum;
21962196
}
21972197

@@ -2207,11 +2207,11 @@ public final Builder mapOfEnumToEnum(Map<EnumType, EnumType> mapOfEnumToEnum) {
22072207
return this;
22082208
}
22092209

2210-
public final void setMapOfEnumToEnumWithStrings(Map<String, String> mapOfEnumToEnum) {
2210+
public final void setMapOfEnumToEnum(Map<String, String> mapOfEnumToEnum) {
22112211
this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum);
22122212
}
22132213

2214-
public final Map<String, String> getMapOfEnumToStringAsStrings() {
2214+
public final Map<String, String> getMapOfEnumToString() {
22152215
return mapOfEnumToString;
22162216
}
22172217

@@ -2227,11 +2227,11 @@ public final Builder mapOfEnumToString(Map<EnumType, String> mapOfEnumToString)
22272227
return this;
22282228
}
22292229

2230-
public final void setMapOfEnumToStringWithStrings(Map<String, String> mapOfEnumToString) {
2230+
public final void setMapOfEnumToString(Map<String, String> mapOfEnumToString) {
22312231
this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString);
22322232
}
22332233

2234-
public final Map<String, String> getMapOfStringToEnumAsStrings() {
2234+
public final Map<String, String> getMapOfStringToEnum() {
22352235
return mapOfStringToEnum;
22362236
}
22372237

@@ -2247,11 +2247,11 @@ public final Builder mapOfStringToEnum(Map<String, EnumType> mapOfStringToEnum)
22472247
return this;
22482248
}
22492249

2250-
public final void setMapOfStringToEnumWithStrings(Map<String, String> mapOfStringToEnum) {
2250+
public final void setMapOfStringToEnum(Map<String, String> mapOfStringToEnum) {
22512251
this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum);
22522252
}
22532253

2254-
public final Map<String, SimpleStruct.Builder> getMapOfEnumToSimpleStructAsStrings() {
2254+
public final Map<String, SimpleStruct.Builder> getMapOfEnumToSimpleStruct() {
22552255
return mapOfEnumToSimpleStruct != null ? CollectionUtils.mapValues(mapOfEnumToSimpleStruct, SimpleStruct::toBuilder)
22562256
: null;
22572257
}
@@ -2268,11 +2268,11 @@ public final Builder mapOfEnumToSimpleStruct(Map<EnumType, SimpleStruct> mapOfEn
22682268
return this;
22692269
}
22702270

2271-
public final void setMapOfEnumToSimpleStructWithStrings(Map<String, SimpleStruct.BuilderImpl> mapOfEnumToSimpleStruct) {
2271+
public final void setMapOfEnumToSimpleStruct(Map<String, SimpleStruct.BuilderImpl> mapOfEnumToSimpleStruct) {
22722272
this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copyFromBuilder(mapOfEnumToSimpleStruct);
22732273
}
22742274

2275-
public final Map<String, ? extends Collection<String>> getMapOfEnumToListOfEnumsAsStrings() {
2275+
public final Map<String, ? extends Collection<String>> getMapOfEnumToListOfEnums() {
22762276
return mapOfEnumToListOfEnums;
22772277
}
22782278

@@ -2288,11 +2288,11 @@ public final Builder mapOfEnumToListOfEnums(Map<EnumType, ? extends Collection<E
22882288
return this;
22892289
}
22902290

2291-
public final void setMapOfEnumToListOfEnumsWithStrings(Map<String, ? extends Collection<String>> mapOfEnumToListOfEnums) {
2291+
public final void setMapOfEnumToListOfEnums(Map<String, ? extends Collection<String>> mapOfEnumToListOfEnums) {
22922292
this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copy(mapOfEnumToListOfEnums);
22932293
}
22942294

2295-
public final Map<String, Map<String, String>> getMapOfEnumToMapOfStringToEnumAsStrings() {
2295+
public final Map<String, Map<String, String>> getMapOfEnumToMapOfStringToEnum() {
22962296
return mapOfEnumToMapOfStringToEnum;
22972297
}
22982298

@@ -2308,7 +2308,7 @@ public final Builder mapOfEnumToMapOfStringToEnum(Map<EnumType, Map<String, Enum
23082308
return this;
23092309
}
23102310

2311-
public final void setMapOfEnumToMapOfStringToEnumWithStrings(Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnum) {
2311+
public final void setMapOfEnumToMapOfStringToEnum(Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnum) {
23122312
this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copy(mapOfEnumToMapOfStringToEnum);
23132313
}
23142314

@@ -2450,7 +2450,7 @@ public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polym
24502450
: null;
24512451
}
24522452

2453-
public final String getEnumTypeAsString() {
2453+
public final String getEnumType() {
24542454
return enumType;
24552455
}
24562456

0 commit comments

Comments
 (0)