Skip to content

Commit 9f9a94a

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #3249 from aws/staging/d6dc3160-bbb0-4a8d-aefb-c77155347496
Pull request: release <- staging/d6dc3160-bbb0-4a8d-aefb-c77155347496
2 parents c8a6734 + 6026637 commit 9f9a94a

File tree

549 files changed

+2949
-1150
lines changed

Some content is hidden

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

549 files changed

+2949
-1150
lines changed

‎.changes/2.28.1.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"version": "2.28.1",
3+
"date": "2024-09-13",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Amazon S3",
8+
"contributor": "",
9+
"description": "Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time."
10+
},
11+
{
12+
"type": "bugfix",
13+
"category": "Amazon S3 Control",
14+
"contributor": "",
15+
"description": "Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Amplify",
20+
"contributor": "",
21+
"description": "Doc only update to Amplify to explain platform setting for Next.js 14 SSG only applications"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"description": "Add support for specifying endpoint overrides using environment variables, system properties or profile files. More information about this feature is available here: https://docs.aws.amazon.com/sdkref/latest/guide/feature-ss-endpoints.html"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Interactive Video Service",
32+
"contributor": "",
33+
"description": "Updates to all tags descriptions."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Interactive Video Service Chat",
38+
"contributor": "",
39+
"description": "Updates to all tags descriptions."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "AWS SDK for Java v2",
44+
"contributor": "",
45+
"description": "Updated endpoint and partition metadata."
46+
}
47+
]
48+
}

‎CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.28.1__ __2024-09-13__
3+
## __AWS Amplify__
4+
- ### Features
5+
- Doc only update to Amplify to explain platform setting for Next.js 14 SSG only applications
6+
7+
## __AWS SDK for Java v2__
8+
- ### Features
9+
- Add support for specifying endpoint overrides using environment variables, system properties or profile files. More information about this feature is available here: https://docs.aws.amazon.com/sdkref/latest/guide/feature-ss-endpoints.html
10+
- Updated endpoint and partition metadata.
11+
12+
## __Amazon Interactive Video Service__
13+
- ### Features
14+
- Updates to all tags descriptions.
15+
16+
## __Amazon Interactive Video Service Chat__
17+
- ### Features
18+
- Updates to all tags descriptions.
19+
20+
## __Amazon S3__
21+
- ### Bugfixes
22+
- Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time.
23+
24+
## __Amazon S3 Control__
25+
- ### Bugfixes
26+
- Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time.
27+
228
# __2.28.0__ __2024-09-12__
329
## __AWS Elemental MediaConvert__
430
- ### Features

‎CONTRIBUTING.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,9 @@ Please keep the following in mind when considering a code contribution:
9999
be assigned to it.
100100

