Skip to content

Commit 129d2e9

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1121 from aws/staging/98273e07-0109-4612-95e8-35623eba0ef6
Pull request: release <- staging/98273e07-0109-4612-95e8-35623eba0ef6
2 parents 6e7b99e + 8a80307 commit 129d2e9

File tree

328 files changed

+1132
-393
lines changed

Some content is hidden

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

328 files changed

+1132
-393
lines changed

‎.changes/2.15.52.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2.15.52",
3+
"date": "2020-12-22",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon ElastiCache",
8+
"contributor": "",
9+
"description": "Documentation updates for elasticache"
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": "Amazon Connect Service",
20+
"contributor": "",
21+
"description": "This release adds support for quick connects. For details, see the Release Notes in the Amazon Connect Administrator Guide."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Glue",
26+
"contributor": "",
27+
"description": "AWS Glue Find Matches machine learning transforms now support column importance scores."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Simple Systems Manager (SSM)",
32+
"contributor": "",
33+
"description": "SSM Maintenance Window support for registering/updating maintenance window tasks without targets."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS Cost Explorer Service",
38+
"contributor": "",
39+
"description": "This release adds additional metadata that may be applicable to the Rightsizing Recommendations."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "AWS IoT Wireless",
44+
"contributor": "",
45+
"description": "Adding the ability to use Fingerprint in GetPartnerAccount and ListPartnerAccounts API responses to protect sensitive customer account information."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Relational Database Service",
50+
"contributor": "",
51+
"description": "Adds customer-owned IP address (CoIP) support to Amazon RDS on AWS Outposts."
52+
}
53+
]
54+
}

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
# __2.15.52__ __2020-12-22__
2+
## __AWS Cost Explorer Service__
3+
- ### Features
4+
- This release adds additional metadata that may be applicable to the Rightsizing Recommendations.
5+
6+
## __AWS Glue__
7+
- ### Features
8+
- AWS Glue Find Matches machine learning transforms now support column importance scores.
9+
10+
## __AWS IoT Wireless__
11+
- ### Features
12+
- Adding the ability to use Fingerprint in GetPartnerAccount and ListPartnerAccounts API responses to protect sensitive customer account information.
13+
14+
## __AWS SDK for Java v2__
15+
- ### Features
16+
- Updated service endpoint metadata.
17+
18+
## __Amazon Connect Service__
19+
- ### Features
20+
- This release adds support for quick connects. For details, see the Release Notes in the Amazon Connect Administrator Guide.
21+
22+
## __Amazon ElastiCache__
23+
- ### Features
24+
- Documentation updates for elasticache
25+
26+
## __Amazon Relational Database Service__
27+
- ### Features
28+
- Adds customer-owned IP address (CoIP) support to Amazon RDS on AWS Outposts.
29+
30+
## __Amazon Simple Systems Manager (SSM)__
31+
- ### Features
32+
- SSM Maintenance Window support for registering/updating maintenance window tasks without targets.
33+
134
# __2.15.51__ __2020-12-21__
235
## __AWS Batch__
336
- ### 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.15.51</version>
52+
<version>2.15.52</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.15.51</version>
86+
<version>2.15.52</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.15.51</version>
91+
<version>2.15.52</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.15.51</version>
103+
<version>2.15.52</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.15.51</version>
23+
<version>2.15.52</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.15.51</version>
23+
<version>2.15.52</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.15.51</version>
20+
<version>2.15.52</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.15.51</version>
23+
<version>2.15.52</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.15.51</version>
20+
<version>2.15.52</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎buildspecs/release-to-maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ phases:
2020
if ! curl -f --head $SONATYPE_URL; then
2121
mkdir -p $CREDENTIALS
2222
aws s3 cp s3://aws-java-sdk-release-credentials/ $CREDENTIALS/ --recursive
23-
mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30
23+
mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30
2424
else
2525
echo "This version was already released."
2626
fi

‎buildspecs/update-master-from-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ phases:
2727
- POINT=$(echo $RELEASE_VERSION | cut -d'.' -f3)
2828
- NEW_VERSION_SNAPSHOT="$MAJOR.$MINOR.$((POINT + 1))-SNAPSHOT"
2929
- echo "New shapshot version - $NEW_VERSION_SNAPSHOT"
30+
- PREVIOUS_RELEASE_VERSION="$MAJOR.$MINOR.$((POINT - 1))"
3031
-
3132
- git checkout master
3233
- git merge public/release --no-edit
3334
-
3435
- mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
3536
- sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
37+
- sed -i -E "s/(<awsjavasdk.previous.version>).+(<awsjavasdk.previous.version>)/\1$PREVIOUS_RELEASE_VERSION\2/" pom.xml
3638
-
3739
- 'git commit -am "Update to next snapshot version: $NEW_VERSION_SNAPSHOT"'
3840
-

