Skip to content

Commit 5de5e7e

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1354 from aws/staging/347bf3c4-d8e9-46ac-83cb-d2c1b772cc45
Pull request: release <- staging/347bf3c4-d8e9-46ac-83cb-d2c1b772cc45
2 parents 342075d + c7aa59b commit 5de5e7e

File tree

352 files changed

+2081
-2659
lines changed

Some content is hidden

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

352 files changed

+2081
-2659
lines changed

‎.changes/2.16.53.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.16.53",
3+
"date": "2021-05-03",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Chime",
8+
"contributor": "",
9+
"description": "Added new BatchCreateChannelMembership API to support multiple membership creation for channels"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS SecurityHub",
14+
"contributor": "",
15+
"description": "Updated ASFF to add the following new resource details objects: AwsEc2NetworkAcl, AwsEc2Subnet, and AwsElasticBeanstalkEnvironment."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "FinSpace User Environment Management service",
20+
"contributor": "",
21+
"description": "This is the initial SDK release for the management APIs for Amazon FinSpace. Amazon FinSpace is a data management and analytics service for the financial services industry (FSI)."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "FinSpace Public API",
26+
"contributor": "",
27+
"description": "This is the initial SDK release for the data APIs for Amazon FinSpace. Amazon FinSpace is a data management and analytics application for the financial services industry (FSI)."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Mechanical Turk",
32+
"contributor": "",
33+
"description": "Documentation updates for Amazon Mechanical Turk, GetAccountBalanceOperation operation"
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.16.53__ __2021-05-03__
2+
## __AWS SecurityHub__
3+
- ### Features
4+
- Updated ASFF to add the following new resource details objects: AwsEc2NetworkAcl, AwsEc2Subnet, and AwsElasticBeanstalkEnvironment.
5+
6+
## __Amazon Chime__
7+
- ### Features
8+
- Added new BatchCreateChannelMembership API to support multiple membership creation for channels
9+
10+
## __Amazon Mechanical Turk__
11+
- ### Features
12+
- Documentation updates for Amazon Mechanical Turk, GetAccountBalanceOperation operation
13+
14+
## __FinSpace Public API__
15+
- ### Features
16+
- This is the initial SDK release for the data APIs for Amazon FinSpace. Amazon FinSpace is a data management and analytics application for the financial services industry (FSI).
17+
18+
## __FinSpace User Environment Management service__
19+
- ### Features
20+
- This is the initial SDK release for the management APIs for Amazon FinSpace. Amazon FinSpace is a data management and analytics service for the financial services industry (FSI).
21+
122
# __2.16.52__ __2021-04-30__
223
## __AWS Marketplace Catalog Service__
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.16.52</version>
55+
<version>2.16.53</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.52</version>
89+
<version>2.16.53</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.16.52</version>
94+
<version>2.16.53</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.52</version>
106+
<version>2.16.53</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.52</version>
23+
<version>2.16.53</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.52</version>
23+
<version>2.16.53</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.52</version>
23+
<version>2.16.53</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.52</version>
23+
<version>2.16.53</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 11 additions & 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.52</version>
20+
<version>2.16.53</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>
@@ -1328,6 +1328,16 @@ Amazon AutoScaling, etc).</description>
13281328
<artifactId>nimble</artifactId>
13291329
<version>${awsjavasdk.version}</version>
13301330
</dependency>
1331+
<dependency>
1332+
<groupId>software.amazon.awssdk</groupId>
1333+
<artifactId>finspacedata</artifactId>
1334+
<version>${awsjavasdk.version}</version>
1335+
</dependency>
1336+
<dependency>
1337+
<groupId>software.amazon.awssdk</groupId>
1338+
<artifactId>finspace</artifactId>
1339+
<version>${awsjavasdk.version}</version>
1340+
</dependency>
13311341
</dependencies>
13321342
<build>
13331343
<finalName>${project.artifactId}-${project.version}</finalName>

‎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.52</version>
23+
<version>2.16.53</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

Lines changed: 11 additions & 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.52</version>
20+
<version>2.16.53</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>
@@ -1458,6 +1458,16 @@
14581458
<artifactId>nimble</artifactId>
14591459
<version>${awsjavasdk.version}</version>
14601460
</dependency>
1461+
<dependency>
1462+
<groupId>software.amazon.awssdk</groupId>
1463+
<artifactId>finspacedata</artifactId>
1464+
<version>${awsjavasdk.version}</version>
1465+
</dependency>
1466+
<dependency>
1467+
<groupId>software.amazon.awssdk</groupId>
1468+
<artifactId>finspace</artifactId>
1469+
<version>${awsjavasdk.version}</version>
1470+
</dependency>
14611471
</dependencies>
14621472
</dependencyManagement>
14631473
</project>

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

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
232232
.add(".withMarshaller($L)\n", asyncMarshaller(model, opModel, marshaller, protocolFactory))
233233
.add(asyncRequestBody(opModel))
234234
.add(fullDuplex(opModel))
235-
.add(hasInitialRequestEvent(opModel, isRestJson))
236235
.add(".withResponseHandler($L)\n", responseHandlerName(opModel, isRestJson))
237236
.add(".withErrorResponseHandler(errorResponseHandler)\n")
238237
.add(".withMetricCollector(apiCallMetricCollector)\n")
@@ -272,11 +271,6 @@ private CodeBlock fullDuplex(OperationModel opModel) {
272271
: CodeBlock.of("");
273272
}
274273

