Skip to content

Commit cbfada5

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1013 from aws/staging/0c367579-e410-49ed-b9c2-9a230d19cc2a
Pull request: release <- staging/0c367579-e410-49ed-b9c2-9a230d19cc2a
2 parents 0441e2d + effb59f commit cbfada5

File tree

358 files changed

+1070
-9031
lines changed

Some content is hidden

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

358 files changed

+1070
-9031
lines changed

‎.changes/2.15.17.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.15.17",
3+
"date": "2020-10-28",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "Updated service endpoint metadata."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS IoT",
14+
"contributor": "",
15+
"description": "This release adds support for GG-Managed Job Namespace"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon WorkMail",
20+
"contributor": "",
21+
"description": "Documentation update for Amazon WorkMail"
22+
},
23+
{
24+
"type": "bugfix",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": null,
27+
"description": "Fixed an issue where marshalling of a modeled object was not honoring the has* method on a list/map."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Elastic Compute Cloud",
32+
"contributor": "",
33+
"description": "AWS Nitro Enclaves general availability. Added support to RunInstances for creating enclave-enabled EC2 instances. New APIs to associate an ACM certificate with an IAM role, for enclave consumption."
34+
},
35+
{
36+
"type": "bugfix",
37+
"category": "AWS SDK for Java v2",
38+
"contributor": null,
39+
"description": "Fixed an issue where the toString/equals/hashCode on a modeled object were not honoring the has* methods for lists and maps."
40+
}
41+
]
42+
}

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# __2.15.17__ __2020-10-28__
2+
## __AWS IoT__
3+
- ### Features
4+
- This release adds support for GG-Managed Job Namespace
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated service endpoint metadata.
9+
10+
- ### Bugfixes
11+
- Fixed an issue where marshalling of a modeled object was not honoring the has* method on a list/map.
12+
- Fixed an issue where the toString/equals/hashCode on a modeled object were not honoring the has* methods for lists and maps.
13+
14+
## __Amazon Elastic Compute Cloud__
15+
- ### Features
16+
- AWS Nitro Enclaves general availability. Added support to RunInstances for creating enclave-enabled EC2 instances. New APIs to associate an ACM certificate with an IAM role, for enclave consumption.
17+
18+
## __Amazon WorkMail__
19+
- ### Features
20+
- Documentation update for Amazon WorkMail
21+
122
# __2.15.16__ __2020-10-27__
223
## __AWS Glue__
324
- ### 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.16</version>
52+
<version>2.15.17</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.16</version>
86+
<version>2.15.17</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.15.16</version>
91+
<version>2.15.17</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.16</version>
103+
<version>2.15.17</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.16</version>
23+
<version>2.15.17</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.16</version>
23+
<version>2.15.17</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.16</version>
20+
<version>2.15.17</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.16</version>
23+
<version>2.15.17</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.16</version>
20+
<version>2.15.17</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.15.16</version>
24+
<version>2.15.17</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.16</version>
25+
<version>2.15.17</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.16</version>
24+
<version>2.15.17</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.16</version>
25+
<version>2.15.17</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.16</version>
24+
<version>2.15.17</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

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

