Skip to content

Commit 6295bcb

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1916 from aws/staging/3f7d33c6-e39e-4345-9e9d-ccfb92c40606
Pull request: release <- staging/3f7d33c6-e39e-4345-9e9d-ccfb92c40606
2 parents 564d64b + d26811a commit 6295bcb

File tree

375 files changed

+688
-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.

375 files changed

+688
-378
lines changed

‎.changes/2.17.120.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.17.120",
3+
"date": "2022-01-27",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon OpenSearch Service",
8+
"contributor": "",
9+
"description": "Allows customers to get progress updates for blue/green deployments"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "Managed Streaming for Kafka",
14+
"contributor": "",
15+
"description": "Amazon MSK has updated the CreateCluster and UpdateBrokerStorage API that allows you to specify volume throughput during cluster creation and broker volume updates."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Elastic Compute Cloud",
20+
"contributor": "",
21+
"description": "X2ezn instances are powered by Intel Cascade Lake CPUs that deliver turbo all core frequency of up to 4.5 GHz and up to 100 Gbps of networking bandwidth"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Amplify",
26+
"contributor": "",
27+
"description": "Doc only update to the description of basicauthcredentials to describe the required encoding and format."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Connect Service",
32+
"contributor": "",
33+
"description": "This release adds support for configuring a custom chat duration when starting a new chat session via the StartChatContact API. The default value for chat duration is 25 hours, minimum configurable value is 1 hour (60 minutes) and maximum configurable value is 7 days (10,080 minutes)."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# __2.17.120__ __2022-01-27__
2+
## __AWS Amplify__
3+
- ### Features
4+
- Doc only update to the description of basicauthcredentials to describe the required encoding and format.
5+
6+
## __Amazon Connect Service__
7+
- ### Features
8+
- This release adds support for configuring a custom chat duration when starting a new chat session via the StartChatContact API. The default value for chat duration is 25 hours, minimum configurable value is 1 hour (60 minutes) and maximum configurable value is 7 days (10,080 minutes).
9+
10+
## __Amazon Elastic Compute Cloud__
11+
- ### Features
12+
- X2ezn instances are powered by Intel Cascade Lake CPUs that deliver turbo all core frequency of up to 4.5 GHz and up to 100 Gbps of networking bandwidth
13+
14+
## __Amazon OpenSearch Service__
15+
- ### Features
16+
- Allows customers to get progress updates for blue/green deployments
17+
18+
## __Managed Streaming for Kafka__
19+
- ### Features
20+
- Amazon MSK has updated the CreateCluster and UpdateBrokerStorage API that allows you to specify volume throughput during cluster creation and broker volume updates.
21+
122
# __2.17.119__ __2022-01-26__
223
## __AWS SecurityHub__
324
- ### 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.17.119</version>
55+
<version>2.17.120</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.119</version>
89+
<version>2.17.120</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.119</version>
94+
<version>2.17.120</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.119</version>
106+
<version>2.17.120</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.17.119</version>
23+
<version>2.17.120</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.17.119</version>
23+
<version>2.17.120</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.17.119</version>
23+
<version>2.17.120</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.17.119</version>
23+
<version>2.17.120</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.17.119</version>
20+
<version>2.17.120</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.17.119</version>
23+
<version>2.17.120</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.17.119</version>
20+
<version>2.17.120</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.17.119</version>
24+
<version>2.17.120</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.17.119</version>
25+
<version>2.17.120</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.17.119</version>
24+
<version>2.17.120</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.17.119</version>
25+
<version>2.17.120</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.17.119</version>
24+
<version>2.17.120</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public Map<String, OperationModel> constructOperations() {
155155

156156
operationModel.setOperationName(operationName);
157157
operationModel.setDeprecated(op.isDeprecated());
158+
operationModel.setDeprecatedMessage(op.getDeprecatedMessage());
158159
operationModel.setDocumentation(op.getDocumentation());
159160
operationModel.setIsAuthenticated(isAuthenticated(op));
160161
operationModel.setAuthType(op.getAuthtype());

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public class OperationModel extends DocumentationModel {
3232

3333
private boolean deprecated;
3434

35+
private String deprecatedMessage;
36+
3537
private VariableModel input;
3638

3739
private ReturnTypeModel returnType;
@@ -84,6 +86,14 @@ public void setDeprecated(boolean deprecated) {
8486
this.deprecated = deprecated;
8587
}
8688

89+
public String getDeprecatedMessage() {
90+
return deprecatedMessage;
91+
}
92+
93+
public void setDeprecatedMessage(String deprecatedMessage) {
94+
this.deprecatedMessage = deprecatedMessage;
95+
}
96+
8797
public String getDocs(IntermediateModel model,
8898
ClientType clientType) {
8999
return OperationDocs.getDocs(model, this, clientType);

‎codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Operation.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public class Operation {
2424

2525
private boolean deprecated;
2626

27+
private String deprecatedMessage;
28+
2729
private Http http;
2830

2931
private Input input;
@@ -67,6 +69,14 @@ public void setDeprecated(boolean deprecated) {
6769
this.deprecated = deprecated;
6870
}
6971

72+
public String getDeprecatedMessage() {
73+
return deprecatedMessage;
74+
}
75+
76+
public void setDeprecatedMessage(String deprecatedMessage) {
77+
this.deprecatedMessage = deprecatedMessage;
78+
}
79+
7080
public Http getHttp() {
7181
return http;
7282
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import software.amazon.awssdk.codegen.poet.PoetExtensions;
4747
import software.amazon.awssdk.codegen.poet.PoetUtils;
4848
import software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils;
49+
import software.amazon.awssdk.codegen.poet.model.DeprecationUtils;
4950
import software.amazon.awssdk.codegen.utils.PaginatorUtils;
5051
import software.amazon.awssdk.core.SdkClient;
5152
import software.amazon.awssdk.core.async.AsyncRequestBody;
@@ -179,7 +180,9 @@ private Stream<MethodSpec> operationsAndSimpleMethods(OperationModel operationMo
179180
methods.addAll(traditionalMethods(operationModel));
180181
methods.addAll(overloadMethods(operationModel));
181182
methods.addAll(paginatedMethods(operationModel));
182-
return methods.stream();
183+
return methods.stream()
184+
// Add Deprecated annotation if needed to all overloads
185+
.map(m -> DeprecationUtils.checkDeprecated(operationModel, m));
183186
}
184187

185188
private List<MethodSpec> paginatedMethods(OperationModel opModel) {
@@ -406,7 +409,7 @@ private MethodSpec.Builder methodSignatureWithReturnType(OperationModel opModel)
406409
*/
407410
private MethodSpec.Builder interfaceMethodSignature(OperationModel opModel) {
408411
return methodSignatureWithReturnType(opModel)
409-
.addModifiers(Modifier.PUBLIC, Modifier.DEFAULT);
412+
.addModifiers(Modifier.PUBLIC, Modifier.DEFAULT);
410413
}
411414

412415
/**

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientClassUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ static MethodSpec consumerBuilderVariant(MethodSpec spec, String javadoc) {
6464
MethodSpec.Builder result = MethodSpec.methodBuilder(spec.name)
6565
.returns(spec.returnType)
6666
.addExceptions(spec.exceptions)
67+
.addAnnotations(spec.annotations)
6768
.addJavadoc(javadoc)
6869
.addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
6970
.addTypeVariables(spec.typeVariables)

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientInterface.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import software.amazon.awssdk.codegen.poet.ClassSpec;
4949
import software.amazon.awssdk.codegen.poet.PoetExtensions;
5050
import software.amazon.awssdk.codegen.poet.PoetUtils;
51+
import software.amazon.awssdk.codegen.poet.model.DeprecationUtils;
5152
import software.amazon.awssdk.codegen.utils.PaginatorUtils;
5253
import software.amazon.awssdk.core.ResponseBytes;
5354
import software.amazon.awssdk.core.ResponseInputStream;
@@ -176,7 +177,10 @@ private List<MethodSpec> operationMethodSpec(OperationModel opModel) {
176177
methods.addAll(streamingSimpleMethods(opModel));
177178
methods.addAll(paginatedMethods(opModel));
178179

179-
return methods;
180+
return methods.stream()
181+
// Add Deprecated annotation if needed to all overloads
182+
.map(m -> DeprecationUtils.checkDeprecated(opModel, m))
183+
.collect(toList());
180184
}
181185

182186
private MethodSpec simpleMethod(OperationModel opModel) {

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.squareup.javapoet.MethodSpec;
2323
import java.util.List;
2424
import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
25+
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
2526
import software.amazon.awssdk.utils.StringUtils;
2627

2728
public final class DeprecationUtils {
@@ -49,6 +50,24 @@ public static MethodSpec checkDeprecated(MemberModel member, MethodSpec method)
4950
return builder.build();
5051
}
5152

53+
/**
54+
* If a given operation is modeled as deprecated, add the {@link Deprecated} annotation to the method and, if the method
55+
* already has existing Javadoc, append a section with the {@code @deprecated} tag.
56+
*/
57+
public static MethodSpec checkDeprecated(OperationModel operation, MethodSpec method) {
58+
if (!operation.isDeprecated() || method.annotations.contains(DEPRECATED)) {
59+
return method;
60+
}
61+
MethodSpec.Builder builder = method.toBuilder().addAnnotation(DEPRECATED);
62+
if (!method.javadoc.isEmpty()) {
63+
builder.addJavadoc(LF + "@deprecated");
64+
if (StringUtils.isNotBlank(operation.getDeprecatedMessage())) {
65+
builder.addJavadoc(" $L", operation.getDeprecatedMessage());
66+
}
67+
}
68+
return builder.build();
69+
}
70+
5271
public static List<MethodSpec> checkDeprecated(MemberModel member, List<MethodSpec> methods) {
5372
return methods.stream().map(methodSpec -> checkDeprecated(member, methodSpec)).collect(toList());
5473
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
"shape": "InvalidInputException"
4040
}
4141
],
42+
"deprecated": true,
43+
"deprecatedMessage": "This API is deprecated, use something else",
4244
"documentation": "<p>Performs a post operation to the query service and has no output</p>"
4345
},
4446
"GetWithoutRequiredMembers": {

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ static JsonAsyncClientBuilder builder() {
9595
* @sample JsonAsyncClient.APostOperation
9696
* @see <a href="https://docs.aws.amazon.com/goto/WebAPI/json-service-2010-05-08/APostOperation" target="_top">AWS
9797
* API Documentation</a>
98+
*
99+
* @deprecated This API is deprecated, use something else
98100
*/
101+
@Deprecated
99102
default CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRequest aPostOperationRequest) {
100103
throw new UnsupportedOperationException();
101104
}
@@ -128,7 +131,10 @@ default CompletableFuture<APostOperationResponse> aPostOperation(APostOperationR
128131
* @sample JsonAsyncClient.APostOperation
129132
* @see <a href="https://docs.aws.amazon.com/goto/WebAPI/json-service-2010-05-08/APostOperation" target="_top">AWS
130133
* API Documentation</a>
134+
*
135+
* @deprecated This API is deprecated, use something else
131136
*/
137+
@Deprecated
132138
default CompletableFuture<APostOperationResponse> aPostOperation(Consumer<APostOperationRequest.Builder> aPostOperationRequest) {
133139
return aPostOperation(APostOperationRequest.builder().applyMutation(aPostOperationRequest).build());
134140
}
@@ -1449,4 +1455,4 @@ default CompletableFuture<StreamingOutputOperationResponse> streamingOutputOpera
14491455
default JsonUtilities utilities() {
14501456
throw new UnsupportedOperationException();
14511457
}
1452-
}
1458+
}

0 commit comments

Comments
 (0)