‎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.15.51</version>
24+
<version>2.15.52</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.15.51</version>
25+
<version>2.15.52</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.15.51</version>
24+
<version>2.15.52</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.15.51</version>
25+
<version>2.15.52</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.15.51</version>
24+
<version>2.15.52</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderImplSpec.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class EventStreamVisitorBuilderImplSpec extends EventStreamVisitorBuilder
4646
private final EventStreamSpecHelper eventStreamSpecHelper;
4747

4848
public EventStreamVisitorBuilderImplSpec(GeneratorTaskParams params, OperationModel operationModel) {
49-
super(params.getPoetExtensions(), operationModel);
49+
super(params.getPoetExtensions(), params.getModel(), operationModel);
5050
this.intermediateModel = params.getModel();
5151
this.poetExt = params.getPoetExtensions();
5252
this.opModel = operationModel;
@@ -108,7 +108,7 @@ protected MethodSpec.Builder applyVisitSubTypeMethodSpecUpdates(TypeSpec.Builder
108108
MemberModel event) {
109109
ClassName eventSubType = poetExt.getModelClass(event.getShape().getShapeName());
110110
TypeName eventConsumerType = consumerType(eventSubType);
111-
FieldSpec consumerField = FieldSpec.builder(eventConsumerType, eventConsumerName(event))
111+
FieldSpec consumerField = FieldSpec.builder(eventConsumerType, eventStreamSpecHelper.eventConsumerName(event))
112112
.addModifiers(Modifier.PRIVATE, Modifier.FINAL)
113113
.build();
114114
typeBuilder.addField(consumerField);
@@ -138,7 +138,7 @@ protected MethodSpec.Builder applyOnSubTypeMethodSpecUpdates(TypeSpec.Builder ty
138138
MemberModel event) {
139139
ClassName eventSubType = poetExt.getModelClass(event.getShape().getShapeName());
140140
TypeName eventConsumerType = consumerType(eventSubType);
141-
FieldSpec consumerField = FieldSpec.builder(eventConsumerType, eventConsumerName(event))
141+
FieldSpec consumerField = FieldSpec.builder(eventConsumerType, eventStreamSpecHelper.eventConsumerName(event))
142142
.addModifiers(Modifier.PRIVATE)
143143
.build();
144144
typeBuilder.addField(consumerField);

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderInterfaceSpec.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
import java.util.function.Consumer;
2424
import javax.lang.model.element.Modifier;
2525
import software.amazon.awssdk.codegen.docs.DocumentationBuilder;
26+
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2627
import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
2728
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
2829
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
2930
import software.amazon.awssdk.codegen.poet.ClassSpec;
3031
import software.amazon.awssdk.codegen.poet.PoetExtensions;
3132
import software.amazon.awssdk.codegen.poet.PoetUtils;
32-
import software.amazon.awssdk.utils.internal.CodegenNamingUtils;
33+
import software.amazon.awssdk.codegen.poet.model.EventStreamSpecHelper;
3334

3435
/**
3536
* Spec for builder interface for visitor.
@@ -39,12 +40,16 @@ public class EventStreamVisitorBuilderInterfaceSpec implements ClassSpec {
3940
private final OperationModel operationModel;
4041
private final ShapeModel eventStreamShape;
4142
private final ClassName visitorBuilderType;
43+
private final EventStreamSpecHelper eventStreamSpecHelper;
4244

43-
EventStreamVisitorBuilderInterfaceSpec(PoetExtensions poetExt, OperationModel opModel) {
45+
EventStreamVisitorBuilderInterfaceSpec(PoetExtensions poetExt,
46+
IntermediateModel intermediateModel,
47+
OperationModel opModel) {
4448
this.poetExt = poetExt;
4549
this.operationModel = opModel;
4650
this.eventStreamShape = EventStreamUtils.getEventStreamInResponse(operationModel.getOutputShape());
4751
this.visitorBuilderType = poetExt.eventStreamResponseHandlerVisitorBuilderType(opModel);
52+
this.eventStreamSpecHelper = new EventStreamSpecHelper(eventStreamShape, intermediateModel);
4853
}
4954

5055
@Override
@@ -121,13 +126,9 @@ protected MethodSpec.Builder applyOnSubTypeMethodSpecUpdates(TypeSpec.Builder ty
121126
private MethodSpec.Builder createOnSubTypeMethodSpec(MemberModel event) {
122127
ClassName eventSubType = poetExt.getModelClass(event.getShape().getShapeName());
123128
ParameterizedTypeName eventConsumerType = ParameterizedTypeName.get(ClassName.get(Consumer.class), eventSubType);
124-
return MethodSpec.methodBuilder(eventConsumerName(event))
129+
return MethodSpec.methodBuilder(eventStreamSpecHelper.eventConsumerName(event))
125130
.addModifiers(Modifier.PUBLIC)
126131
.addParameter(ParameterSpec.builder(eventConsumerType, "c").build())
127132
.returns(visitorBuilderType);
128133
}
129-
130-
protected final String eventConsumerName(MemberModel event) {
131-
return "on" + CodegenNamingUtils.pascalCase(event.getName());
132-
}
133134
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorInterfaceSpec.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@
3535
*/
3636
class EventStreamVisitorInterfaceSpec implements ClassSpec {
3737
private final PoetExtensions poetExt;
38+
private final IntermediateModel intermediateModel;
3839
private final OperationModel operationModel;
3940
private final ShapeModel eventStreamShape;
4041
private final ClassName eventStreamBaseClass;
4142
private final EventStreamSpecHelper eventStreamSpecHelper;
4243

4344
EventStreamVisitorInterfaceSpec(IntermediateModel intermediateModel, PoetExtensions poetExt, OperationModel operationModel) {
4445
this.poetExt = poetExt;
46+
this.intermediateModel = intermediateModel;
4547
this.operationModel = operationModel;
4648
this.eventStreamShape = EventStreamUtils.getEventStreamInResponse(operationModel.getOutputShape());
4749
this.eventStreamBaseClass = poetExt.getModelClassFromShape(eventStreamShape);
@@ -72,7 +74,8 @@ protected TypeSpec.Builder createTypeSpec() {
7274
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
7375
.addJavadoc("Visitor for subtypes of {@link $T}.", eventStreamBaseClass)
7476
.addMethod(createBuilderMethodSpec())
75-
.addType(new EventStreamVisitorBuilderInterfaceSpec(poetExt, operationModel).poetSpec());
77+
.addType(new EventStreamVisitorBuilderInterfaceSpec(poetExt, intermediateModel, operationModel)
78+
.poetSpec());
7679
}
7780

7881
protected TypeSpec.Builder finalizeTypeSpec(TypeSpec.Builder builder) {

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/EventStreamSpecHelper.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,11 @@ public String eventTypeEnumValue(MemberModel eventModel) {
9696
public String eventBuilderMethodName(MemberModel eventModel) {
9797
return String.format("%sBuilder", StringUtils.uncapitalize(eventModel.getName()));
9898
}
99+
100+
public String eventConsumerName(MemberModel eventModel) {
101+
if (useLegacyGenerationScheme(eventModel)) {
102+
return "on" + eventModel.getShape().getShapeName();
103+
}
104+
return "on" + eventModel.getName();
105+
}
99106
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"createMethodParams": ["param1", "param2", "param3"]
1616
},
1717
"useLegacyEventGenerationScheme": {
18-
"EventStream": ["EventOne", "event-two"]
18+
"EventStream": ["EventOne", "event-two", "eventThree"]
1919
}
2020
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/service-2.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,10 @@
417417
},
418418
"secondEventOne": {
419419
"shape": "EventOne"
420+
},
421+
// Legacy generation uses shape name == event name
422+
"eventThree": {
423+
"shape": "LegacyEventThree"
420424
}
421425
},
422426
"eventstream": true
@@ -439,6 +443,15 @@
439443
},
440444
"event": true
441445
},
446+
"LegacyEventThree": {
447+
"type": "structure",
448+
"members": {
449+
"Baz": {
450+
"shape": "String"
451+
}
452+
},
453+
"event": true
454+
},
442455
"EventStreamOperationWithOnlyInputRequest": {
443456
"type": "structure",
444457
"required": [

0 commit comments

Comments
 (0)