Lines changed: 0 additions & 40 deletions
This file was deleted.

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

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import software.amazon.awssdk.codegen.model.intermediate.Metadata;
2121
import software.amazon.awssdk.codegen.model.intermediate.Protocol;
2222
import software.amazon.awssdk.codegen.model.service.AuthType;
23-
import software.amazon.awssdk.codegen.model.service.Operation;
2423
import software.amazon.awssdk.codegen.model.service.ServiceMetadata;
2524
import software.amazon.awssdk.codegen.model.service.ServiceModel;
2625
import software.amazon.awssdk.codegen.naming.DefaultNamingStrategy;
@@ -38,21 +37,11 @@ private AddMetadata() {
3837

3938
public static Metadata constructMetadata(ServiceModel serviceModel,
4039
CustomizationConfig customizationConfig) {
41-
4240
Metadata metadata = new Metadata();
4341

4442
NamingStrategy namingStrategy = new DefaultNamingStrategy(serviceModel, customizationConfig);
4543
ServiceMetadata serviceMetadata = serviceModel.getMetadata();
46-
47-
String serviceName;
48-
String rootPackageName;
49-
50-
if (serviceMetadata.getProtocol().equals(Protocol.API_GATEWAY.getValue())) {
51-
throw new UnsupportedOperationException("Java SDK V2 doesn't support api-gateway protocol yet");
52-
} else {
53-
serviceName = namingStrategy.getServiceName();
54-
rootPackageName = AWS_PACKAGE_PREFIX;
55-
}
44+
String serviceName = namingStrategy.getServiceName();
5645

5746
metadata.withApiVersion(serviceMetadata.getApiVersion())
5847
.withAsyncClient(String.format(Constant.ASYNC_CLIENT_CLASS_NAME_PATTERN, serviceName))
@@ -62,7 +51,7 @@ public static Metadata constructMetadata(ServiceModel serviceModel,
6251
.withBaseBuilderInterface(String.format(Constant.BASE_BUILDER_INTERFACE_NAME_PATTERN, serviceName))
6352
.withBaseBuilder(String.format(Constant.BASE_BUILDER_CLASS_NAME_PATTERN, serviceName))
6453
.withDocumentation(serviceModel.getDocumentation())
65-
.withRootPackageName(rootPackageName)
54+
.withRootPackageName(AWS_PACKAGE_PREFIX)
6655
.withClientPackageName(namingStrategy.getClientPackageName(serviceName))
6756
.withModelPackageName(namingStrategy.getModelPackageName(serviceName))
6857
.withTransformPackageName(namingStrategy.getTransformPackageName(serviceName))
@@ -84,13 +73,10 @@ public static Metadata constructMetadata(ServiceModel serviceModel,
8473
.withEndpointPrefix(serviceMetadata.getEndpointPrefix())
8574
.withSigningName(serviceMetadata.getSigningName())
8675
.withAuthType(AuthType.fromValue(serviceMetadata.getSignatureVersion()))
87-
.withRequiresApiKey(requiresApiKey(serviceModel))
8876
.withUid(serviceMetadata.getUid())
8977
.withServiceId(serviceMetadata.getServiceId())
90-
.withSupportsH2(supportsH2(serviceMetadata));
91-
92-
String jsonVersion = getJsonVersion(metadata, serviceMetadata);
93-
metadata.setJsonVersion(jsonVersion);
78+
.withSupportsH2(supportsH2(serviceMetadata))
79+
.withJsonVersion(getJsonVersion(metadata, serviceMetadata));
9480

9581
return metadata;
9682
}
@@ -107,14 +93,4 @@ private static String getJsonVersion(Metadata metadata, ServiceMetadata serviceM
10793
return serviceMetadata.getJsonVersion();
10894
}
10995
}
110-
111-
/**
112-
* If any operation requires an API key we generate a setter on the builder.
113-
*
114-
* @return True if any operation requires an API key. False otherwise.
115-
*/
116-
private static boolean requiresApiKey(ServiceModel serviceModel) {
117-
return serviceModel.getOperations().values().stream()
118-
.anyMatch(Operation::requiresApiKey);
119-
}
12096
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import software.amazon.awssdk.codegen.internal.Jackson;
2727
import software.amazon.awssdk.codegen.internal.Utils;
2828
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
29-
import software.amazon.awssdk.codegen.model.intermediate.Protocol;
3029

3130
public class CodeGenerator {
3231

@@ -125,14 +124,8 @@ private void emitCode(IntermediateModel intermediateModel) {
125124
}
126125

127126
private GeneratorTask createGeneratorTasks(IntermediateModel intermediateModel) {
128-
// For clients built internally, the output directory and source directory are the same.
129-
GeneratorTaskParams params = GeneratorTaskParams.create(intermediateModel, sourcesDirectory, testsDirectory);
127+
return new AwsGeneratorTasks(GeneratorTaskParams.create(intermediateModel, sourcesDirectory, testsDirectory));
130128

131-
if (params.getModel().getMetadata().getProtocol() == Protocol.API_GATEWAY) {
132-
throw new UnsupportedOperationException("Unsupported protocol: " + Protocol.API_GATEWAY);
133-
} else {
134-
return new AwsGeneratorTasks(params);
135-
}
136129
}
137130

138131
/**

0 commit comments

Comments
 (0)