101101
If you are thinking about adding entirely new functionality, open a [Feature
102-
Request](#feature-requests) or [ping][gitter] the maintainers to ask for
103-
feedback first before beginning work; again this is to make sure that no one
104-
else is already working on it, and also that it makes sense to be included in
105-
the SDK.
102+
Request](#feature-requests) to ask for feedback first before beginning work;
103+
again this is to make sure that no one else is already working on it, and
104+
also that it makes sense to be included in the SDK.
106105
* All code contributions must be accompanied with new or modified tests that
107106
verify that the code works as expected; i.e. that the issue has been fixed or
108107
that the functionality works as intended.
@@ -162,6 +161,5 @@ when contributing to the SDK.
162161
[label-doc-issue]: https://github.com/aws/aws-sdk-java-v2/labels/documentation
163162
[label-feature-request]: https://github.com/aws/aws-sdk-java-v2/labels/feature-request
164163
[git-rewriting-history]: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
165-
[gitter]: https://gitter.im/aws/aws-sdk-java-v2
166164
[bug-report]: https://github.com/aws/aws-sdk-java-v2/issues/new?assignees=&labels=bug%2Cneeds-triage&template=bug-report.yml&title=%28short+issue+description%29
167165
[feature-request]: https://github.com/aws/aws-sdk-java-v2/issues/new?assignees=&labels=feature-request%2Cneeds-triage&template=feature-request.yml&title=%28short+issue+description%29

‎README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# AWS SDK for Java 2.0
22
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiTFJSRXBBN1hkU1ZEQzZ4M1hoaWlFUExuNER3WjNpVllSQ09Qam1YdFlTSDNTd3RpZzNia3F0VkJRUTBwZlQwR1BEelpSV2dWVnp4YTBCOFZKRzRUR004PSIsIml2UGFyYW1ldGVyU3BlYyI6ImdHdEp1UHhKckpDRmhmQU4iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
33
[![Maven](https://img.shields.io/maven-central/v/software.amazon.awssdk/s3.svg?label=Maven)](https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22s3%22)
4-
[![Gitter](https://badges.gitter.im/aws/aws-sdk-java-v2.svg)](https://gitter.im/aws/aws-sdk-java-v2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
54
[![codecov](https://codecov.io/gh/aws/aws-sdk-java-v2/branch/master/graph/badge.svg)](https://codecov.io/gh/aws/aws-sdk-java-v2)
65
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
76
[![All Contributors](https://img.shields.io/badge/all_contributors-111-orange.svg?style=flat-square)](#contributors-)
@@ -52,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
5251
<dependency>
5352
<groupId>software.amazon.awssdk</groupId>
5453
<artifactId>bom</artifactId>
55-
<version>2.28.0</version>
54+
<version>2.28.1</version>
5655
<type>pom</type>
5756
<scope>import</scope>
5857
</dependency>
@@ -86,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
8685
<dependency>
8786
<groupId>software.amazon.awssdk</groupId>
8887
<artifactId>ec2</artifactId>
89-
<version>2.28.0</version>
88+
<version>2.28.1</version>
9089
</dependency>
9190
<dependency>
9291
<groupId>software.amazon.awssdk</groupId>
9392
<artifactId>s3</artifactId>
94-
<version>2.28.0</version>
93+
<version>2.28.1</version>
9594
</dependency>
9695
```
9796

@@ -103,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103102
<dependency>
104103
<groupId>software.amazon.awssdk</groupId>
105104
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.28.0</version>
105+
<version>2.28.1</version>
107106
</dependency>
108107
```
109108

@@ -173,7 +172,6 @@ We need your help in making this SDK great. Please participate in the community
173172
[sdk-website]: http://aws.amazon.com/sdkforjava
174173
[aws-java-sdk-bom]: https://github.com/aws/aws-sdk-java-v2/tree/master/bom
175174
[stack-overflow]: http://stackoverflow.com/questions/tagged/aws-java-sdk
176-
[gitter]: https://gitter.im/aws/aws-sdk-java-v2
177175
[features]: https://github.com/aws/aws-sdk-java-v2/issues?q=is%3Aopen+is%3Aissue+label%3A%22feature-request%22
178176
[support-center]: https://console.aws.amazon.com/support/
179177
[console]: https://console.aws.amazon.com

‎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.28.0</version>
23+
<version>2.28.1</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.28.0</version>
23+
<version>2.28.1</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.28.0</version>
23+
<version>2.28.1</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.28.0</version>
23+
<version>2.28.1</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.28.0</version>
20+
<version>2.28.1</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.28.0</version>
23+
<version>2.28.1</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.28.0</version>
20+
<version>2.28.1</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎bundle-logging-bridge/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.28.0</version>
24+
<version>2.28.1</version>
2525
</parent>
2626
<artifactId>bundle-logging-bridge</artifactId>
2727
<packaging>jar</packaging>

‎bundle-sdk/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.28.0</version>
24+
<version>2.28.1</version>
2525
</parent>
2626
<artifactId>bundle-sdk</artifactId>
2727
<packaging>jar</packaging>

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package software.amazon.awssdk.codegen.internal;
1717

1818
import static java.util.stream.Collectors.toList;
19+
import static software.amazon.awssdk.utils.StringUtils.lowerCase;
1920

2021
import java.io.Closeable;
2122
import java.io.File;
@@ -133,7 +134,7 @@ public static String removeLeading(String str, String toRemove) {
133134
if (str == null) {
134135
return null;
135136
}
136-
if (str.startsWith(toRemove)) {
137+
if (lowerCase(str).startsWith(lowerCase(toRemove))) {
137138
return str.substring(toRemove.length());
138139
}
139140
return str;
@@ -143,7 +144,7 @@ public static String removeTrailing(String str, String toRemove) {
143144
if (str == null) {
144145
return null;
145146
}
146-
if (str.endsWith(toRemove)) {
147+
if (lowerCase(str).endsWith(lowerCase(toRemove))) {
147148
return str.substring(0, str.length() - toRemove.length());
148149
}
149150
return str;

‎codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,42 @@ private static boolean isJavaKeyword(String word) {
114114

115115
@Override
116116
public String getServiceName() {
117-
String baseName = Stream.of(serviceModel.getMetadata().getServiceId())
118-
.filter(Objects::nonNull)
119-
.filter(s -> !s.trim().isEmpty())
120-
.findFirst()
121-
.orElseThrow(() -> new IllegalStateException("ServiceId is missing in the c2j model."));
122-
117+
String baseName = serviceId();
123118
baseName = pascalCase(baseName);
119+
baseName = removeRedundantPrefixesAndSuffixes(baseName);
120+
return baseName;
121+
}
124122

125-
// Special cases
126-
baseName = Utils.removeLeading(baseName, "Amazon");
127-
baseName = Utils.removeLeading(baseName, "Aws");
128-
baseName = Utils.removeTrailing(baseName, "Service");
123+
@Override
124+
public String getServiceNameForEnvironmentVariables() {
125+
String baseName = serviceId();
126+
baseName = baseName.replace(' ', '_');
127+
baseName = StringUtils.upperCase(baseName);
128+
return baseName;
129+
}
130+
131+
@Override
132+
public String getServiceNameForSystemProperties() {
133+
return getServiceName();
134+
}
135+
136+
@Override
137+
public String getServiceNameForProfileFile() {
138+
return StringUtils.lowerCase(getServiceNameForEnvironmentVariables());
139+
}
140+
141+
private String serviceId() {
142+
return Stream.of(serviceModel.getMetadata().getServiceId())
143+
.filter(Objects::nonNull)
144+
.filter(s -> !s.trim().isEmpty())
145+
.findFirst()
146+
.orElseThrow(() -> new IllegalStateException("ServiceId is missing in the c2j model."));
147+
}
129148

149+
private static String removeRedundantPrefixesAndSuffixes(String baseName) {
150+
baseName = Utils.removeLeading(baseName, "amazon");
151+
baseName = Utils.removeLeading(baseName, "aws");
152+
baseName = Utils.removeTrailing(baseName, "service");
130153
return baseName;
131154
}
132155

‎codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,21 @@ public interface NamingStrategy {
2929
*/
3030
String getServiceName();
3131

32+
/**
33+
* Retrieve the service name that should be used for environment variables.
34+
*/
35+
String getServiceNameForEnvironmentVariables();
36+
37+
/**
38+
* Retrieve the service name that should be used for system properties.
39+
*/
40+
String getServiceNameForSystemProperties();
41+
42+
/**
43+
* Retrieve the service name that should be used for profile properties.
44+
*/
45+
String getServiceNameForProfileFile();
46+
3247
/**
3348
* Retrieve the client package name that should be used based on the service name.
3449
*/

0 commit comments

Comments
 (0)