Skip to content

Commit 36471bb

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #968 from aws/staging/fd50965f-b9f1-4fdf-a572-0d39334a4981
Pull request: release <- staging/fd50965f-b9f1-4fdf-a572-0d39334a4981
2 parents 8ae7bba + 55c0048 commit 36471bb

File tree

297 files changed

+943
-367
lines changed

Some content is hidden

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

297 files changed

+943
-367
lines changed

‎.changes/2.14.23.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.14.23",
3+
"date": "2020-09-22",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"description": "Formal parameter names of sychronous streaming methods were aligned with their javadocs."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon DynamoDB Streams",
13+
"description": "Documentation updates for streams.dynamodb"
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Amazon Lex Model Building Service",
18+
"description": "Lex now supports es-US locales"
19+
},
20+
{
21+
"type": "bugfix",
22+
"category": "AWS SDK for Java v2",
23+
"description": "This change makes the `FileStoreTlsKeyManagersProvider` and `SystemPropertyTlsKeyManagersProvider` respect the `ssl.KeyManagerFactory.algorithm` when instantiating the `KeyManagerFactory` rather than always using the hardcoded value of `SunX509`."
24+
},
25+
{
26+
"type": "feature",
27+
"category": "Amazon WorkMail",
28+
"description": "Adding support for Mailbox Export APIs"
29+
},
30+
{
31+
"type": "feature",
32+
"category": "Amazon Comprehend",
33+
"description": "Amazon Comprehend integrates with Amazon SageMaker GroundTruth to allow its customers to annotate their datasets using GroundTruth and train their models using Comprehend Custom APIs."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# __2.14.23__ __2020-09-22__
2+
## __AWS SDK for Java v2__
3+
- ### Bugfixes
4+
- Formal parameter names of sychronous streaming methods were aligned with their javadocs.
5+
- This change makes the `FileStoreTlsKeyManagersProvider` and `SystemPropertyTlsKeyManagersProvider` respect the `ssl.KeyManagerFactory.algorithm` when instantiating the `KeyManagerFactory` rather than always using the hardcoded value of `SunX509`.
6+
7+
## __Amazon Comprehend__
8+
- ### Features
9+
- Amazon Comprehend integrates with Amazon SageMaker GroundTruth to allow its customers to annotate their datasets using GroundTruth and train their models using Comprehend Custom APIs.
10+
11+
## __Amazon DynamoDB Streams__
12+
- ### Features
13+
- Documentation updates for streams.dynamodb
14+
15+
## __Amazon Lex Model Building Service__
16+
- ### Features
17+
- Lex now supports es-US locales
18+
19+
## __Amazon WorkMail__
20+
- ### Features
21+
- Adding support for Mailbox Export APIs
22+
123
# __2.14.22__ __2020-09-21__
224
## __AWS Glue__
325
- ### 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.14.22</version>
52+
<version>2.14.23</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.14.22</version>
86+
<version>2.14.23</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.14.22</version>
91+
<version>2.14.23</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.14.22</version>
103+
<version>2.14.23</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.14.22</version>
23+
<version>2.14.23</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.14.22</version>
23+
<version>2.14.23</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.14.22</version>
20+
<version>2.14.23</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.14.22</version>
23+
<version>2.14.23</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.14.22</version>
20+
<version>2.14.23</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎build-tools/src/main/resources/software/amazon/awssdk/intellij-codestyle.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
<option name="DOWHILE_BRACE_FORCE" value="3" />
6060
<option name="WHILE_BRACE_FORCE" value="3" />
6161
<option name="FOR_BRACE_FORCE" value="3" />
62+
<option name="WRAP_LONG_LINES" value="true" />
63+
<option name="WRAP_ON_TYPING" value="1" />
6264
<indentOptions>
6365
<option name="CONTINUATION_INDENT_SIZE" value="4" />
6466
</indentOptions>

‎buildspecs/integ-test.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ phases:
77

88
build:
99
commands:
10+
- |
11+
if [ ! -z "$INTEGRATION_TEST_ROLE_ARN" ]; then
12+
ASSUME_ROLE_OUTPUT=`aws sts assume-role --role-arn "$INTEGRATION_TEST_ROLE_ARN" --role-session-name "integration-tests" --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' --output text`
13+
AWS_ACCESS_KEY_ID=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $1 }'`
14+
AWS_SECRET_ACCESS_KEY=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $2 }'`
15+
AWS_SESSION_TOKEN=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $3 }'`
16+
echo "Using role $INTEGRATION_TEST_ROLE_ARN with access key $AWS_ACCESS_KEY_ID."
17+
fi
1018
- mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -T1C
1119
- JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
1220
- echo $JAVA_VERSION

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

‎codegen/src/main/java/software/amazon/awssdk/codegen/docs/SyncOperationDocProvider.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
package software.amazon.awssdk.codegen.docs;
1717