275-
private CodeBlock hasInitialRequestEvent(OperationModel opModel, boolean isRestJson) {
276-
return opModel.hasEventStreamInput() && !isRestJson ? CodeBlock.of(".withInitialRequestEvent(true)")
277-
: CodeBlock.of("");
278-
}
279-
280274
private CodeBlock asyncRequestBody(OperationModel opModel) {
281275
return opModel.hasEventStreamInput() ? CodeBlock.of(".withAsyncRequestBody($T.fromPublisher(adapted))",
282276
AsyncRequestBody.class)

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
*/
3333
public final class EventStreamJsonMarshallerSpec extends JsonMarshallerSpec {
3434

35+
private static final String JSON_CONTENT_TYPE = "application/json";
36+
3537
public EventStreamJsonMarshallerSpec(IntermediateModel model, ShapeModel shapeModel) {
3638
super(shapeModel);
3739
}
@@ -49,7 +51,7 @@ public CodeBlock marshalCodeBlock(ClassName requestClassName) {
4951

5052
// Add :content-type header only if payload is present
5153
if (!shapeModel.hasNoEventPayload()) {
52-
builder.add(".putHeader(\":content-type\", $L)", determinePayloadContentType());
54+
builder.add(".putHeader(\":content-type\", \"$L\")", determinePayloadContentType());
5355
}
5456

5557
builder.add(".build();");
@@ -83,12 +85,12 @@ private String determinePayloadContentType() {
8385
return getPayloadContentType(explicitEventPayload);
8486
}
8587

86-
return "protocolFactory.getContentType()";
88+
return JSON_CONTENT_TYPE;
8789
}
8890

8991
private String getPayloadContentType(MemberModel memberModel) {
90-
String blobContentType = "\"application/octet-stream\"";
91-
String stringContentType = "\"text/plain\"";
92+
String blobContentType = "application/octet-stream";
93+
String stringContentType = "text/plain";
9294
String variableType = memberModel.getVariable().getVariableType();
9395

9496
if ("software.amazon.awssdk.core.SdkBytes".equals(variableType)) {
@@ -97,6 +99,6 @@ private String getPayloadContentType(MemberModel memberModel) {
9799
return stringContentType;
98100
}
99101

100-
return "protocolFactory.getContentType()";
102+
return JSON_CONTENT_TYPE;
101103
}
102104
}

‎codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
package software.amazon.awssdk.codegen.poet;
1717

1818
import java.io.File;
19-
20-
import org.eclipse.core.runtime.internal.adaptor.IModel;
2119
import software.amazon.awssdk.codegen.C2jModels;
2220
import software.amazon.awssdk.codegen.IntermediateModelBuilder;
2321
import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
@@ -33,20 +31,7 @@
3331
public class ClientTestModels {
3432
private ClientTestModels() {}
3533

36-
public static IntermediateModel awsJsonServiceModels() {
37-
File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/json/service-2.json").getFile());
38-
File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/json/customization.config").getFile());
39-
File paginatorsModel = new File(ClientTestModels.class.getResource("client/c2j/json/paginators.json").getFile());
40-
C2jModels models = C2jModels.builder()
41-
.serviceModel(getServiceModel(serviceModel))
42-
.customizationConfig(getCustomizationConfig(customizationModel))
43-
.paginatorsModel(getPaginatorsModel(paginatorsModel))
44-
.build();
45-
46-
return new IntermediateModelBuilder(models).build();
47-
}
48-
49-
public static IntermediateModel restJsonServiceModels() {
34+
public static IntermediateModel jsonServiceModels() {
5035
File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/rest-json/service-2.json").getFile());
5136
File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/rest-json/customization.config").getFile());
5237
File paginatorsModel = new File(ClientTestModels.class.getResource("client/c2j/rest-json/paginators.json").getFile());

‎codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void asyncClientBuilderClass() throws Exception {
6969
}
7070

7171
private void validateGeneration(Function<IntermediateModel, ClassSpec> generatorConstructor, String expectedClassName) {
72-
assertThat(generatorConstructor.apply(ClientTestModels.restJsonServiceModels()), generatesTo(expectedClassName));
72+
assertThat(generatorConstructor.apply(ClientTestModels.jsonServiceModels()), generatesTo(expectedClassName));
7373
}
7474

7575
private void validateQueryGeneration(Function<IntermediateModel, ClassSpec> generatorConstructor, String expectedClassName) {

0 commit comments

Comments
 (0)