Skip to content

Commit d09958f

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2145 from aws/staging/abec8754-2103-4749-adab-a43e14ffdfa9
Pull request: release <- staging/abec8754-2103-4749-adab-a43e14ffdfa9
2 parents db1b108 + 96e5f30 commit d09958f

File tree

393 files changed

+2009
-526
lines changed

Some content is hidden

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

393 files changed

+2009
-526
lines changed

‎.changes/2.17.274.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"version": "2.17.274",
3+
"date": "2022-09-14",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS Amplify UI Builder",
8+
"contributor": "",
9+
"description": "Amplify Studio UIBuilder is introducing forms functionality. Forms can be configured from Data Store models, JSON, or from scratch. These forms can then be generated in your project and used like any other React components."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "Amazon Elastic Compute Cloud",
14+
"contributor": "",
15+
"description": "This update introduces API operations to manage and create local gateway route tables, CoIP pools, and VIF group associations."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS SDK for Java v2",
20+
"contributor": "",
21+
"description": "Updated service endpoint metadata."
22+
}
23+
]
24+
}

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# __2.17.274__ __2022-09-14__
2+
## __AWS Amplify UI Builder__
3+
- ### Features
4+
- Amplify Studio UIBuilder is introducing forms functionality. Forms can be configured from Data Store models, JSON, or from scratch. These forms can then be generated in your project and used like any other React components.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated service endpoint metadata.
9+
10+
## __Amazon Elastic Compute Cloud__
11+
- ### Features
12+
- This update introduces API operations to manage and create local gateway route tables, CoIP pools, and VIF group associations.
13+
114
# __2.17.273__ __2022-09-13__
215
## __AWS SDK for Java v2__
316
- ### Features

‎README.md

+4-4
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.17.273</version>
55+
<version>2.17.274</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.17.273</version>
89+
<version>2.17.274</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.273</version>
94+
<version>2.17.274</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.17.273</version>
106+
<version>2.17.274</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

+1-1
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.17.273</version>
23+
<version>2.17.274</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

+1-1
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.17.273</version>
23+
<version>2.17.274</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

+1-1
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.17.273</version>
23+
<version>2.17.274</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

+1-1
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.17.273</version>
23+
<version>2.17.274</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

+1-1
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.17.273</version>
20+
<version>2.17.274</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

+1-1
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.17.273</version>
23+
<version>2.17.274</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

+1-1
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.17.273</version>
20+
<version>2.17.274</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎buildspecs/release-javadoc.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
version: 0.2
2-
2+
env:
3+
variables:
4+
JAVA_HOME: "/usr/lib/jvm/java-17-amazon-corretto/"
35
phases:
46
install:
5-
runtime-versions:
6-
java: "$JAVA_RUNTIME"
7-
87
commands:
8+
- apt-get update; apt-get install -y java-17-amazon-corretto-jdk
9+
- update-alternatives --auto javac
10+
- update-alternatives --auto java
911
- pip install awscli==1.19.34 --upgrade --user
1012

1113
pre_build:
@@ -16,7 +18,7 @@ phases:
1618
commands:
1719
- python ./scripts/doc_crosslinks/generate_cross_link_data.py --apiDefinitionsBasePath ./services/ --apiDefinitionsRelativeFilePath src/main/resources/codegen-resources/service-2.json --templateFilePath ./scripts/doc_crosslinks/crosslink_redirect.html --outputFilePath ./scripts/crosslink_redirect.html
1820
- mvn install -P quick -T1C
19-
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting'
21+
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test'
2022
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
2123
-
2224
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/

‎bundle/pom.xml

+1-1
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.17.273</version>
24+
<version>2.17.274</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

+1-1
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.17.273</version>
25+
<version>2.17.274</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

+1-1
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.17.273</version>
24+
<version>2.17.274</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

+1-1
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.17.273</version>
25+
<version>2.17.274</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

