Skip to content

Commit 0bdcfa8

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1508 from aws/staging/0e98db51-e3f2-4ad9-bc9b-dec41408062a
Pull request: release <- staging/0e98db51-e3f2-4ad9-bc9b-dec41408062a
2 parents 062c39d + 74ff870 commit 0bdcfa8

File tree

369 files changed

+5149
-621
lines changed

Some content is hidden

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

369 files changed

+5149
-621
lines changed

‎.changes/2.16.94.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": "2.16.94",
3+
"date": "2021-07-01",
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": "Amazon Simple Queue Service",
14+
"contributor": "",
15+
"description": "Documentation updates for Amazon SQS."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon SageMaker Service",
20+
"contributor": "",
21+
"description": "SageMaker model registry now supports up to 5 containers and associated environment variables."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Elastic Compute Cloud",
26+
"contributor": "",
27+
"description": "Adding a new reserved field to support future infrastructure improvements for Amazon EC2 Fleet."
28+
}
29+
]
30+
}

‎CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# __2.16.94__ __2021-07-01__
2+
## __AWS SDK for Java v2__
3+
- ### Features
4+
- Updated service endpoint metadata.
5+
6+
## __Amazon Elastic Compute Cloud__
7+
- ### Features
8+
- Adding a new reserved field to support future infrastructure improvements for Amazon EC2 Fleet.
9+
10+
## __Amazon SageMaker Service__
11+
- ### Features
12+
- SageMaker model registry now supports up to 5 containers and associated environment variables.
13+
14+
## __Amazon Simple Queue Service__
15+
- ### Features
16+
- Documentation updates for Amazon SQS.
17+
118
# __2.16.93__ __2021-06-30__
219
## __AWS Cloud Map__
320
- ### Features

‎README.md

+4-4
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.93</version>
55+
<version>2.16.94</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.93</version>
89+
<version>2.16.94</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.16.93</version>
94+
<version>2.16.94</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.93</version>
106+
<version>2.16.94</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

+1-1
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.93</version>
23+
<version>2.16.94</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

+1-1
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.93</version>
23+
<version>2.16.94</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

+1-1
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.93</version>
23+
<version>2.16.94</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

+1-1
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.93</version>
23+
<version>2.16.94</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

+1-1
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.93</version>
20+
<version>2.16.94</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

+1-1
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.93</version>
23+
<version>2.16.94</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

+1-1
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.93</version>
20+
<version>2.16.94</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎bundle/pom.xml

+1-1
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.93</version>
24+
<version>2.16.94</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

+1-1
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.93</version>
25+
<version>2.16.94</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

+1-1
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.93</version>
24+
<version>2.16.94</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

+1-1
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.93</version>
25+
<version>2.16.94</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

+1-1
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.93</version>
24+
<version>2.16.94</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

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

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import software.amazon.awssdk.codegen.model.service.Shape;
3232
import software.amazon.awssdk.codegen.naming.NamingStrategy;
3333
import software.amazon.awssdk.core.SdkBytes;
34+
import software.amazon.awssdk.core.document.Document;
3435

3536
/**
3637
* Used to determine the Java types for the service model.
@@ -68,6 +69,7 @@ public static final class TypeKey {
6869
DATA_TYPE_MAPPINGS.put("biginteger", BigInteger.class.getName());
6970
DATA_TYPE_MAPPINGS.put("list", List.class.getSimpleName());
7071
DATA_TYPE_MAPPINGS.put("map", Map.class.getSimpleName());
72+
DATA_TYPE_MAPPINGS.put("document", Document.class.getName());
7173
DATA_TYPE_MAPPINGS.put(TypeKey.LIST_INTERFACE, List.class.getName());
7274
DATA_TYPE_MAPPINGS.put(TypeKey.LIST_DEFAULT_IMPL, ArrayList.class.getName());
7375
DATA_TYPE_MAPPINGS.put(TypeKey.MAP_INTERFACE, Map.class.getName());
@@ -85,6 +87,7 @@ public static final class TypeKey {
8587
MARSHALLING_TYPE_MAPPINGS.put("InputStream", "STREAM");
8688
MARSHALLING_TYPE_MAPPINGS.put("Short", "SHORT");
8789
MARSHALLING_TYPE_MAPPINGS.put(null, "NULL");
90+
MARSHALLING_TYPE_MAPPINGS.put("Document", "DOCUMENT");
8891
}
8992

9093
private final NamingStrategy namingStrategy;
@@ -133,6 +136,10 @@ public String getJavaDataType(Map<String, Shape> shapes, String shapeName,
133136

134137
String shapeType = shape.getType();
135138

139+
if (shape.isDocument()) {
140+
return DATA_TYPE_MAPPINGS.get("document");
141+
}
142+
136143
if (Structure.getName().equals(shapeType)) {
137144
return namingStrategy.getShapeClassName(shapeName);
138145
} else if (List.getName().equals(shapeType)) {

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

+11
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public class ShapeModel extends DocumentationModel implements HasDeprecation {
6868

6969
private XmlNamespace xmlNamespace;
7070

71+
private boolean document;
72+
7173
public ShapeModel() {
7274
}
7375

@@ -582,4 +584,13 @@ public ShapeModel withXmlNamespace(XmlNamespace xmlNamespace) {
582584
public void setXmlNamespace(XmlNamespace xmlNamespace) {
583585
this.xmlNamespace = xmlNamespace;
584586
}
587+
588+
public boolean isDocument() {
589+
return document;
590+
}
591+
592+
public ShapeModel withIsDocument(boolean document) {
593+
this.document = document;
594+
return this;
595+
}
585596
}

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

+10
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ public class Shape {
7070

7171
private XmlNamespace xmlNamespace;
7272

73+
private boolean document;
74+
7375
public boolean isFault() {
7476
return fault;
7577
}
@@ -298,4 +300,12 @@ public void setXmlNamespace(XmlNamespace xmlNamespace) {
298300
this.xmlNamespace = xmlNamespace;
299301
}
300302

303+
public boolean isDocument() {
304+
return document;
305+
}
306+
307+
public void setDocument(boolean document) {
308+
this.document = document;
309+
}
310+
301311
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
3737
import software.amazon.awssdk.codegen.poet.PoetExtensions;
3838
import software.amazon.awssdk.core.SdkBytes;
39+
import software.amazon.awssdk.core.document.Document;
3940

4041
/**
4142
* Helper class for resolving Poet {@link TypeName}s for use in model classes.
@@ -94,7 +95,8 @@ public TypeName getTypeNameForSimpleType(String simpleType) {
9495
BigDecimal.class,
9596
SdkBytes.class,
9697
InputStream.class,
97-
Instant.class)
98+
Instant.class,
99+
Document.class)
98100
.filter(cls -> cls.getName().equals(simpleType) || cls.getSimpleName().equals(simpleType))
99101
.map(ClassName::get)
100102
.findFirst()

0 commit comments

Comments
 (0)