18+
import static software.amazon.awssdk.codegen.internal.Constant.SYNC_CLIENT_DESTINATION_PATH_PARAM_NAME;
19+
import static software.amazon.awssdk.codegen.internal.Constant.SYNC_CLIENT_SOURCE_PATH_PARAM_NAME;
20+
1821
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
1922
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
2023
import software.amazon.awssdk.codegen.utils.PaginatorUtils;
@@ -101,12 +104,12 @@ static class SyncFile extends SyncOperationDocProvider {
101104
protected void applyParams(DocumentationBuilder docBuilder) {
102105
emitRequestParm(docBuilder);
103106
if (opModel.hasStreamingInput()) {
104-
docBuilder.param("sourcePath", SIMPLE_FILE_INPUT_DOCS + getStreamingInputDocs())
107+
docBuilder.param(SYNC_CLIENT_SOURCE_PATH_PARAM_NAME, SIMPLE_FILE_INPUT_DOCS + getStreamingInputDocs())
105108
// Link to non-simple method for discoverability
106109
.see("#%s(%s, RequestBody)", opModel.getMethodName(), opModel.getInput().getVariableType());
107110
}
108111
if (opModel.hasStreamingOutput()) {
109-
docBuilder.param("destinationPath", SIMPLE_FILE_OUTPUT_DOCS + getStreamingOutputDocs())
112+
docBuilder.param(SYNC_CLIENT_DESTINATION_PATH_PARAM_NAME, SIMPLE_FILE_OUTPUT_DOCS + getStreamingOutputDocs())
110113
// Link to non-simple method for discoverability
111114
.see("#%s(%s, ResponseTransformer)", opModel.getMethodName(),
112115
opModel.getInput().getVariableType());

‎codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
package software.amazon.awssdk.codegen.internal;
1717

18+
import java.nio.file.Path;
19+
1820
public final class Constant {
1921

2022
public static final String CUSTOMIZATION_CONFIG_FILE = "customization.config";
@@ -26,6 +28,18 @@ public final class Constant {
2628

2729
public static final String SYNC_CLIENT_INTERFACE_NAME_PATTERN = "%sClient";
2830
public static final String SYNC_CLIENT_CLASS_NAME_PATTERN = "Default%sClient";
31+
32+
/**
33+
* Name of the source {@link Path}-typed formal method parameters of streaming input operations.
34+
*/
35+
public static final String SYNC_CLIENT_SOURCE_PATH_PARAM_NAME = "sourcePath";
36+
37+
/**
38+
* Name of the destination {@link Path}-typed formal method parameters of streaming output
39+
* operations.
40+
*/
41+
public static final String SYNC_CLIENT_DESTINATION_PATH_PARAM_NAME = "destinationPath";
42+
2943
public static final String SYNC_BUILDER_INTERFACE_NAME_PATTERN = "%sClientBuilder";
3044
public static final String SYNC_BUILDER_CLASS_NAME_PATTERN = "Default%sClientBuilder";
3145

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

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717

1818
import static java.util.stream.Collectors.toCollection;
1919
import static java.util.stream.Collectors.toList;
20+
import static software.amazon.awssdk.codegen.internal.Constant.SYNC_CLIENT_DESTINATION_PATH_PARAM_NAME;
21+
import static software.amazon.awssdk.codegen.internal.Constant.SYNC_CLIENT_SOURCE_PATH_PARAM_NAME;
2022
import static software.amazon.awssdk.codegen.poet.client.AsyncClientInterface.STREAMING_TYPE_VARIABLE;
2123

2224
import com.squareup.javapoet.ClassName;
2325
import com.squareup.javapoet.FieldSpec;
2426
import com.squareup.javapoet.MethodSpec;
27+
import com.squareup.javapoet.ParameterSpec;
2528
import com.squareup.javapoet.ParameterizedTypeName;
2629
import com.squareup.javapoet.TypeName;
2730
import com.squareup.javapoet.TypeSpec;
@@ -338,17 +341,21 @@ private List<MethodSpec> streamingSimpleMethods(OperationModel opModel) {
338341
* @return Simple method for streaming input operations to read data from a file.
339342
*/
340343
private MethodSpec uploadFromFileSimpleMethod(OperationModel opModel, TypeName responseType, ClassName requestType) {
341-
return MethodSpec.methodBuilder(opModel.getMethodName())
344+
String methodName = opModel.getMethodName();
345+
ParameterSpec inputVarParam = ParameterSpec.builder(requestType, opModel.getInput().getVariableName()).build();
346+
ParameterSpec srcPathParam = ParameterSpec.builder(ClassName.get(Path.class),
347+
SYNC_CLIENT_SOURCE_PATH_PARAM_NAME).build();
348+
return MethodSpec.methodBuilder(methodName)
342349
.returns(responseType)
343350
.addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
344-
.addParameter(requestType, opModel.getInput().getVariableName())
345-
.addParameter(ClassName.get(Path.class), "filePath")
351+
.addParameter(inputVarParam)
352+
.addParameter(srcPathParam)
346353
.addJavadoc(opModel.getDocs(model, ClientType.SYNC, SimpleMethodOverload.FILE))
347354
.addExceptions(getExceptionClasses(model, opModel))
348-
.addStatement("return $L($L, $T.fromFile($L))", opModel.getMethodName(),
349-
opModel.getInput().getVariableName(),
355+
.addStatement("return $L($N, $T.fromFile($N))", methodName,
356+
inputVarParam,
350357
ClassName.get(RequestBody.class),
351-
"filePath")
358+
srcPathParam)
352359
.build();
353360
}
354361

@@ -390,17 +397,21 @@ private MethodSpec bytesSimpleMethod(OperationModel opModel, TypeName responseTy
390397
* @return Simple method for streaming output operations to write response content to a file.
391398
*/
392399
private MethodSpec downloadToFileSimpleMethod(OperationModel opModel, TypeName responseType, ClassName requestType) {
393-
return MethodSpec.methodBuilder(opModel.getMethodName())
400+
String methodName = opModel.getMethodName();
401+
ParameterSpec inputVarParam = ParameterSpec.builder(requestType, opModel.getInput().getVariableName()).build();
402+
ParameterSpec dstFileParam =
403+
ParameterSpec.builder(ClassName.get(Path.class), SYNC_CLIENT_DESTINATION_PATH_PARAM_NAME).build();
404+
return MethodSpec.methodBuilder(methodName)
394405
.returns(responseType)
395406
.addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
396-
.addParameter(requestType, opModel.getInput().getVariableName())
397-
.addParameter(ClassName.get(Path.class), "filePath")
407+
.addParameter(inputVarParam)
408+
.addParameter(dstFileParam)
398409
.addJavadoc(opModel.getDocs(model, ClientType.SYNC, SimpleMethodOverload.FILE))
399410
.addExceptions(getExceptionClasses(model, opModel))
400-
.addStatement("return $L($L, $T.toFile($L))", opModel.getMethodName(),
401-
opModel.getInput().getVariableName(),
411+
.addStatement("return $L($N, $T.toFile($N))", methodName,
412+
inputVarParam,
402413
ClassName.get(ResponseTransformer.class),
403-
"filePath")
414+
dstFileParam)
404415
.build();
405416
}
406417

@@ -411,19 +422,25 @@ private MethodSpec downloadToFileSimpleMethod(OperationModel opModel, TypeName r
411422
private MethodSpec streamingInputOutputFileSimpleMethod(OperationModel opModel,
412423
TypeName responseType,
413424
ClassName requestType) {
414-
return MethodSpec.methodBuilder(opModel.getMethodName())
425+
String methodName = opModel.getMethodName();
426+
ParameterSpec inputVarParam = ParameterSpec.builder(requestType, opModel.getInput().getVariableName()).build();
427+
ParameterSpec srcFileParam = ParameterSpec.builder(ClassName.get(Path.class), SYNC_CLIENT_SOURCE_PATH_PARAM_NAME).build();
428+
ParameterSpec dstFileParam =
429+
ParameterSpec.builder(ClassName.get(Path.class), SYNC_CLIENT_DESTINATION_PATH_PARAM_NAME).build();
430+
return MethodSpec.methodBuilder(methodName)
415431
.returns(responseType)
416432
.addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
417-
.addParameter(requestType, opModel.getInput().getVariableName())
418-
.addParameter(ClassName.get(Path.class), "sourcePath")
419-
.addParameter(ClassName.get(Path.class), "destinationPath")
433+
.addParameter(inputVarParam)
434+
.addParameter(srcFileParam)
435+
.addParameter(dstFileParam)
420436
.addJavadoc(opModel.getDocs(model, ClientType.SYNC, SimpleMethodOverload.FILE))
421437
.addExceptions(getExceptionClasses(model, opModel))
422-
.addStatement("return $L($L, $T.fromFile(sourcePath), $T.toFile(destinationPath))",
423-
opModel.getMethodName(),
424-
opModel.getInput().getVariableName(),
425-
ClassName.get(RequestBody.class),
426-
ClassName.get(ResponseTransformer.class))
438+
.addStatement("return $L($N, $T.fromFile($N), $T.toFile($N))",
439+
methodName,
440+
inputVarParam,
441+
ClassName.get(RequestBody.class), srcFileParam,
442+
ClassName.get(ResponseTransformer.class),
443+
dstFileParam)
427444
.build();
428445
}
429446

0 commit comments

Comments
 (0)