+1-1
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.17.273</version>
24+
<version>2.17.274</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -480,17 +480,18 @@ public String getDeprecatedSetterDocumentation() {
480480
+ LF;
481481
}
482482

483-
public String getDefaultConsumerFluentSetterDocumentation() {
483+
public String getDefaultConsumerFluentSetterDocumentation(String variableType) {
484484
return (StringUtils.isNotBlank(documentation) ? documentation : defaultSetter().replace("%s", name) + "\n")
485485
+ LF
486486
+ "This is a convenience method that creates an instance of the {@link "
487-
+ variable.getSimpleType()
487+
+ variableType
488488
+ ".Builder} avoiding the need to create one manually via {@link "
489-
+ variable.getSimpleType()
489+
+ variableType
490490
+ "#builder()}.\n"
491491
+ LF
492+
+ "<p>"
492493
+ "When the {@link Consumer} completes, {@link "
493-
+ variable.getSimpleType()
494+
+ variableType
494495
+ ".Builder#build()} is called immediately and its result is passed to {@link #"
495496
+ getFluentGetterMethodName()
496497
+ "("
@@ -500,14 +501,14 @@ public String getDefaultConsumerFluentSetterDocumentation() {
500501
+ "@param "
501502
+ variable.getVariableName()
502503
+ " a consumer that will call methods on {@link "
503-
+ variable.getSimpleType() + ".Builder}"
504+
+ variableType + ".Builder}"
504505
+ LF
505506
+ "@return " + stripHtmlTags(defaultFluentReturn())
506507
+ LF
507508
+ "@see #"
508509
+ getFluentSetterMethodName()
509510
+ "("
510-
+ variable.getSimpleType()
511+
+ variable.getVariableSetterType()
511512
+ ")";
512513
}
513514

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ public List<MethodSpec> fluentDeclarations(TypeName returnType) {
6363
.varargs(true)
6464
.build());
6565

66+
TypeName elementType = listElementType();
67+
6668
if (elementModel().hasBuilder()) {
6769
fluentDeclarations.add(fluentAbstractSetterDeclaration(ParameterSpec.builder(asConsumerBuilderArray(),
6870
fieldName())
6971
.build(), returnType)
70-
.varargs(true)
71-
.addJavadoc("$L", memberModel().getDefaultConsumerFluentSetterDocumentation())
72-
.build());
72+
.varargs(true)
73+
.addJavadoc("$L",
74+
memberModel().getDefaultConsumerFluentSetterDocumentation(
75+
elementType.toString()))
76+
.build());
7377
}
7478

7579
if (enumTypeInListMemberModel() != null) {

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,16 @@ private MethodSpec fluentEnumToStringSetter(TypeName returnType) {
150150
}
151151

152152
private MethodSpec fluentConsumerFluentSetter(TypeName returnType) {
153-
ClassName memberClass = poetExtensions.getModelClass(memberModel().getShape().getC2jName());
153+
MemberModel memberModel = memberModel();
154+
ClassName memberClass = poetExtensions.getModelClass(memberModel.getShape().getC2jName());
154155
ClassName builderClass = memberClass.nestedClass("Builder");
155156
return fluentDefaultSetterDeclaration(builderConsumerParam(builderClass), returnType)
156157
.addModifiers(Modifier.DEFAULT)
157158
.addStatement("return $N($T.builder().applyMutation($N).build())",
158-
memberModel().getFluentSetterMethodName(),
159+
memberModel.getFluentSetterMethodName(),
159160
memberClass,
160161
fieldName())
161-
.addJavadoc("$L", memberModel().getDefaultConsumerFluentSetterDocumentation())
162+
.addJavadoc("$L", memberModel.getDefaultConsumerFluentSetterDocumentation(memberModel.getVariable().getSimpleType()))
162163
.build();
163164
}
164165

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

+18-6
Original file line numberDiff line numberDiff line change
@@ -1748,16 +1748,21 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
17481748
/**
17491749
* Sets the value of the ListOfStructs property for this object.
17501750
*
1751-
* This is a convenience method that creates an instance of the {@link List<SimpleStruct>.Builder} avoiding the
1752-
* need to create one manually via {@link List<SimpleStruct>#builder()}.
1751+
* This is a convenience method that creates an instance of the
1752+
* {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder} avoiding the need to
1753+
* create one manually via
1754+
* {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct#builder()}.
17531755
*
1754-
* When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
1755-
* result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
1756+
* <p>
1757+
* When the {@link Consumer} completes,
1758+
* {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder#build()} is called
1759+
* immediately and its result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
17561760
*
17571761
* @param listOfStructs
1758-
* a consumer that will call methods on {@link List<SimpleStruct>.Builder}
1762+
* a consumer that will call methods on
1763+
* {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder}
17591764
* @return Returns a reference to this object so that method calls can be chained together.
1760-
* @see #listOfStructs(List<SimpleStruct>)
1765+
* @see #listOfStructs(java.util.Collection<SimpleStruct>)
17611766
*/
17621767
Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs);
17631768

@@ -1956,6 +1961,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
19561961
* This is a convenience method that creates an instance of the {@link StructWithTimestamp.Builder} avoiding the
19571962
* need to create one manually via {@link StructWithTimestamp#builder()}.
19581963
*
1964+
* <p>
19591965
* When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
19601966
* its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
19611967
*
@@ -1993,6 +1999,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
19931999
* This is a convenience method that creates an instance of the {@link StructWithNestedBlobType.Builder}
19942000
* avoiding the need to create one manually via {@link StructWithNestedBlobType#builder()}.
19952001
*
2002+
* <p>
19962003
* When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
19972004
* and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
19982005
*
@@ -2047,6 +2054,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
20472054
* This is a convenience method that creates an instance of the {@link RecursiveStructType.Builder} avoiding the
20482055
* need to create one manually via {@link RecursiveStructType#builder()}.
20492056
*
2057+
* <p>
20502058
* When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
20512059
* its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
20522060
*
@@ -2074,6 +2082,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
20742082
* This is a convenience method that creates an instance of the {@link BaseType.Builder} avoiding the need to
20752083
* create one manually via {@link BaseType#builder()}.
20762084
*
2085+
* <p>
20772086
* When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
20782087
* passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
20792088
*
@@ -2101,6 +2110,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
21012110
* This is a convenience method that creates an instance of the {@link SubTypeOne.Builder} avoiding the need to
21022111
* create one manually via {@link SubTypeOne#builder()}.
21032112
*
2113+
* <p>
21042114
* When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
21052115
* is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
21062116
*
@@ -2150,6 +2160,7 @@ default Builder polymorphicTypeWithoutSubTypes(Consumer<SubTypeOne.Builder> poly
21502160
* This is a convenience method that creates an instance of the {@link Underscore_Name_Type.Builder} avoiding
21512161
* the need to create one manually via {@link Underscore_Name_Type#builder()}.
21522162
*
2163+
* <p>
21532164
* When the {@link Consumer} completes, {@link Underscore_Name_Type.Builder#build()} is called immediately and
21542165
* its result is passed to {@link #underscore_Name_Type(Underscore_Name_Type)}.
21552166
*
@@ -2186,6 +2197,7 @@ default Builder underscore_Name_Type(Consumer<Underscore_Name_Type.Builder> unde
21862197
* This is a convenience method that creates an instance of the {@link AllTypesUnionStructure.Builder} avoiding
21872198
* the need to create one manually via {@link AllTypesUnionStructure#builder()}.
21882199
*
2200+
* <p>
21892201
* When the {@link Consumer} completes, {@link AllTypesUnionStructure.Builder#build()} is called immediately and
21902202
* its result is passed to {@link #allTypesUnionStructure(AllTypesUnionStructure)}.
21912203
*

0 commit comments

Comments
 (0)