Skip to content

Commit 84435a5

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1890 from aws/staging/d867a9f6-aaed-4341-b251-d1997319a224
Pull request: release <- staging/d867a9f6-aaed-4341-b251-d1997319a224
2 parents f79eef2 + d3cb242 commit 84435a5

File tree

374 files changed

+850
-438
lines changed

Some content is hidden

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

374 files changed

+850
-438
lines changed

‎.changes/2.17.109.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2.17.109",
3+
"date": "2022-01-11",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Elastic Compute Cloud",
8+
"contributor": "",
9+
"description": "EC2 Capacity Reservations now supports RHEL instance platforms (RHEL with SQL Server Standard, RHEL with SQL Server Enterprise, RHEL with SQL Server Web, RHEL with HA, RHEL with HA and SQL Server Standard, RHEL with HA and SQL Server Enterprise)"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Cost Explorer Service",
14+
"contributor": "",
15+
"description": "Doc only update for Cost Explorer API that fixes missing clarifications for MatchOptions definitions"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon WorkSpaces",
20+
"contributor": "",
21+
"description": "Introducing new APIs for Workspaces audio optimization with Amazon Connect: CreateConnectClientAddIn, DescribeConnectClientAddIns, UpdateConnectClientAddIn and DeleteConnectClientAddIn."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "FinSpace Public API",
26+
"contributor": "",
27+
"description": "Documentation updates for FinSpace."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWSKendraFrontendService",
32+
"contributor": "",
33+
"description": "Amazon Kendra now supports advanced query language and query-less search."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS IoT Events Data",
38+
"contributor": "",
39+
"description": "This release provides documentation updates for Timer.timestamp in the IoT Events API Reference Guide."
40+
},
41+
{
42+
"type": "bugfix",
43+
"category": "AWS SDK for Java v2",
44+
"contributor": "",
45+
"description": "Fix an issue where the error response handler is not set for eventstream operations on XML services, for example `SelectObjectContent` for Amazon S3."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Relational Database Service",
50+
"contributor": "",
51+
"description": "This release adds the db-proxy event type to support subscribing to RDS Proxy events."
52+
}
53+
]
54+
}

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
# __2.17.109__ __2022-01-11__
2+
## __AWS Cost Explorer Service__
3+
- ### Features
4+
- Doc only update for Cost Explorer API that fixes missing clarifications for MatchOptions definitions
5+
6+
## __AWS IoT Events Data__
7+
- ### Features
8+
- This release provides documentation updates for Timer.timestamp in the IoT Events API Reference Guide.
9+
10+
## __AWS SDK for Java v2__
11+
- ### Bugfixes
12+
- Fix an issue where the error response handler is not set for eventstream operations on XML services, for example `SelectObjectContent` for Amazon S3.
13+
14+
## __AWSKendraFrontendService__
15+
- ### Features
16+
- Amazon Kendra now supports advanced query language and query-less search.
17+
18+
## __Amazon Elastic Compute Cloud__
19+
- ### Features
20+
- EC2 Capacity Reservations now supports RHEL instance platforms (RHEL with SQL Server Standard, RHEL with SQL Server Enterprise, RHEL with SQL Server Web, RHEL with HA, RHEL with HA and SQL Server Standard, RHEL with HA and SQL Server Enterprise)
21+
22+
## __Amazon Relational Database Service__
23+
- ### Features
24+
- This release adds the db-proxy event type to support subscribing to RDS Proxy events.
25+
26+
## __Amazon WorkSpaces__
27+
- ### Features
28+
- Introducing new APIs for Workspaces audio optimization with Amazon Connect: CreateConnectClientAddIn, DescribeConnectClientAddIns, UpdateConnectClientAddIn and DeleteConnectClientAddIn.
29+
30+
## __FinSpace Public API__
31+
- ### Features
32+
- Documentation updates for FinSpace.
33+
134
# __2.17.108__ __2022-01-10__
235
## __AWS Compute Optimizer__
336
- ### 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.108</version>
55+
<version>2.17.109</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.108</version>
89+
<version>2.17.109</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.108</version>
94+
<version>2.17.109</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.108</version>
106+
<version>2.17.109</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.108</version>
23+
<version>2.17.109</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.108</version>
23+
<version>2.17.109</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.108</version>
23+
<version>2.17.109</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.108</version>
23+
<version>2.17.109</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.108</version>
20+
<version>2.17.109</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.108</version>
23+
<version>2.17.109</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.108</version>
20+
<version>2.17.109</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/SdkIllegalImportCheck.java

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,27 @@ public class SdkIllegalImportCheck extends AbstractCheck {
3333
private final List<Pattern> illegalPackagesRegexps = new ArrayList<>();
3434
private final List<String> illegalPackages = new ArrayList<>();
3535

36-
private String classNameToCheck;
36+
private Pattern classNameToCheck;
37+
private Pattern packageToCheck;
38+
3739
private boolean containsIllegalImport = false;
38-
private boolean checkImport = false;
40+
private boolean classMatched = false;
41+
private boolean classPackageMatched = false;
3942

4043
public void setClassNameToCheck(String classNameToCheck) {
41-
this.classNameToCheck = classNameToCheck;
44+
this.classNameToCheck = CommonUtil.createPattern(classNameToCheck);
45+
}
46+
47+
public void setPackageToCheck(String packageToCheckRegexp) {
48+
this.packageToCheck = CommonUtil.createPattern(packageToCheckRegexp);
4249
}
4350

4451
public final void setIllegalPkgs(String... from) {
4552
illegalPackages.clear();
4653
illegalPackages.addAll(Arrays.asList(from));
4754
illegalPackagesRegexps.clear();
4855
for (String illegalPkg : illegalPackages) {
49-
illegalPackagesRegexps.add(CommonUtil.createPattern("^" + illegalPkg + "\\..*"));
56+
illegalPackagesRegexps.add(CommonUtil.createPattern("^" + illegalPkg));
5057
}
5158
}
5259

@@ -62,18 +69,24 @@ public int[] getAcceptableTokens() {
6269

6370
@Override
6471
public int[] getRequiredTokens() {
65-
return new int[] {TokenTypes.CLASS_DEF, TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
72+
return new int[] {TokenTypes.PACKAGE_DEF, TokenTypes.CLASS_DEF, TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
6673
}
6774

6875
@Override
6976
public void beginTree(DetailAST rootAST) {
7077
containsIllegalImport = false;
71-
checkImport = false;
78+
classMatched = false;
79+
classPackageMatched = false;
7280
}
7381

7482
@Override
7583
public void finishTree(DetailAST rootAST) {
76-
if (containsIllegalImport && checkImport) {
84+
// Set matched to true if no class package regex provided
85+
if (packageToCheck == null) {
86+
classPackageMatched = true;
87+
}
88+
89+
if (containsIllegalImport && classMatched && classPackageMatched) {
7790
log(rootAST, "Illegal imports found " + illegalPackagesRegexps);
7891
}
7992
}
@@ -82,12 +95,16 @@ public void finishTree(DetailAST rootAST) {
8295
public void visitToken(DetailAST ast) {
8396

8497
FullIdent importedPackage = null;
98+
FullIdent classPackage = null;
8599

86100
switch (ast.getType()) {
101+
case TokenTypes.PACKAGE_DEF:
102+
classPackage = FullIdent.createFullIdent(ast.findFirstToken(TokenTypes.DOT));
103+
break;
87104
case TokenTypes.CLASS_DEF:
88105
String className = ast.findFirstToken(TokenTypes.IDENT).getText();
89-
if (className.equals(classNameToCheck)) {
90-
checkImport = true;
106+
if (classNameToCheck.matcher(className).matches()) {
107+
classMatched = true;
91108
}
92109
break;
93110
case TokenTypes.IMPORT:
@@ -98,6 +115,12 @@ public void visitToken(DetailAST ast) {
98115
break;
99116
}
100117

118+
if (packageToCheck != null
119+
&& classPackage != null
120+
&& packageToCheck.matcher(classPackage.getText()).matches()) {
121+
classPackageMatched = true;
122+
}
123+
101124
if (importedPackage!= null && isIllegalImport(importedPackage.getText())) {
102125
containsIllegalImport = true;
103126
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,18 @@
408408

409409
<module name="software.amazon.awssdk.buildtools.checkstyle.SdkIllegalImportCheck">
410410
<property name="classNameToCheck" value="StaticTableSchema"/>
411-
<property name="illegalPkgs" value="java.lang.reflect"/>
411+
<property name="illegalPkgs" value="java.lang.reflect.*"/>
412412
</module>
413413

414414
<module name="software.amazon.awssdk.buildtools.checkstyle.SdkIllegalImportCheck">
415415
<property name="classNameToCheck" value="StaticImmutableTableSchema"/>
416-
<property name="illegalPkgs" value="java.lang.reflect"/>
416+
<property name="illegalPkgs" value="java.lang.reflect.*"/>
417+
</module>
418+
419+
<module name="software.amazon.awssdk.buildtools.checkstyle.SdkIllegalImportCheck">
420+
<property name="classNameToCheck" value=".*"/>
421+
<property name="packageToCheck" value="software.amazon.awssdk.http.nio.netty" />
422+
<property name="illegalPkgs" value="software.amazon.awssdk.utils.Logger,org.slf4j.Logger"/>
417423
</module>
418424
</module>
419425

‎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.108</version>
24+
<version>2.17.109</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.108</version>
25+
<version>2.17.109</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.108</version>
24+
<version>2.17.109</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.108</version>
25+
<version>2.17.109</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.108</version>
24+
<version>2.17.109</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/XmlProtocolSpec.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
195195
.add(".withMarshaller($L)\n", asyncMarshaller(intermediateModel, opModel, marshaller, "protocolFactory"));
196196

197197
if (opModel.hasEventStreamOutput()) {
198-
builder.add(".withResponseHandler(responseHandler)");
198+
builder.add(".withResponseHandler(responseHandler)")
199+
.add(".withErrorResponseHandler(errorResponseHandler)");
199200
} else {
200201
builder.add(".withCombinedResponseHandler(responseHandler)");
201202
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-async-client-class.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,9 @@ public CompletableFuture<Void> eventStreamOperation(EventStreamOperationRequest
263263
new ClientExecutionParams<EventStreamOperationRequest, EventStreamOperationResponse>()
264264
.withOperationName("EventStreamOperation")
265265
.withMarshaller(new EventStreamOperationRequestMarshaller(protocolFactory))
266-
.withResponseHandler(responseHandler).withMetricCollector(apiCallMetricCollector)
267-
.withInput(eventStreamOperationRequest), restAsyncResponseTransformer);
266+
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
267+
.withMetricCollector(apiCallMetricCollector).withInput(eventStreamOperationRequest),
268+
restAsyncResponseTransformer);
268269
CompletableFuture<Void> whenCompleteFuture = null;
269270
whenCompleteFuture = executeFuture.whenComplete((r, e) -> {
270271
if (e != null) {

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.108</version>
23+
<version>2.17.109</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.108</version>
23+
<version>2.17.109</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth-crt/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>core</artifactId>
25-
<version>2.17.108</version>
25+
<version>2.17.109</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>

0 commit comments

Comments
 (0)