resolveHttpMonitoringOptions(CrtConnectionHealthConfiguration config) {
+ if (config == null) {
+ return Optional.empty();
+ }
+
+ HttpMonitoringOptions httpMonitoringOptions = new HttpMonitoringOptions();
+ httpMonitoringOptions.setMinThroughputBytesPerSecond(config.minimumThroughputInBps());
+ int seconds = NumericUtils.saturatedCast(config.minimumThroughputTimeout().getSeconds());
+ httpMonitoringOptions.setAllowableThroughputFailureIntervalSeconds(seconds);
+ return Optional.of(httpMonitoringOptions);
+ }
+
+}
diff --git a/core/crt-core/src/main/java/software/amazon/awssdk/crtcore/CrtConnectionHealthConfiguration.java b/core/crt-core/src/main/java/software/amazon/awssdk/crtcore/CrtConnectionHealthConfiguration.java
new file mode 100644
index 000000000000..55af5ee279d8
--- /dev/null
+++ b/core/crt-core/src/main/java/software/amazon/awssdk/crtcore/CrtConnectionHealthConfiguration.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.crtcore;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * The base class for CRT connection health configuration
+ */
+@SdkPublicApi
+public abstract class CrtConnectionHealthConfiguration {
+ private final long minimumThroughputInBps;
+ private final Duration minimumThroughputTimeout;
+
+ protected CrtConnectionHealthConfiguration(DefaultBuilder builder) {
+ this.minimumThroughputInBps = Validate.paramNotNull(builder.minimumThroughputInBps,
+ "minimumThroughputInBps");
+ this.minimumThroughputTimeout = Validate.isPositive(builder.minimumThroughputTimeout,
+ "minimumThroughputTimeout");
+ }
+
+ /**
+ * @return the minimum amount of throughput, in bytes per second, for a connection to be considered healthy.
+ */
+ public final long minimumThroughputInBps() {
+ return minimumThroughputInBps;
+ }
+
+ /**
+ * @return How long a connection is allowed to be unhealthy before getting shut down.
+ */
+ public final Duration minimumThroughputTimeout() {
+ return minimumThroughputTimeout;
+ }
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ CrtConnectionHealthConfiguration that = (CrtConnectionHealthConfiguration) o;
+
+ if (minimumThroughputInBps != that.minimumThroughputInBps) {
+ return false;
+ }
+ return minimumThroughputTimeout.equals(that.minimumThroughputTimeout);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = (int) (minimumThroughputInBps ^ (minimumThroughputInBps >>> 32));
+ result = 31 * result + minimumThroughputTimeout.hashCode();
+ return result;
+ }
+
+ /**
+ * A builder for {@link CrtConnectionHealthConfiguration}.
+ *
+ * All implementations of this interface are mutable and not thread safe.
+ */
+ public interface Builder {
+
+ /**
+ * Sets a throughput threshold for connections. Throughput below this value will be considered unhealthy.
+ *
+ * @param minimumThroughputInBps minimum amount of throughput, in bytes per second, for a connection to be
+ * considered healthy.
+ * @return Builder
+ */
+ Builder minimumThroughputInBps(Long minimumThroughputInBps);
+
+ /**
+ * Sets how long a connection is allowed to be unhealthy before getting shut down.
+ *
+ *
+ * It only supports seconds precision
+ *
+ * @param minimumThroughputTimeout How long a connection is allowed to be unhealthy
+ * before getting shut down.
+ * @return Builder
+ */
+ Builder minimumThroughputTimeout(Duration minimumThroughputTimeout);
+
+ CrtConnectionHealthConfiguration build();
+ }
+
+ protected abstract static class DefaultBuilder implements Builder {
+ private Long minimumThroughputInBps;
+ private Duration minimumThroughputTimeout;
+
+ protected DefaultBuilder() {
+ }
+
+ protected DefaultBuilder(CrtConnectionHealthConfiguration configuration) {
+ this.minimumThroughputInBps = configuration.minimumThroughputInBps;
+ this.minimumThroughputTimeout = configuration.minimumThroughputTimeout;
+ }
+
+ @Override
+ public B minimumThroughputInBps(Long minimumThroughputInBps) {
+ this.minimumThroughputInBps = minimumThroughputInBps;
+ return (B) this;
+ }
+
+ @Override
+ public B minimumThroughputTimeout(Duration minimumThroughputTimeout) {
+ this.minimumThroughputTimeout = minimumThroughputTimeout;
+ return (B) this;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/core/crt-core/src/main/java/software/amazon/awssdk/crtcore/CrtProxyConfiguration.java b/core/crt-core/src/main/java/software/amazon/awssdk/crtcore/CrtProxyConfiguration.java
new file mode 100644
index 000000000000..3cfc11df621b
--- /dev/null
+++ b/core/crt-core/src/main/java/software/amazon/awssdk/crtcore/CrtProxyConfiguration.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.crtcore;
+
+import java.util.Objects;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.utils.ProxySystemSetting;
+
+/**
+ * The base class for AWS CRT proxy configuration
+ */
+@SdkPublicApi
+public abstract class CrtProxyConfiguration {
+ private static final String HTTPS = "https";
+ private final String scheme;
+ private final String host;
+ private final int port;
+
+ private final String username;
+ private final String password;
+ private final Boolean useSystemPropertyValues;
+
+ protected CrtProxyConfiguration(DefaultBuilder builder) {
+ this.useSystemPropertyValues = builder.useSystemPropertyValues;
+ this.scheme = builder.scheme;
+ this.host = resolveHost(builder.host);
+ this.port = resolvePort(builder.port);
+ this.username = builder.username;
+ this.password = builder.password;
+ }
+
+ /**
+ * @return The proxy scheme.
+ */
+ public final String scheme() {
+ return scheme;
+ }
+
+ /**
+ * @return The proxy host from the configuration if set, else from the "https.proxyHost" or "http.proxyHost" system property,
+ * based on the scheme used, if {@link Builder#useSystemPropertyValues(Boolean)} is set to true
+ */
+ public final String host() {
+ return host;
+ }
+
+ /**
+ * @return The proxy port from the configuration if set, else from the "https.proxyPort" or "http.proxyPort" system property,
+ * based on the scheme used, if {@link Builder#useSystemPropertyValues(Boolean)} is set to true
+ */
+ public final int port() {
+ return port;
+ }
+
+ /**
+ * @return The proxy username from the configuration if set, else from the "https.proxyUser" or "http.proxyUser" system
+ * property, based on the scheme used, if {@link Builder#useSystemPropertyValues(Boolean)} is set to true
+ * */
+ public final String username() {
+ if (Objects.equals(scheme(), HTTPS)) {
+ return resolveValue(username, ProxySystemSetting.HTTPS_PROXY_USERNAME);
+ }
+ return resolveValue(username, ProxySystemSetting.PROXY_USERNAME);
+ }
+
+ /**
+ * @return The proxy password from the configuration if set, else from the "https.proxyPassword" or "http.proxyPassword"
+ * system property, based on the scheme used, if {@link Builder#useSystemPropertyValues(Boolean)} is set
+ * to true
+ * */
+ public final String password() {
+ if (Objects.equals(scheme(), HTTPS)) {
+ return resolveValue(password, ProxySystemSetting.HTTPS_PROXY_PASSWORD);
+ }
+ return resolveValue(password, ProxySystemSetting.PROXY_PASSWORD);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ CrtProxyConfiguration that = (CrtProxyConfiguration) o;
+
+ if (port != that.port) {
+ return false;
+ }
+ if (!Objects.equals(scheme, that.scheme)) {
+ return false;
+ }
+ if (!Objects.equals(host, that.host)) {
+ return false;
+ }
+ if (!Objects.equals(username, that.username)) {
+ return false;
+ }
+ if (!Objects.equals(password, that.password)) {
+ return false;
+ }
+ return Objects.equals(useSystemPropertyValues, that.useSystemPropertyValues);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = scheme != null ? scheme.hashCode() : 0;
+ result = 31 * result + (host != null ? host.hashCode() : 0);
+ result = 31 * result + port;
+ result = 31 * result + (username != null ? username.hashCode() : 0);
+ result = 31 * result + (password != null ? password.hashCode() : 0);
+ result = 31 * result + (useSystemPropertyValues != null ? useSystemPropertyValues.hashCode() : 0);
+ return result;
+ }
+
+ /**
+ * Builder for {@link CrtProxyConfiguration}.
+ */
+ public interface Builder {
+
+ /**
+ * Set the hostname of the proxy.
+ * @param host The proxy host.
+ * @return This object for method chaining.
+ */
+ Builder host(String host);
+
+ /**
+ * Set the port that the proxy expects connections on.
+ * @param port The proxy port.
+ * @return This object for method chaining.
+ */
+ Builder port(int port);
+
+ /**
+ * The HTTP scheme to use for connecting to the proxy. Valid values are {@code http} and {@code https}.
+ *
+ * The client defaults to {@code http} if none is given.
+ *
+ * @param scheme The proxy scheme.
+ * @return This object for method chaining.
+ */
+ Builder scheme(String scheme);
+
+ /**
+ * The username to use for basic proxy authentication
+ *
+ * If not set, the client will not use basic authentication
+ *
+ * @param username The basic authentication username.
+ * @return This object for method chaining.
+ */
+ Builder username(String username);
+
+ /**
+ * The password to use for basic proxy authentication
+ *
+ * If not set, the client will not use basic authentication
+ *
+ * @param password The basic authentication password.
+ * @return This object for method chaining.
+ */
+ Builder password(String password);
+
+ /**
+ * The option whether to use system property values from {@link ProxySystemSetting} if any of the config options
+ * are missing. The value is set to "true" by default which means SDK will automatically use system property values if
+ * options are not provided during building the {@link CrtProxyConfiguration} object. To disable this behaviour, set this
+ * value to false.
+ *
+ * @param useSystemPropertyValues The option whether to use system property values
+ * @return This object for method chaining.
+ */
+ Builder useSystemPropertyValues(Boolean useSystemPropertyValues);
+
+ CrtProxyConfiguration build();
+ }
+
+ private String resolveHost(String host) {
+ if (Objects.equals(scheme(), HTTPS)) {
+ return resolveValue(host, ProxySystemSetting.HTTPS_PROXY_HOST);
+ }
+ return resolveValue(host, ProxySystemSetting.PROXY_HOST);
+ }
+
+ private int resolvePort(int port) {
+ if (port == 0 && Boolean.TRUE.equals(useSystemPropertyValues)) {
+ if (Objects.equals(scheme(), HTTPS)) {
+ return ProxySystemSetting.HTTPS_PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0);
+ }
+ return ProxySystemSetting.PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0);
+ }
+ return port;
+ }
+
+ /**
+ * Uses the configuration options, system setting property and returns the final value of the given member.
+ */
+ private String resolveValue(String value, ProxySystemSetting systemSetting) {
+ return value == null && Boolean.TRUE.equals(useSystemPropertyValues) ?
+ systemSetting.getStringValue().orElse(null) : value;
+ }
+
+ protected abstract static class DefaultBuilder implements Builder {
+ private String scheme;
+ private String host;
+ private int port = 0;
+ private String username;
+ private String password;
+ private Boolean useSystemPropertyValues = Boolean.TRUE;
+
+ protected DefaultBuilder() {
+ }
+
+ protected DefaultBuilder(CrtProxyConfiguration proxyConfiguration) {
+ this.useSystemPropertyValues = proxyConfiguration.useSystemPropertyValues;
+ this.scheme = proxyConfiguration.scheme;
+ this.host = proxyConfiguration.host;
+ this.port = proxyConfiguration.port;
+ this.username = proxyConfiguration.username;
+ this.password = proxyConfiguration.password;
+ }
+
+ @Override
+ public B scheme(String scheme) {
+ this.scheme = scheme;
+ return (B) this;
+ }
+
+ @Override
+ public B host(String host) {
+ this.host = host;
+ return (B) this;
+ }
+
+ @Override
+ public B port(int port) {
+ this.port = port;
+ return (B) this;
+ }
+
+ @Override
+ public B username(String username) {
+ this.username = username;
+ return (B) this;
+ }
+
+ @Override
+ public B password(String password) {
+ this.password = password;
+ return (B) this;
+ }
+
+ @Override
+ public B useSystemPropertyValues(Boolean useSystemPropertyValues) {
+ this.useSystemPropertyValues = useSystemPropertyValues;
+ return (B) this;
+ }
+
+ public void setUseSystemPropertyValues(Boolean useSystemPropertyValues) {
+ useSystemPropertyValues(useSystemPropertyValues);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/core/crt-core/src/test/java/software/amazon/awssdk/crtcore/CrtConnectionUtilsTest.java b/core/crt-core/src/test/java/software/amazon/awssdk/crtcore/CrtConnectionUtilsTest.java
new file mode 100644
index 000000000000..2c68f6b4cefc
--- /dev/null
+++ b/core/crt-core/src/test/java/software/amazon/awssdk/crtcore/CrtConnectionUtilsTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.crtcore;
+
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.time.Duration;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import software.amazon.awssdk.crt.http.HttpMonitoringOptions;
+import software.amazon.awssdk.crt.http.HttpProxyOptions;
+import software.amazon.awssdk.crt.io.TlsContext;
+
+class CrtConnectionUtilsTest {
+
+ @Test
+ void resolveProxy_basicAuthorization() {
+ CrtProxyConfiguration configuration = new TestProxy.Builder().host("1.2.3.4")
+ .port(123)
+ .scheme("https")
+ .password("bar")
+ .username("foo")
+ .build();
+
+ TlsContext tlsContext = Mockito.mock(TlsContext.class);
+
+ Optional httpProxyOptions = CrtConfigurationUtils.resolveProxy(configuration, tlsContext);
+ assertThat(httpProxyOptions).hasValueSatisfying(proxy -> {
+ assertThat(proxy.getTlsContext()).isEqualTo(tlsContext);
+ assertThat(proxy.getAuthorizationPassword()).isEqualTo("bar");
+ assertThat(proxy.getAuthorizationUsername()).isEqualTo("foo");
+ assertThat(proxy.getAuthorizationType()).isEqualTo(HttpProxyOptions.HttpProxyAuthorizationType.Basic);
+ });
+ }
+
+ @Test
+ void resolveProxy_emptyProxy_shouldReturnEmpty() {
+ TlsContext tlsContext = Mockito.mock(TlsContext.class);
+ assertThat(CrtConfigurationUtils.resolveProxy(null, tlsContext)).isEmpty();
+ }
+
+ @Test
+ void resolveProxy_noneAuthorization() {
+ CrtProxyConfiguration configuration = new TestProxy.Builder().host("1.2.3.4")
+ .port(123)
+ .build();
+ TlsContext tlsContext = Mockito.mock(TlsContext.class);
+
+ Optional httpProxyOptions = CrtConfigurationUtils.resolveProxy(configuration, tlsContext);
+ assertThat(httpProxyOptions).hasValueSatisfying(proxy -> {
+ assertThat(proxy.getTlsContext()).isNull();
+ assertThat(proxy.getAuthorizationPassword()).isNull();
+ assertThat(proxy.getAuthorizationUsername()).isNull();
+ assertThat(proxy.getAuthorizationType()).isEqualTo(HttpProxyOptions.HttpProxyAuthorizationType.None);
+ });
+ }
+
+ @Test
+ void resolveHttpMonitoringOptions_shouldMap() {
+ CrtConnectionHealthConfiguration configuration = new TestConnectionHealthConfiguration.Builder()
+ .minimumThroughputInBps(123L)
+ .minimumThroughputTimeout(Duration.ofSeconds(5))
+ .build();
+
+ Optional options = CrtConfigurationUtils.resolveHttpMonitoringOptions(configuration);
+ assertThat(options).hasValueSatisfying(proxy -> {
+ assertThat(proxy.getAllowableThroughputFailureIntervalSeconds()).isEqualTo(5);
+ assertThat(proxy.getMinThroughputBytesPerSecond()).isEqualTo(123L);
+ });
+ }
+
+ @Test
+ void resolveHttpMonitoringOptions_nullConfig_shouldReturnEmpty() {
+ assertThat(CrtConfigurationUtils.resolveHttpMonitoringOptions(null)).isEmpty();
+ }
+
+ private static final class TestProxy extends CrtProxyConfiguration {
+ private TestProxy(DefaultBuilder builder) {
+ super(builder);
+ }
+
+ private static final class Builder extends CrtProxyConfiguration.DefaultBuilder {
+
+ @Override
+ public TestProxy build() {
+ return new TestProxy(this);
+ }
+ }
+ }
+
+ private static final class TestConnectionHealthConfiguration extends CrtConnectionHealthConfiguration {
+ private TestConnectionHealthConfiguration(DefaultBuilder builder) {
+ super(builder);
+ }
+
+ private static final class Builder extends CrtConnectionHealthConfiguration.DefaultBuilder {
+
+ @Override
+ public TestConnectionHealthConfiguration build() {
+ return new TestConnectionHealthConfiguration(this);
+ }
+ }
+ }
+
+}
diff --git a/core/endpoints-spi/pom.xml b/core/endpoints-spi/pom.xml
index 84042f3a7c7f..0aa9a2141334 100644
--- a/core/endpoints-spi/pom.xml
+++ b/core/endpoints-spi/pom.xml
@@ -20,7 +20,7 @@
core
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/http-auth-aws-crt/pom.xml b/core/http-auth-aws-crt/pom.xml
index 4ca68f4572c6..1de8248d1edc 100644
--- a/core/http-auth-aws-crt/pom.xml
+++ b/core/http-auth-aws-crt/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
http-auth-aws-crt
diff --git a/core/http-auth-aws/pom.xml b/core/http-auth-aws/pom.xml
index 214e803f2461..c95f477c045b 100644
--- a/core/http-auth-aws/pom.xml
+++ b/core/http-auth-aws/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
http-auth-aws
diff --git a/core/http-auth-event-stream/pom.xml b/core/http-auth-event-stream/pom.xml
index 3d5ae0cafc99..ed42cab8ac7f 100644
--- a/core/http-auth-event-stream/pom.xml
+++ b/core/http-auth-event-stream/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
http-auth-event-stream
diff --git a/core/http-auth-spi/pom.xml b/core/http-auth-spi/pom.xml
index 49c91de8d2f8..81e3440fffb7 100644
--- a/core/http-auth-spi/pom.xml
+++ b/core/http-auth-spi/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
http-auth-spi
diff --git a/core/http-auth/pom.xml b/core/http-auth/pom.xml
index 645e14a79944..095f4491859f 100644
--- a/core/http-auth/pom.xml
+++ b/core/http-auth/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
http-auth
diff --git a/core/identity-spi/pom.xml b/core/identity-spi/pom.xml
index e27bac4c330a..11ffb3f6a9cb 100644
--- a/core/identity-spi/pom.xml
+++ b/core/identity-spi/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
identity-spi
diff --git a/core/imds/pom.xml b/core/imds/pom.xml
index d8525f8081eb..a008eb7297f8 100644
--- a/core/imds/pom.xml
+++ b/core/imds/pom.xml
@@ -20,7 +20,7 @@
core
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
imds
diff --git a/core/json-utils/pom.xml b/core/json-utils/pom.xml
index 1adc7e0ae068..158a44e40bce 100644
--- a/core/json-utils/pom.xml
+++ b/core/json-utils/pom.xml
@@ -20,7 +20,7 @@
core
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml
index 219cb31af175..751952165516 100644
--- a/core/metrics-spi/pom.xml
+++ b/core/metrics-spi/pom.xml
@@ -5,7 +5,7 @@
core
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/pom.xml b/core/pom.xml
index 1c670572a9e8..b13e43084281 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
aws-sdk-java-pom
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
core
@@ -52,6 +52,7 @@
json-utils
endpoints-spi
imds
+ crt-core
diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml
index 6a2490e9d0ca..907453d0665a 100644
--- a/core/profiles/pom.xml
+++ b/core/profiles/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
profiles
diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSupplier.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSupplier.java
index 1521fdcfbc2d..4dec2883c814 100644
--- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSupplier.java
+++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSupplier.java
@@ -16,9 +16,11 @@
package software.amazon.awssdk.profiles;
import java.nio.file.Path;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
import software.amazon.awssdk.annotations.SdkPublicApi;
@@ -119,7 +121,8 @@ static ProfileFileSupplier aggregate(ProfileFileSupplier... suppliers) {
return new ProfileFileSupplier() {
final AtomicReference currentAggregateProfileFile = new AtomicReference<>();
- final ConcurrentHashMap, ProfileFile> currentValuesBySupplier = new ConcurrentHashMap<>();
+ final Map, ProfileFile> currentValuesBySupplier
+ = Collections.synchronizedMap(new LinkedHashMap<>());
@Override
public ProfileFile get() {
diff --git a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileSupplierTest.java b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileSupplierTest.java
index e51bc53101f0..50e4c80ecc58 100644
--- a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileSupplierTest.java
+++ b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileSupplierTest.java
@@ -410,6 +410,56 @@ void aggregate_supplierReturnsSameInstanceMultipleTimesAggregatingProfileFileSup
assertThat(suppliedProfileFiles).isEqualTo(distinctAggregateProfileFiles);
}
+ @Test
+ void aggregate_duplicateOptionsGivenFixedProfileFirst_preservesPrecedence() {
+ ProfileFile configFile1 = configFile("profile default", Pair.of("aws_access_key_id", "config-key"));
+ Path credentialsFilePath = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");
+
+ ProfileFileSupplier supplier = ProfileFileSupplier.aggregate(
+ ProfileFileSupplier.fixedProfileFile(configFile1),
+ ProfileFileSupplier.reloadWhenModified(credentialsFilePath, ProfileFile.Type.CREDENTIALS));
+
+ ProfileFile profileFile = supplier.get();
+ String accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+ assertThat(accessKeyId).isEqualTo("config-key");
+
+ generateTestCredentialsFile("defaultAccessKey2", "defaultSecretAccessKey2");
+
+ profileFile = supplier.get();
+ accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+ assertThat(accessKeyId).isEqualTo("config-key");
+ }
+
+ @Test
+ void aggregate_duplicateOptionsGivenReloadingProfileFirst_preservesPrecedence() {
+ AdjustableClock clock = new AdjustableClock();
+
+ ProfileFile configFile1 = configFile("profile default", Pair.of("aws_access_key_id", "config-key"));
+ Path credentialsFilePath = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");
+
+ ProfileFileSupplier supplier = ProfileFileSupplier.aggregate(
+ builderWithClock(clock)
+ .reloadWhenModified(credentialsFilePath, ProfileFile.Type.CREDENTIALS)
+ .build(),
+ ProfileFileSupplier.fixedProfileFile(configFile1));
+
+ ProfileFile profileFile = supplier.get();
+ String accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+ assertThat(accessKeyId).isEqualTo("defaultAccessKey");
+
+ generateTestCredentialsFile("defaultAccessKey2", "defaultSecretAccessKey2");
+
+ clock.tickForward(Duration.ofMillis(1_000));
+
+ profileFile = supplier.get();
+ accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+ assertThat(accessKeyId).isEqualTo("defaultAccessKey2");
+ }
+
@Test
void fixedProfileFile_nullProfileFile_returnsNonNullSupplier() {
ProfileFile file = null;
diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
index 015b496a2d2b..736a48399b54 100644
--- a/core/protocols/aws-cbor-protocol/pom.xml
+++ b/core/protocols/aws-cbor-protocol/pom.xml
@@ -20,7 +20,7 @@
protocols
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml
index ce870e28ab51..1c80af70bf4b 100644
--- a/core/protocols/aws-json-protocol/pom.xml
+++ b/core/protocols/aws-json-protocol/pom.xml
@@ -20,7 +20,7 @@
protocols
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml
index 1ea2cc4dee43..29a3be5b4708 100644
--- a/core/protocols/aws-query-protocol/pom.xml
+++ b/core/protocols/aws-query-protocol/pom.xml
@@ -20,7 +20,7 @@
protocols
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml
index 181e5b4e12a3..a1862072d270 100644
--- a/core/protocols/aws-xml-protocol/pom.xml
+++ b/core/protocols/aws-xml-protocol/pom.xml
@@ -20,7 +20,7 @@
protocols
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml
index e939a3bbdaae..9b0e8c26068d 100644
--- a/core/protocols/pom.xml
+++ b/core/protocols/pom.xml
@@ -20,7 +20,7 @@
core
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
index ec8c8624fd9a..9ea8d6e6b3c9 100644
--- a/core/protocols/protocol-core/pom.xml
+++ b/core/protocols/protocol-core/pom.xml
@@ -20,7 +20,7 @@
protocols
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/core/regions/pom.xml b/core/regions/pom.xml
index 487303ef148a..95c7a732bffe 100644
--- a/core/regions/pom.xml
+++ b/core/regions/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
regions
diff --git a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
index 3ad6571b7fd0..9df71e31801d 100644
--- a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
+++ b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
@@ -316,9 +316,11 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : {
"variants" : [ {
"hostname" : "acm-pca-fips.ca-central-1.amazonaws.com",
@@ -326,8 +328,10 @@
} ]
},
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -447,6 +451,7 @@
"ca-central-1" : { },
"eu-central-1" : { },
"eu-north-1" : { },
+ "eu-south-1" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -468,6 +473,7 @@
"ca-central-1" : { },
"eu-central-1" : { },
"eu-north-1" : { },
+ "eu-south-1" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -1066,13 +1072,16 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -1365,15 +1374,21 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : { },
@@ -1446,6 +1461,7 @@
"ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
"eu-north-1" : { },
@@ -1665,6 +1681,9 @@
"apprunner" : {
"endpoints" : {
"ap-northeast-1" : { },
+ "ap-southeast-1" : { },
+ "ap-southeast-2" : { },
+ "eu-central-1" : { },
"eu-west-1" : { },
"fips-us-east-1" : {
"credentialScope" : {
@@ -1769,16 +1788,20 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : { },
@@ -1806,13 +1829,23 @@
},
"arc-zonal-shift" : {
"endpoints" : {
+ "af-south-1" : { },
+ "ap-east-1" : { },
"ap-northeast-1" : { },
+ "ap-northeast-2" : { },
+ "ap-northeast-3" : { },
+ "ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ca-central-1" : { },
"eu-central-1" : { },
"eu-north-1" : { },
"eu-west-1" : { },
+ "eu-west-2" : { },
+ "eu-west-3" : { },
+ "me-south-1" : { },
+ "sa-east-1" : { },
"us-east-1" : { },
"us-east-2" : { },
"us-west-2" : { }
@@ -2248,6 +2281,11 @@
},
"cases" : {
"endpoints" : {
+ "ap-southeast-1" : { },
+ "ap-southeast-2" : { },
+ "ca-central-1" : { },
+ "eu-central-1" : { },
+ "eu-west-2" : { },
"fips-us-east-1" : {
"deprecated" : true
},
@@ -2763,13 +2801,16 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -2847,8 +2888,10 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ap-southeast-3" : { },
"ca-central-1" : {
"variants" : [ {
"hostname" : "codecommit-fips.ca-central-1.amazonaws.com",
@@ -2875,6 +2918,7 @@
"deprecated" : true,
"hostname" : "codecommit-fips.ca-central-1.amazonaws.com"
},
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
@@ -3026,6 +3070,7 @@
},
"codepipeline" : {
"endpoints" : {
+ "af-south-1" : { },
"ap-east-1" : { },
"ap-northeast-1" : { },
"ap-northeast-2" : { },
@@ -3039,6 +3084,7 @@
} ]
},
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
"eu-west-1" : { },
@@ -3079,6 +3125,7 @@
"deprecated" : true,
"hostname" : "codepipeline-fips.us-west-2.amazonaws.com"
},
+ "me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
"variants" : [ {
@@ -3636,6 +3683,7 @@
"connect-campaigns" : {
"endpoints" : {
"ap-southeast-2" : { },
+ "ca-central-1" : { },
"eu-west-2" : { },
"fips-us-east-1" : {
"credentialScope" : {
@@ -4391,8 +4439,10 @@
"ap-southeast-4" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -4627,6 +4677,7 @@
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : {
"variants" : [ {
"hostname" : "ds-fips.ca-central-1.amazonaws.com",
@@ -5123,6 +5174,7 @@
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : { },
"eu-central-1" : { },
"eu-central-2" : { },
@@ -5387,6 +5439,12 @@
"tags" : [ "fips" ]
} ]
},
+ "ap-south-2" : {
+ "variants" : [ {
+ "hostname" : "elasticfilesystem-fips.ap-south-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"ap-southeast-1" : {
"variants" : [ {
"hostname" : "elasticfilesystem-fips.ap-southeast-1.amazonaws.com",
@@ -5405,6 +5463,12 @@
"tags" : [ "fips" ]
} ]
},
+ "ap-southeast-4" : {
+ "variants" : [ {
+ "hostname" : "elasticfilesystem-fips.ap-southeast-4.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"ca-central-1" : {
"variants" : [ {
"hostname" : "elasticfilesystem-fips.ca-central-1.amazonaws.com",
@@ -5501,6 +5565,13 @@
"deprecated" : true,
"hostname" : "elasticfilesystem-fips.ap-south-1.amazonaws.com"
},
+ "fips-ap-south-2" : {
+ "credentialScope" : {
+ "region" : "ap-south-2"
+ },
+ "deprecated" : true,
+ "hostname" : "elasticfilesystem-fips.ap-south-2.amazonaws.com"
+ },
"fips-ap-southeast-1" : {
"credentialScope" : {
"region" : "ap-southeast-1"
@@ -5522,6 +5593,13 @@
"deprecated" : true,
"hostname" : "elasticfilesystem-fips.ap-southeast-3.amazonaws.com"
},
+ "fips-ap-southeast-4" : {
+ "credentialScope" : {
+ "region" : "ap-southeast-4"
+ },
+ "deprecated" : true,
+ "hostname" : "elasticfilesystem-fips.ap-southeast-4.amazonaws.com"
+ },
"fips-ca-central-1" : {
"credentialScope" : {
"region" : "ca-central-1"
@@ -6315,6 +6393,7 @@
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : { },
"eu-central-1" : { },
"eu-central-2" : { },
@@ -6417,6 +6496,7 @@
"tags" : [ "fips" ]
} ]
},
+ "ap-south-2" : { },
"ap-southeast-1" : {
"variants" : [ {
"hostname" : "fms-fips.ap-southeast-1.amazonaws.com",
@@ -6442,6 +6522,7 @@
"tags" : [ "fips" ]
} ]
},
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : {
"variants" : [ {
@@ -6449,6 +6530,7 @@
"tags" : [ "fips" ]
} ]
},
+ "eu-south-2" : { },
"eu-west-1" : {
"variants" : [ {
"hostname" : "fms-fips.eu-west-1.amazonaws.com",
@@ -7071,8 +7153,10 @@
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -7207,13 +7291,61 @@
"ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
- "ca-central-1" : { },
+ "ca-central-1" : {
+ "variants" : [ {
+ "hostname" : "greengrass-fips.ca-central-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"eu-central-1" : { },
"eu-west-1" : { },
"eu-west-2" : { },
- "us-east-1" : { },
- "us-east-2" : { },
- "us-west-2" : { }
+ "fips-ca-central-1" : {
+ "credentialScope" : {
+ "region" : "ca-central-1"
+ },
+ "deprecated" : true,
+ "hostname" : "greengrass-fips.ca-central-1.amazonaws.com"
+ },
+ "fips-us-east-1" : {
+ "credentialScope" : {
+ "region" : "us-east-1"
+ },
+ "deprecated" : true,
+ "hostname" : "greengrass-fips.us-east-1.amazonaws.com"
+ },
+ "fips-us-east-2" : {
+ "credentialScope" : {
+ "region" : "us-east-2"
+ },
+ "deprecated" : true,
+ "hostname" : "greengrass-fips.us-east-2.amazonaws.com"
+ },
+ "fips-us-west-2" : {
+ "credentialScope" : {
+ "region" : "us-west-2"
+ },
+ "deprecated" : true,
+ "hostname" : "greengrass-fips.us-west-2.amazonaws.com"
+ },
+ "us-east-1" : {
+ "variants" : [ {
+ "hostname" : "greengrass-fips.us-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-east-2" : {
+ "variants" : [ {
+ "hostname" : "greengrass-fips.us-east-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-west-2" : {
+ "variants" : [ {
+ "hostname" : "greengrass-fips.us-west-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ }
},
"isRegionalized" : true
},
@@ -7280,6 +7412,7 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
@@ -7388,6 +7521,7 @@
"protocols" : [ "https" ]
},
"endpoints" : {
+ "ap-south-1" : { },
"us-east-1" : { },
"us-east-2" : { },
"us-west-2" : { }
@@ -7642,6 +7776,99 @@
"us-west-2" : { }
}
},
+ "internetmonitor" : {
+ "defaults" : {
+ "dnsSuffix" : "api.aws",
+ "variants" : [ {
+ "dnsSuffix" : "api.aws",
+ "hostname" : "{service}-fips.{region}.{dnsSuffix}",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "endpoints" : {
+ "af-south-1" : {
+ "hostname" : "internetmonitor.af-south-1.api.aws"
+ },
+ "ap-east-1" : {
+ "hostname" : "internetmonitor.ap-east-1.api.aws"
+ },
+ "ap-northeast-1" : {
+ "hostname" : "internetmonitor.ap-northeast-1.api.aws"
+ },
+ "ap-northeast-2" : {
+ "hostname" : "internetmonitor.ap-northeast-2.api.aws"
+ },
+ "ap-northeast-3" : {
+ "hostname" : "internetmonitor.ap-northeast-3.api.aws"
+ },
+ "ap-south-1" : {
+ "hostname" : "internetmonitor.ap-south-1.api.aws"
+ },
+ "ap-south-2" : {
+ "hostname" : "internetmonitor.ap-south-2.api.aws"
+ },
+ "ap-southeast-1" : {
+ "hostname" : "internetmonitor.ap-southeast-1.api.aws"
+ },
+ "ap-southeast-2" : {
+ "hostname" : "internetmonitor.ap-southeast-2.api.aws"
+ },
+ "ap-southeast-3" : {
+ "hostname" : "internetmonitor.ap-southeast-3.api.aws"
+ },
+ "ap-southeast-4" : {
+ "hostname" : "internetmonitor.ap-southeast-4.api.aws"
+ },
+ "ca-central-1" : {
+ "hostname" : "internetmonitor.ca-central-1.api.aws"
+ },
+ "eu-central-1" : {
+ "hostname" : "internetmonitor.eu-central-1.api.aws"
+ },
+ "eu-central-2" : {
+ "hostname" : "internetmonitor.eu-central-2.api.aws"
+ },
+ "eu-north-1" : {
+ "hostname" : "internetmonitor.eu-north-1.api.aws"
+ },
+ "eu-south-1" : {
+ "hostname" : "internetmonitor.eu-south-1.api.aws"
+ },
+ "eu-south-2" : {
+ "hostname" : "internetmonitor.eu-south-2.api.aws"
+ },
+ "eu-west-1" : {
+ "hostname" : "internetmonitor.eu-west-1.api.aws"
+ },
+ "eu-west-2" : {
+ "hostname" : "internetmonitor.eu-west-2.api.aws"
+ },
+ "eu-west-3" : {
+ "hostname" : "internetmonitor.eu-west-3.api.aws"
+ },
+ "me-central-1" : {
+ "hostname" : "internetmonitor.me-central-1.api.aws"
+ },
+ "me-south-1" : {
+ "hostname" : "internetmonitor.me-south-1.api.aws"
+ },
+ "sa-east-1" : {
+ "hostname" : "internetmonitor.sa-east-1.api.aws"
+ },
+ "us-east-1" : {
+ "hostname" : "internetmonitor.us-east-1.api.aws"
+ },
+ "us-east-2" : {
+ "hostname" : "internetmonitor.us-east-2.api.aws"
+ },
+ "us-west-1" : {
+ "hostname" : "internetmonitor.us-west-1.api.aws"
+ },
+ "us-west-2" : {
+ "hostname" : "internetmonitor.us-west-2.api.aws"
+ }
+ }
+ },
"iot" : {
"defaults" : {
"credentialScope" : {
@@ -8110,8 +8337,32 @@
"ap-southeast-2" : { },
"eu-central-1" : { },
"eu-west-1" : { },
- "us-east-1" : { },
- "us-west-2" : { }
+ "fips-us-east-1" : {
+ "credentialScope" : {
+ "region" : "us-east-1"
+ },
+ "deprecated" : true,
+ "hostname" : "iottwinmaker-fips.us-east-1.amazonaws.com"
+ },
+ "fips-us-west-2" : {
+ "credentialScope" : {
+ "region" : "us-west-2"
+ },
+ "deprecated" : true,
+ "hostname" : "iottwinmaker-fips.us-west-2.amazonaws.com"
+ },
+ "us-east-1" : {
+ "variants" : [ {
+ "hostname" : "iottwinmaker-fips.us-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-west-2" : {
+ "variants" : [ {
+ "hostname" : "iottwinmaker-fips.us-west-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ }
}
},
"iotwireless" : {
@@ -8170,6 +8421,17 @@
"us-west-2" : { }
}
},
+ "ivsrealtime" : {
+ "endpoints" : {
+ "ap-northeast-1" : { },
+ "ap-northeast-2" : { },
+ "ap-south-1" : { },
+ "eu-central-1" : { },
+ "eu-west-1" : { },
+ "us-east-1" : { },
+ "us-west-2" : { }
+ }
+ },
"kafka" : {
"endpoints" : {
"af-south-1" : { },
@@ -8188,6 +8450,7 @@
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : { },
@@ -8281,12 +8544,18 @@
"ap-east-1" : {
"hostname" : "kendra-ranking.ap-east-1.api.aws"
},
+ "ap-northeast-1" : {
+ "hostname" : "kendra-ranking.ap-northeast-1.api.aws"
+ },
"ap-northeast-2" : {
"hostname" : "kendra-ranking.ap-northeast-2.api.aws"
},
"ap-northeast-3" : {
"hostname" : "kendra-ranking.ap-northeast-3.api.aws"
},
+ "ap-south-1" : {
+ "hostname" : "kendra-ranking.ap-south-1.api.aws"
+ },
"ap-south-2" : {
"hostname" : "kendra-ranking.ap-south-2.api.aws"
},
@@ -8433,16 +8702,20 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : { },
@@ -8843,10 +9116,13 @@
"ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -8878,6 +9154,7 @@
"deprecated" : true,
"hostname" : "lakeformation-fips.us-west-2.amazonaws.com"
},
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
@@ -9188,15 +9465,23 @@
},
"license-manager-linux-subscriptions" : {
"endpoints" : {
+ "af-south-1" : { },
+ "ap-east-1" : { },
"ap-northeast-1" : { },
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
+ "eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -9228,6 +9513,8 @@
"deprecated" : true,
"hostname" : "license-manager-linux-subscriptions-fips.us-west-2.amazonaws.com"
},
+ "me-central-1" : { },
+ "me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
"variants" : [ {
@@ -9999,8 +10286,10 @@
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"me-central-1" : { },
@@ -10069,6 +10358,7 @@
"deprecated" : true,
"hostname" : "mgn-fips.us-west-2.amazonaws.com"
},
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
@@ -10520,6 +10810,7 @@
"deprecated" : true,
"hostname" : "network-firewall-fips.us-west-2.amazonaws.com"
},
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
@@ -10737,9 +11028,71 @@
}
}
},
- "opsworks" : {
+ "omics" : {
"endpoints" : {
- "ap-northeast-1" : { },
+ "ap-southeast-1" : {
+ "credentialScope" : {
+ "region" : "ap-southeast-1"
+ },
+ "hostname" : "omics.ap-southeast-1.amazonaws.com"
+ },
+ "eu-central-1" : {
+ "credentialScope" : {
+ "region" : "eu-central-1"
+ },
+ "hostname" : "omics.eu-central-1.amazonaws.com"
+ },
+ "eu-west-1" : {
+ "credentialScope" : {
+ "region" : "eu-west-1"
+ },
+ "hostname" : "omics.eu-west-1.amazonaws.com"
+ },
+ "eu-west-2" : {
+ "credentialScope" : {
+ "region" : "eu-west-2"
+ },
+ "hostname" : "omics.eu-west-2.amazonaws.com"
+ },
+ "fips-us-east-1" : {
+ "credentialScope" : {
+ "region" : "us-east-1"
+ },
+ "deprecated" : true,
+ "hostname" : "omics-fips.us-east-1.amazonaws.com"
+ },
+ "fips-us-west-2" : {
+ "credentialScope" : {
+ "region" : "us-west-2"
+ },
+ "deprecated" : true,
+ "hostname" : "omics-fips.us-west-2.amazonaws.com"
+ },
+ "us-east-1" : {
+ "credentialScope" : {
+ "region" : "us-east-1"
+ },
+ "hostname" : "omics.us-east-1.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "omics-fips.us-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-west-2" : {
+ "credentialScope" : {
+ "region" : "us-west-2"
+ },
+ "hostname" : "omics.us-west-2.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "omics-fips.us-west-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ }
+ }
+ },
+ "opsworks" : {
+ "endpoints" : {
+ "ap-northeast-1" : { },
"ap-northeast-2" : { },
"ap-south-1" : { },
"ap-southeast-1" : { },
@@ -11080,6 +11433,7 @@
"ap-east-1" : { },
"ap-northeast-1" : { },
"ap-northeast-2" : { },
+ "ap-northeast-3" : { },
"ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
@@ -11391,7 +11745,6 @@
"ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
- "api" : { },
"ca-central-1" : { },
"eu-central-1" : { },
"eu-north-1" : { },
@@ -11416,6 +11769,7 @@
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : {
"variants" : [ {
"hostname" : "ram-fips.ca-central-1.amazonaws.com",
@@ -11923,14 +12277,18 @@
"endpoints" : {
"ap-northeast-1" : { },
"ap-northeast-2" : { },
+ "ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ca-central-1" : { },
"eu-central-1" : { },
"eu-north-1" : { },
"eu-west-1" : { },
"eu-west-2" : { },
+ "eu-west-3" : { },
"us-east-1" : { },
"us-east-2" : { },
+ "us-west-1" : { },
"us-west-2" : { }
}
},
@@ -12368,8 +12726,10 @@
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -12470,13 +12830,16 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -13167,14 +13530,32 @@
},
"scheduler" : {
"endpoints" : {
+ "af-south-1" : { },
+ "ap-east-1" : { },
"ap-northeast-1" : { },
+ "ap-northeast-2" : { },
+ "ap-northeast-3" : { },
+ "ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ap-southeast-3" : { },
+ "ap-southeast-4" : { },
+ "ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
+ "eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
+ "eu-west-2" : { },
+ "eu-west-3" : { },
+ "me-central-1" : { },
+ "me-south-1" : { },
+ "sa-east-1" : { },
"us-east-1" : { },
"us-east-2" : { },
+ "us-west-1" : { },
"us-west-2" : { }
}
},
@@ -13316,13 +13697,16 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -13386,9 +13770,12 @@
"securitylake" : {
"endpoints" : {
"ap-northeast-1" : { },
+ "ap-southeast-1" : { },
"ap-southeast-2" : { },
"eu-central-1" : { },
"eu-west-1" : { },
+ "eu-west-2" : { },
+ "sa-east-1" : { },
"us-east-1" : { },
"us-east-2" : { },
"us-west-2" : { }
@@ -13463,16 +13850,21 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
@@ -13678,6 +14070,12 @@
"tags" : [ "dualstack" ]
} ]
},
+ "ap-southeast-4" : {
+ "variants" : [ {
+ "hostname" : "servicediscovery.ap-southeast-4.amazonaws.com",
+ "tags" : [ "dualstack" ]
+ } ]
+ },
"ca-central-1" : {
"variants" : [ {
"hostname" : "servicediscovery-fips.ca-central-1.amazonaws.com",
@@ -13854,13 +14252,17 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : { },
"eu-central-1" : { },
+ "eu-central-2" : { },
"eu-north-1" : { },
"eu-south-1" : { },
+ "eu-south-2" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
@@ -14590,19 +14992,79 @@
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
- "ca-central-1" : { },
+ "ca-central-1" : {
+ "variants" : [ {
+ "hostname" : "ssm-sap-fips.ca-central-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"eu-central-1" : { },
"eu-north-1" : { },
"eu-south-1" : { },
"eu-west-1" : { },
"eu-west-2" : { },
"eu-west-3" : { },
+ "fips-ca-central-1" : {
+ "credentialScope" : {
+ "region" : "ca-central-1"
+ },
+ "deprecated" : true,
+ "hostname" : "ssm-sap-fips.ca-central-1.amazonaws.com"
+ },
+ "fips-us-east-1" : {
+ "credentialScope" : {
+ "region" : "us-east-1"
+ },
+ "deprecated" : true,
+ "hostname" : "ssm-sap-fips.us-east-1.amazonaws.com"
+ },
+ "fips-us-east-2" : {
+ "credentialScope" : {
+ "region" : "us-east-2"
+ },
+ "deprecated" : true,
+ "hostname" : "ssm-sap-fips.us-east-2.amazonaws.com"
+ },
+ "fips-us-west-1" : {
+ "credentialScope" : {
+ "region" : "us-west-1"
+ },
+ "deprecated" : true,
+ "hostname" : "ssm-sap-fips.us-west-1.amazonaws.com"
+ },
+ "fips-us-west-2" : {
+ "credentialScope" : {
+ "region" : "us-west-2"
+ },
+ "deprecated" : true,
+ "hostname" : "ssm-sap-fips.us-west-2.amazonaws.com"
+ },
"me-south-1" : { },
"sa-east-1" : { },
- "us-east-1" : { },
- "us-east-2" : { },
- "us-west-1" : { },
- "us-west-2" : { }
+ "us-east-1" : {
+ "variants" : [ {
+ "hostname" : "ssm-sap-fips.us-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-east-2" : {
+ "variants" : [ {
+ "hostname" : "ssm-sap-fips.us-east-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-west-1" : {
+ "variants" : [ {
+ "hostname" : "ssm-sap-fips.us-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-west-2" : {
+ "variants" : [ {
+ "hostname" : "ssm-sap-fips.us-west-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ }
}
},
"sso" : {
@@ -14718,9 +15180,11 @@
"ap-northeast-2" : { },
"ap-northeast-3" : { },
"ap-south-1" : { },
+ "ap-south-2" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
"ap-southeast-3" : { },
+ "ap-southeast-4" : { },
"ca-central-1" : {
"variants" : [ {
"hostname" : "storagegateway-fips.ca-central-1.amazonaws.com",
@@ -15451,6 +15915,7 @@
"deprecated" : true,
"hostname" : "transfer-fips.us-west-2.amazonaws.com"
},
+ "me-central-1" : { },
"me-south-1" : { },
"sa-east-1" : { },
"us-east-1" : {
@@ -15635,6 +16100,17 @@
}
}
},
+ "vpc-lattice" : {
+ "endpoints" : {
+ "ap-northeast-1" : { },
+ "ap-southeast-1" : { },
+ "ap-southeast-2" : { },
+ "eu-west-1" : { },
+ "us-east-1" : { },
+ "us-east-2" : { },
+ "us-west-2" : { }
+ }
+ },
"waf" : {
"endpoints" : {
"aws" : {
@@ -15737,6 +16213,16 @@
"tags" : [ "fips" ]
} ]
},
+ "ap-south-2" : {
+ "credentialScope" : {
+ "region" : "ap-south-2"
+ },
+ "hostname" : "waf-regional.ap-south-2.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "waf-regional-fips.ap-south-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"ap-southeast-1" : {
"credentialScope" : {
"region" : "ap-southeast-1"
@@ -15767,6 +16253,16 @@
"tags" : [ "fips" ]
} ]
},
+ "ap-southeast-4" : {
+ "credentialScope" : {
+ "region" : "ap-southeast-4"
+ },
+ "hostname" : "waf-regional.ap-southeast-4.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "waf-regional-fips.ap-southeast-4.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"ca-central-1" : {
"credentialScope" : {
"region" : "ca-central-1"
@@ -15787,6 +16283,16 @@
"tags" : [ "fips" ]
} ]
},
+ "eu-central-2" : {
+ "credentialScope" : {
+ "region" : "eu-central-2"
+ },
+ "hostname" : "waf-regional.eu-central-2.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "waf-regional-fips.eu-central-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"eu-north-1" : {
"credentialScope" : {
"region" : "eu-north-1"
@@ -15807,6 +16313,16 @@
"tags" : [ "fips" ]
} ]
},
+ "eu-south-2" : {
+ "credentialScope" : {
+ "region" : "eu-south-2"
+ },
+ "hostname" : "waf-regional.eu-south-2.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "waf-regional-fips.eu-south-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"eu-west-1" : {
"credentialScope" : {
"region" : "eu-west-1"
@@ -15879,6 +16395,13 @@
"deprecated" : true,
"hostname" : "waf-regional-fips.ap-south-1.amazonaws.com"
},
+ "fips-ap-south-2" : {
+ "credentialScope" : {
+ "region" : "ap-south-2"
+ },
+ "deprecated" : true,
+ "hostname" : "waf-regional-fips.ap-south-2.amazonaws.com"
+ },
"fips-ap-southeast-1" : {
"credentialScope" : {
"region" : "ap-southeast-1"
@@ -15900,6 +16423,13 @@
"deprecated" : true,
"hostname" : "waf-regional-fips.ap-southeast-3.amazonaws.com"
},
+ "fips-ap-southeast-4" : {
+ "credentialScope" : {
+ "region" : "ap-southeast-4"
+ },
+ "deprecated" : true,
+ "hostname" : "waf-regional-fips.ap-southeast-4.amazonaws.com"
+ },
"fips-ca-central-1" : {
"credentialScope" : {
"region" : "ca-central-1"
@@ -15914,6 +16444,13 @@
"deprecated" : true,
"hostname" : "waf-regional-fips.eu-central-1.amazonaws.com"
},
+ "fips-eu-central-2" : {
+ "credentialScope" : {
+ "region" : "eu-central-2"
+ },
+ "deprecated" : true,
+ "hostname" : "waf-regional-fips.eu-central-2.amazonaws.com"
+ },
"fips-eu-north-1" : {
"credentialScope" : {
"region" : "eu-north-1"
@@ -15928,6 +16465,13 @@
"deprecated" : true,
"hostname" : "waf-regional-fips.eu-south-1.amazonaws.com"
},
+ "fips-eu-south-2" : {
+ "credentialScope" : {
+ "region" : "eu-south-2"
+ },
+ "deprecated" : true,
+ "hostname" : "waf-regional-fips.eu-south-2.amazonaws.com"
+ },
"fips-eu-west-1" : {
"credentialScope" : {
"region" : "eu-west-1"
@@ -16132,6 +16676,16 @@
"tags" : [ "fips" ]
} ]
},
+ "ap-south-2" : {
+ "credentialScope" : {
+ "region" : "ap-south-2"
+ },
+ "hostname" : "wafv2.ap-south-2.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "wafv2-fips.ap-south-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"ap-southeast-1" : {
"credentialScope" : {
"region" : "ap-southeast-1"
@@ -16162,6 +16716,16 @@
"tags" : [ "fips" ]
} ]
},
+ "ap-southeast-4" : {
+ "credentialScope" : {
+ "region" : "ap-southeast-4"
+ },
+ "hostname" : "wafv2.ap-southeast-4.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "wafv2-fips.ap-southeast-4.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"ca-central-1" : {
"credentialScope" : {
"region" : "ca-central-1"
@@ -16182,6 +16746,16 @@
"tags" : [ "fips" ]
} ]
},
+ "eu-central-2" : {
+ "credentialScope" : {
+ "region" : "eu-central-2"
+ },
+ "hostname" : "wafv2.eu-central-2.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "wafv2-fips.eu-central-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"eu-north-1" : {
"credentialScope" : {
"region" : "eu-north-1"
@@ -16202,6 +16776,16 @@
"tags" : [ "fips" ]
} ]
},
+ "eu-south-2" : {
+ "credentialScope" : {
+ "region" : "eu-south-2"
+ },
+ "hostname" : "wafv2.eu-south-2.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "wafv2-fips.eu-south-2.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
"eu-west-1" : {
"credentialScope" : {
"region" : "eu-west-1"
@@ -16274,6 +16858,13 @@
"deprecated" : true,
"hostname" : "wafv2-fips.ap-south-1.amazonaws.com"
},
+ "fips-ap-south-2" : {
+ "credentialScope" : {
+ "region" : "ap-south-2"
+ },
+ "deprecated" : true,
+ "hostname" : "wafv2-fips.ap-south-2.amazonaws.com"
+ },
"fips-ap-southeast-1" : {
"credentialScope" : {
"region" : "ap-southeast-1"
@@ -16295,6 +16886,13 @@
"deprecated" : true,
"hostname" : "wafv2-fips.ap-southeast-3.amazonaws.com"
},
+ "fips-ap-southeast-4" : {
+ "credentialScope" : {
+ "region" : "ap-southeast-4"
+ },
+ "deprecated" : true,
+ "hostname" : "wafv2-fips.ap-southeast-4.amazonaws.com"
+ },
"fips-ca-central-1" : {
"credentialScope" : {
"region" : "ca-central-1"
@@ -16304,10 +16902,17 @@
},
"fips-eu-central-1" : {
"credentialScope" : {
- "region" : "eu-central-1"
+ "region" : "eu-central-1"
+ },
+ "deprecated" : true,
+ "hostname" : "wafv2-fips.eu-central-1.amazonaws.com"
+ },
+ "fips-eu-central-2" : {
+ "credentialScope" : {
+ "region" : "eu-central-2"
},
"deprecated" : true,
- "hostname" : "wafv2-fips.eu-central-1.amazonaws.com"
+ "hostname" : "wafv2-fips.eu-central-2.amazonaws.com"
},
"fips-eu-north-1" : {
"credentialScope" : {
@@ -16323,6 +16928,13 @@
"deprecated" : true,
"hostname" : "wafv2-fips.eu-south-1.amazonaws.com"
},
+ "fips-eu-south-2" : {
+ "credentialScope" : {
+ "region" : "eu-south-2"
+ },
+ "deprecated" : true,
+ "hostname" : "wafv2-fips.eu-south-2.amazonaws.com"
+ },
"fips-eu-west-1" : {
"credentialScope" : {
"region" : "eu-west-1"
@@ -17006,7 +17618,10 @@
"protocols" : [ "https" ]
},
"endpoints" : {
- "cn-north-1" : { },
+ "cn-north-1" : {
+ "hostname" : "data.ats.iot.cn-north-1.amazonaws.com.cn",
+ "protocols" : [ "https" ]
+ },
"cn-northwest-1" : { }
}
},
@@ -17296,6 +17911,24 @@
"isRegionalized" : false,
"partitionEndpoint" : "aws-cn-global"
},
+ "internetmonitor" : {
+ "defaults" : {
+ "dnsSuffix" : "api.amazonwebservices.com.cn",
+ "variants" : [ {
+ "dnsSuffix" : "api.amazonwebservices.com.cn",
+ "hostname" : "{service}-fips.{region}.{dnsSuffix}",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "endpoints" : {
+ "cn-north-1" : {
+ "hostname" : "internetmonitor.cn-north-1.api.amazonwebservices.com.cn"
+ },
+ "cn-northwest-1" : {
+ "hostname" : "internetmonitor.cn-northwest-1.api.amazonwebservices.com.cn"
+ }
+ }
+ },
"iot" : {
"defaults" : {
"credentialScope" : {
@@ -17472,6 +18105,12 @@
}
}
},
+ "oam" : {
+ "endpoints" : {
+ "cn-north-1" : { },
+ "cn-northwest-1" : { }
+ }
+ },
"organizations" : {
"endpoints" : {
"aws-cn-global" : {
@@ -17548,6 +18187,12 @@
"cn-northwest-1" : { }
}
},
+ "rolesanywhere" : {
+ "endpoints" : {
+ "cn-north-1" : { },
+ "cn-northwest-1" : { }
+ }
+ },
"route53" : {
"endpoints" : {
"aws-cn-global" : {
@@ -17682,6 +18327,15 @@
}
}
},
+ "servicequotas" : {
+ "defaults" : {
+ "protocols" : [ "https" ]
+ },
+ "endpoints" : {
+ "cn-north-1" : { },
+ "cn-northwest-1" : { }
+ }
+ },
"sms" : {
"endpoints" : {
"cn-north-1" : { },
@@ -17959,12 +18613,34 @@
"credentialScope" : {
"region" : "us-gov-east-1"
},
+ "hostname" : "access-analyzer.us-gov-east-1.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "access-analyzer.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-east-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-east-1"
+ },
+ "deprecated" : true,
"hostname" : "access-analyzer.us-gov-east-1.amazonaws.com"
},
"us-gov-west-1" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
+ "hostname" : "access-analyzer.us-gov-west-1.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "access-analyzer.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-west-1"
+ },
+ "deprecated" : true,
"hostname" : "access-analyzer.us-gov-west-1.amazonaws.com"
}
}
@@ -18302,6 +18978,19 @@
"deprecated" : true,
"hostname" : "appstream2-fips.us-gov-west-1.amazonaws.com"
},
+ "us-gov-east-1" : {
+ "variants" : [ {
+ "hostname" : "appstream2-fips.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-east-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-east-1"
+ },
+ "deprecated" : true,
+ "hostname" : "appstream2-fips.us-gov-east-1.amazonaws.com"
+ },
"us-gov-west-1" : {
"variants" : [ {
"hostname" : "appstream2-fips.us-gov-west-1.amazonaws.com",
@@ -18436,12 +19125,34 @@
"credentialScope" : {
"region" : "us-gov-east-1"
},
+ "hostname" : "cassandra.us-gov-east-1.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "cassandra.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-east-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-east-1"
+ },
+ "deprecated" : true,
"hostname" : "cassandra.us-gov-east-1.amazonaws.com"
},
"us-gov-west-1" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
+ "hostname" : "cassandra.us-gov-west-1.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "cassandra.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-west-1"
+ },
+ "deprecated" : true,
"hostname" : "cassandra.us-gov-west-1.amazonaws.com"
}
}
@@ -18478,7 +19189,19 @@
},
"clouddirectory" : {
"endpoints" : {
- "us-gov-west-1" : { }
+ "us-gov-west-1" : {
+ "variants" : [ {
+ "hostname" : "clouddirectory.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-west-1"
+ },
+ "deprecated" : true,
+ "hostname" : "clouddirectory.us-gov-west-1.amazonaws.com"
+ }
}
},
"cloudformation" : {
@@ -18986,8 +19709,32 @@
},
"dlm" : {
"endpoints" : {
- "us-gov-east-1" : { },
- "us-gov-west-1" : { }
+ "us-gov-east-1" : {
+ "variants" : [ {
+ "hostname" : "dlm.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-east-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-east-1"
+ },
+ "deprecated" : true,
+ "hostname" : "dlm.us-gov-east-1.amazonaws.com"
+ },
+ "us-gov-west-1" : {
+ "variants" : [ {
+ "hostname" : "dlm.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-west-1"
+ },
+ "deprecated" : true,
+ "hostname" : "dlm.us-gov-west-1.amazonaws.com"
+ }
}
},
"dms" : {
@@ -19259,12 +20006,34 @@
"credentialScope" : {
"region" : "us-gov-east-1"
},
+ "hostname" : "elasticbeanstalk.us-gov-east-1.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "elasticbeanstalk.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-east-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-east-1"
+ },
+ "deprecated" : true,
"hostname" : "elasticbeanstalk.us-gov-east-1.amazonaws.com"
},
"us-gov-west-1" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
+ "hostname" : "elasticbeanstalk.us-gov-west-1.amazonaws.com",
+ "variants" : [ {
+ "hostname" : "elasticbeanstalk.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1-fips" : {
+ "credentialScope" : {
+ "region" : "us-gov-west-1"
+ },
+ "deprecated" : true,
"hostname" : "elasticbeanstalk.us-gov-west-1.amazonaws.com"
}
}
@@ -19390,6 +20159,12 @@
}
}
},
+ "emr-containers" : {
+ "endpoints" : {
+ "us-gov-east-1" : { },
+ "us-gov-west-1" : { }
+ }
+ },
"es" : {
"endpoints" : {
"fips" : {
@@ -19586,18 +20361,32 @@
},
"glacier" : {
"endpoints" : {
- "us-gov-east-1" : {
+ "fips-us-gov-east-1" : {
"credentialScope" : {
"region" : "us-gov-east-1"
},
+ "deprecated" : true,
"hostname" : "glacier.us-gov-east-1.amazonaws.com"
},
- "us-gov-west-1" : {
+ "fips-us-gov-west-1" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
- "hostname" : "glacier.us-gov-west-1.amazonaws.com",
- "protocols" : [ "http", "https" ]
+ "deprecated" : true,
+ "hostname" : "glacier.us-gov-west-1.amazonaws.com"
+ },
+ "us-gov-east-1" : {
+ "variants" : [ {
+ "hostname" : "glacier.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1" : {
+ "protocols" : [ "http", "https" ],
+ "variants" : [ {
+ "hostname" : "glacier.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
}
}
},
@@ -19865,6 +20654,24 @@
"us-gov-west-1" : { }
}
},
+ "internetmonitor" : {
+ "defaults" : {
+ "dnsSuffix" : "api.aws",
+ "variants" : [ {
+ "dnsSuffix" : "api.aws",
+ "hostname" : "{service}-fips.{region}.{dnsSuffix}",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "endpoints" : {
+ "us-gov-east-1" : {
+ "hostname" : "internetmonitor.us-gov-east-1.api.aws"
+ },
+ "us-gov-west-1" : {
+ "hostname" : "internetmonitor.us-gov-west-1.api.aws"
+ }
+ }
+ },
"iot" : {
"defaults" : {
"credentialScope" : {
@@ -19991,6 +20798,23 @@
}
}
},
+ "iottwinmaker" : {
+ "endpoints" : {
+ "fips-us-gov-west-1" : {
+ "credentialScope" : {
+ "region" : "us-gov-west-1"
+ },
+ "deprecated" : true,
+ "hostname" : "iottwinmaker-fips.us-gov-west-1.amazonaws.com"
+ },
+ "us-gov-west-1" : {
+ "variants" : [ {
+ "hostname" : "iottwinmaker-fips.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ }
+ }
+ },
"kafka" : {
"endpoints" : {
"us-gov-east-1" : { },
@@ -20246,11 +21070,18 @@
},
"mediaconvert" : {
"endpoints" : {
- "us-gov-west-1" : {
+ "fips-us-gov-west-1" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
+ "deprecated" : true,
"hostname" : "mediaconvert.us-gov-west-1.amazonaws.com"
+ },
+ "us-gov-west-1" : {
+ "variants" : [ {
+ "hostname" : "mediaconvert.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
}
}
},
@@ -20492,27 +21323,48 @@
},
"outposts" : {
"endpoints" : {
- "us-gov-east-1" : {
+ "fips-us-gov-east-1" : {
"credentialScope" : {
"region" : "us-gov-east-1"
},
+ "deprecated" : true,
"hostname" : "outposts.us-gov-east-1.amazonaws.com"
},
- "us-gov-west-1" : {
+ "fips-us-gov-west-1" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
+ "deprecated" : true,
"hostname" : "outposts.us-gov-west-1.amazonaws.com"
+ },
+ "us-gov-east-1" : {
+ "variants" : [ {
+ "hostname" : "outposts.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1" : {
+ "variants" : [ {
+ "hostname" : "outposts.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
}
}
},
"participant.connect" : {
"endpoints" : {
- "us-gov-west-1" : {
+ "fips-us-gov-west-1" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
+ "deprecated" : true,
"hostname" : "participant.connect.us-gov-west-1.amazonaws.com"
+ },
+ "us-gov-west-1" : {
+ "variants" : [ {
+ "hostname" : "participant.connect.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
}
}
},
@@ -20877,6 +21729,7 @@
} ]
},
"endpoints" : {
+ "us-gov-east-1" : { },
"us-gov-west-1" : {
"variants" : [ {
"hostname" : "runtime.sagemaker.us-gov-west-1.amazonaws.com",
@@ -21097,18 +21950,32 @@
},
"endpoints" : {
"us-gov-east-1" : {
+ "protocols" : [ "https" ],
+ "variants" : [ {
+ "hostname" : "serverlessrepo.us-gov-east-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-east-1-fips" : {
"credentialScope" : {
"region" : "us-gov-east-1"
},
- "hostname" : "serverlessrepo.us-gov-east-1.amazonaws.com",
- "protocols" : [ "https" ]
+ "deprecated" : true,
+ "hostname" : "serverlessrepo.us-gov-east-1.amazonaws.com"
},
"us-gov-west-1" : {
+ "protocols" : [ "https" ],
+ "variants" : [ {
+ "hostname" : "serverlessrepo.us-gov-west-1.amazonaws.com",
+ "tags" : [ "fips" ]
+ } ]
+ },
+ "us-gov-west-1-fips" : {
"credentialScope" : {
"region" : "us-gov-west-1"
},
- "hostname" : "serverlessrepo.us-gov-west-1.amazonaws.com",
- "protocols" : [ "https" ]
+ "deprecated" : true,
+ "hostname" : "serverlessrepo.us-gov-west-1.amazonaws.com"
}
}
},
@@ -22379,7 +23246,8 @@
},
"secretsmanager" : {
"endpoints" : {
- "us-iso-east-1" : { }
+ "us-iso-east-1" : { },
+ "us-iso-west-1" : { }
}
},
"snowball" : {
diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml
index 8d75569b552f..f0db9511915d 100644
--- a/core/sdk-core/pom.xml
+++ b/core/sdk-core/pom.xml
@@ -21,7 +21,7 @@
software.amazon.awssdk
core
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
sdk-core
AWS Java SDK :: SDK Core
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/FileTransformerConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/FileTransformerConfiguration.java
index 6aea8880fc60..902815f96c49 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/FileTransformerConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/FileTransformerConfiguration.java
@@ -15,8 +15,12 @@
package software.amazon.awssdk.core;
+import java.nio.channels.AsynchronousChannelGroup;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.utils.Validate;
@@ -36,10 +40,12 @@ public final class FileTransformerConfiguration implements ToCopyableBuilder {
private final FileWriteOption fileWriteOption;
private final FailureBehavior failureBehavior;
+ private final ExecutorService executorService;
private FileTransformerConfiguration(DefaultBuilder builder) {
this.fileWriteOption = Validate.paramNotNull(builder.fileWriteOption, "fileWriteOption");
this.failureBehavior = Validate.paramNotNull(builder.failureBehavior, "failureBehavior");
+ this.executorService = builder.executorService;
}
/**
@@ -56,6 +62,16 @@ public FailureBehavior failureBehavior() {
return failureBehavior;
}
+ /**
+ * The configured {@link ExecutorService} the writes should be executed on.
+ *
+ * If not set, the default thread pool defined by the underlying {@link java.nio.file.spi.FileSystemProvider} will be used.
+ * This will typically be the thread pool defined by the {@link AsynchronousChannelGroup}.
+ */
+ public Optional executorService() {
+ return Optional.ofNullable(executorService);
+ }
+
/**
* Create a {@link Builder}, used to create a {@link FileTransformerConfiguration}.
*/
@@ -118,13 +134,17 @@ public boolean equals(Object o) {
if (fileWriteOption != that.fileWriteOption) {
return false;
}
- return failureBehavior == that.failureBehavior;
+ if (failureBehavior != that.failureBehavior) {
+ return false;
+ }
+ return Objects.equals(executorService, that.executorService);
}
@Override
public int hashCode() {
int result = fileWriteOption != null ? fileWriteOption.hashCode() : 0;
result = 31 * result + (failureBehavior != null ? failureBehavior.hashCode() : 0);
+ result = 31 * result + (executorService != null ? executorService.hashCode() : 0);
return result;
}
@@ -181,11 +201,20 @@ public interface Builder extends CopyableBuilderThis may be used together with {@link #apiCallAttemptTimeout()} to enforce both a timeout on each individual HTTP
* request (i.e. each retry) and the total time spent on all requests across retries (i.e. the 'api call' time).
*
+ *
+ * Note that this timeout takes precedence over the value configured at client level via
+ * {@link ClientOverrideConfiguration.Builder#apiCallTimeout(Duration)}.
+ *
* @see RequestOverrideConfiguration#apiCallTimeout()
*/
B apiCallTimeout(Duration apiCallTimeout);
@@ -351,6 +356,10 @@ default B putRawQueryParameter(String name, String value) {
*
This may be used together with {@link #apiCallTimeout()} to enforce both a timeout on each individual HTTP
* request (i.e. each retry) and the total time spent on all requests across retries (i.e. the 'api call' time).
*
+ *
+ * Note that this timeout takes precedence over the value configured at client level via
+ * {@link ClientOverrideConfiguration.Builder#apiCallAttemptTimeout(Duration)}.
+ *
* @see RequestOverrideConfiguration#apiCallAttemptTimeout()
*/
B apiCallAttemptTimeout(Duration apiCallAttemptTimeout);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java
index fc0b474c3ebf..194f11daa645 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java
@@ -32,4 +32,13 @@ public interface SdkClient extends SdkAutoCloseable {
* @return name for this service.
*/
String serviceName();
+
+ /**
+ * The SDK service client configuration exposes client settings to the user, e.g., ClientOverrideConfiguration
+ *
+ * @return SdkServiceClientConfiguration
+ */
+ default SdkServiceClientConfiguration serviceClientConfiguration() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkServiceClientConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkServiceClientConfiguration.java
new file mode 100644
index 000000000000..26674d396b96
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkServiceClientConfiguration.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.core;
+
+import java.net.URI;
+import java.util.Objects;
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+
+/**
+ * Class to expose SDK service client settings to the user, e.g., ClientOverrideConfiguration
+ */
+@SdkPublicApi
+public abstract class SdkServiceClientConfiguration {
+
+ private final ClientOverrideConfiguration overrideConfiguration;
+ private final URI endpointOverride;
+
+ protected SdkServiceClientConfiguration(Builder builder) {
+ this.overrideConfiguration = builder.overrideConfiguration();
+ this.endpointOverride = builder.endpointOverride();
+ }
+
+ /**
+ *
+ * @return The ClientOverrideConfiguration of the SdkClient. If this is not set, an ClientOverrideConfiguration object will
+ * still be returned, with empty fields
+ */
+ public ClientOverrideConfiguration overrideConfiguration() {
+ return this.overrideConfiguration;
+ }
+
+ /**
+ *
+ * @return The configured endpoint override of the SdkClient. If the endpoint was not overridden, an empty Optional will be
+ * returned
+ */
+ public Optional endpointOverride() {
+ return Optional.ofNullable(this.endpointOverride);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ SdkServiceClientConfiguration serviceClientConfiguration = (SdkServiceClientConfiguration) o;
+ return Objects.equals(overrideConfiguration, serviceClientConfiguration.overrideConfiguration())
+ && Objects.equals(endpointOverride, serviceClientConfiguration.endpointOverride().orElse(null));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = overrideConfiguration != null ? overrideConfiguration.hashCode() : 0;
+ result = 31 * result + (endpointOverride != null ? endpointOverride.hashCode() : 0);
+ return result;
+ }
+
+ /**
+ * The base interface for all SDK service client configuration builders
+ */
+ public interface Builder {
+ /**
+ * Return the client override configuration
+ */
+ ClientOverrideConfiguration overrideConfiguration();
+
+ /**
+ * Return the endpoint override
+ */
+ URI endpointOverride();
+
+ /**
+ * Configure the client override configuration
+ */
+ Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration);
+
+ /**
+ * Configure the endpoint override
+ */
+ Builder endpointOverride(URI endpointOverride);
+
+ /**
+ * Build the service client configuration using the configuration on this builder
+ */
+ SdkServiceClientConfiguration build();
+ }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java
index 07a2ee70725f..4ba034413b90 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java
@@ -26,6 +26,7 @@
import java.util.function.Consumer;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.annotations.ToBuilderIgnoreField;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -372,6 +373,10 @@ default Builder retryPolicy(RetryMode retryMode) {
* This may be used together with {@link #apiCallAttemptTimeout()} to enforce both a timeout on each individual HTTP
* request (i.e. each retry) and the total time spent on all requests across retries (i.e. the 'api call' time).
*
+ *
+ * You can also configure it on a per-request basis via
+ * {@link RequestOverrideConfiguration.Builder#apiCallTimeout(Duration)}.
+ * Note that request-level timeout takes precedence.
*
* @see ClientOverrideConfiguration#apiCallTimeout()
*/
@@ -394,6 +399,11 @@ default Builder retryPolicy(RetryMode retryMode) {
*
This may be used together with {@link #apiCallTimeout()} to enforce both a timeout on each individual HTTP
* request (i.e. each retry) and the total time spent on all requests across retries (i.e. the 'api call' time).
*
+ *
+ * You can also configure it on a per-request basis via
+ * {@link RequestOverrideConfiguration.Builder#apiCallAttemptTimeout(Duration)}.
+ * Note that request-level timeout takes precedence.
+ *
* @see ClientOverrideConfiguration#apiCallAttemptTimeout()
*/
Builder apiCallAttemptTimeout(Duration apiCallAttemptTimeout);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java
index 5956de29f865..af2c4775845a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java
@@ -24,9 +24,14 @@
import java.nio.channels.CompletionHandler;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
+import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
import org.reactivestreams.Subscriber;
@@ -78,17 +83,24 @@ private long determineFilePositionToWrite(Path path) {
}
private AsynchronousFileChannel createChannel(Path path) throws IOException {
+ Set options = new HashSet<>();
switch (configuration.fileWriteOption()) {
case CREATE_OR_APPEND_TO_EXISTING:
- return AsynchronousFileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+ Collections.addAll(options, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+ break;
case CREATE_OR_REPLACE_EXISTING:
- return AsynchronousFileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.CREATE,
- StandardOpenOption.TRUNCATE_EXISTING);
+ Collections.addAll(options, StandardOpenOption.WRITE, StandardOpenOption.CREATE,
+ StandardOpenOption.TRUNCATE_EXISTING);
+ break;
case CREATE_NEW:
- return AsynchronousFileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.CREATE_NEW);
+ Collections.addAll(options, StandardOpenOption.WRITE, StandardOpenOption.CREATE_NEW);
+ break;
default:
throw new IllegalArgumentException("Unsupported file write option: " + configuration.fileWriteOption());
}
+
+ ExecutorService executorService = configuration.executorService().orElse(null);
+ return AsynchronousFileChannel.open(path, options, executorService);
}
@Override
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java
index 320416cd362f..0f71d54a866f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java
@@ -15,9 +15,11 @@
package software.amazon.awssdk.core.internal.http.loader;
-import java.util.Iterator;
+import java.util.List;
import java.util.Optional;
import java.util.ServiceLoader;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.annotations.SdkTestInternalApi;
import software.amazon.awssdk.core.SdkSystemSetting;
@@ -46,22 +48,33 @@ final class ClasspathSdkHttpServiceProvider implements SdkHttpServiceProvider
@Override
public Optional loadService() {
- Iterator httpServices = serviceLoader.loadServices(serviceClass);
- if (!httpServices.hasNext()) {
+ Iterable iterable = () -> serviceLoader.loadServices(serviceClass);
+ List impls = StreamSupport
+ .stream(iterable.spliterator(), false)
+ .collect(Collectors.toList());
+
+ if (impls.isEmpty()) {
return Optional.empty();
}
- T httpService = httpServices.next();
- if (httpServices.hasNext()) {
+ if (impls.size() > 1) {
+
+ String implText =
+ impls.stream()
+ .map(clazz -> clazz.getClass().getName())
+ .collect(Collectors.joining(",", "[", "]"));
+
throw SdkClientException.builder().message(
String.format(
"Multiple HTTP implementations were found on the classpath. To avoid non-deterministic loading " +
"implementations, please explicitly provide an HTTP client via the client builders, set the %s " +
"system property with the FQCN of the HTTP service to use as the default, or remove all but one " +
- "HTTP implementation from the classpath", implSystemProperty.property()))
+ "HTTP implementation from the classpath. The multiple implementations found were: %s",
+ implSystemProperty.property(), implText))
.build();
}
- return Optional.of(httpService);
+
+ return impls.stream().findFirst();
}
/**
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java
index c5e65f09dc0c..bcab30e49675 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java
@@ -31,9 +31,16 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
+import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -213,6 +220,32 @@ private static List configurations() {
.failureBehavior(LEAVE).build());
}
+ @Test
+ void explicitExecutor_shouldUseExecutor() throws Exception {
+ Path testPath = testFs.getPath("test_file.txt");
+ assertThat(testPath).doesNotExist();
+ String newContent = RandomStringUtils.randomAlphanumeric(2000);
+
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+ try {
+ SpyingExecutorService spyingExecutorService = new SpyingExecutorService(executor);
+ FileTransformerConfiguration configuration = FileTransformerConfiguration
+ .builder()
+ .fileWriteOption(FileWriteOption.CREATE_NEW)
+ .failureBehavior(DELETE)
+ .executorService(spyingExecutorService)
+ .build();
+ FileAsyncResponseTransformer transformer = new FileAsyncResponseTransformer<>(testPath, configuration);
+
+ stubSuccessfulStreaming(newContent, transformer);
+ assertThat(testPath).hasContent(newContent);
+ assertThat(spyingExecutorService.hasReceivedTasks()).isTrue();
+ } finally {
+ executor.shutdown();
+ assertThat(executor.awaitTermination(1, TimeUnit.MINUTES)).isTrue();
+ }
+ }
+
private static void stubSuccessfulStreaming(String newContent, FileAsyncResponseTransformer transformer) throws Exception {
CompletableFuture future = transformer.prepare();
transformer.onResponse("foobar");
@@ -240,4 +273,90 @@ private static void stubException(String newContent, FileAsyncResponseTransforme
private static SdkPublisher testPublisher(String content) {
return SdkPublisher.adapt(Flowable.just(ByteBuffer.wrap(content.getBytes(StandardCharsets.UTF_8))));
}
+
+ private static final class SpyingExecutorService implements ExecutorService {
+ private final ExecutorService executorService;
+ private boolean receivedTasks = false;
+
+ private SpyingExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
+
+ public boolean hasReceivedTasks() {
+ return receivedTasks;
+ }
+
+ @Override
+ public void shutdown() {
+ executorService.shutdown();
+ }
+
+ @Override
+ public List shutdownNow() {
+ return executorService.shutdownNow();
+ }
+
+ @Override
+ public boolean isShutdown() {
+ return executorService.isShutdown();
+ }
+
+ @Override
+ public boolean isTerminated() {
+ return executorService.isTerminated();
+ }
+
+ @Override
+ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+ return executorService.awaitTermination(timeout, unit);
+ }
+
+ @Override
+ public Future submit(Callable task) {
+ receivedTasks = true;
+ return executorService.submit(task);
+ }
+
+ @Override
+ public Future submit(Runnable task, T result) {
+ receivedTasks = true;
+ return executorService.submit(task, result);
+ }
+
+ @Override
+ public Future submit(Runnable task) {
+ receivedTasks = true;
+ return executorService.submit(task);
+ }
+
+ @Override
+ public List> invokeAll(Collection> tasks) throws InterruptedException {
+ receivedTasks = true;
+ return executorService.invokeAll(tasks);
+ }
+
+ @Override
+ public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException {
+ receivedTasks = true;
+ return executorService.invokeAll(tasks, timeout, unit);
+ }
+
+ @Override
+ public T invokeAny(Collection> tasks) throws InterruptedException, ExecutionException {
+ receivedTasks = true;
+ return executorService.invokeAny(tasks);
+ }
+
+ @Override
+ public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+ receivedTasks = true;
+ return executorService.invokeAny(tasks, timeout, unit);
+ }
+
+ @Override
+ public void execute(Runnable command) {
+ receivedTasks = true;
+ executorService.execute(command);
+ }
+ }
}
\ No newline at end of file
diff --git a/docs/design/README.md b/docs/design/README.md
index 4a650dbbd378..b4720272c265 100644
--- a/docs/design/README.md
+++ b/docs/design/README.md
@@ -62,7 +62,7 @@ None
[java.util.Optional](https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html).
* [Completable Future Usage](UseOfCompletableFuture.md) - Conventions
governing the use of
-* [java.util.concurrent.CompletableFuture](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html).
+ [java.util.concurrent.CompletableFuture](https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html).
* [APIReference](APIReference.md) - Conventions used for API references
**Rejected**
diff --git a/docs/design/services/dynamodb/high-level-library/DocumentAPI.md b/docs/design/services/dynamodb/high-level-library/DocumentAPI.md
index 9abea94d3c2f..7c54535da3f0 100644
--- a/docs/design/services/dynamodb/high-level-library/DocumentAPI.md
+++ b/docs/design/services/dynamodb/high-level-library/DocumentAPI.md
@@ -44,7 +44,7 @@ providers.
// New API in TableSchema to create a DocumentTableSchema
DocumentTableSchema documentTableSchema =
- TableSchema.fromDocumentSchemaBuilder()
+ TableSchema.documentSchemaBuilder()
.addIndexPartitionKey(primaryIndexName(), "sample_hash_name", AttributeValueType.S)
.addIndexSortKey("gsi_index", "sample_sort_name", AttributeValueType.N)
.addAttributeConverterProviders(cutomAttributeConverters)
@@ -78,7 +78,7 @@ EnhancedDocument documentTableItem = documentTable.getItem(
Number sampleSortvalue = documentTableItem.get("sample_sort_name", EnhancedType.of(Number.class));
// Accessing an attribute from document using specific getters.
-sampleSortvalue = documentTableItem.getSdkNumber("sample_sort_name");
+sampleSortvalue = documentTableItem.getNumber("sample_sort_name");
// Accessing an attribute of custom class using custom converters.
CustomClass customClass = documentTableItem.get("custom_nested_map", new CustomAttributeConverter()));
diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml
index a8adb994138f..b2253ec83e71 100644
--- a/http-client-spi/pom.xml
+++ b/http-client-spi/pom.xml
@@ -22,7 +22,7 @@
aws-sdk-java-pom
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
http-client-spi
AWS Java SDK :: HTTP Client Interface
diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
index 2d477042d8ba..e32e584f165e 100644
--- a/http-clients/apache-client/pom.xml
+++ b/http-clients/apache-client/pom.xml
@@ -21,7 +21,7 @@
http-clients
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
apache-client
@@ -56,6 +56,10 @@
org.apache.httpcomponents
httpcore
+
+ commons-codec
+ commons-codec
+
software.amazon.awssdk
diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml
index 0f6d0f294406..0bc14c37553a 100644
--- a/http-clients/aws-crt-client/pom.xml
+++ b/http-clients/aws-crt-client/pom.xml
@@ -21,7 +21,7 @@
http-clients
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
@@ -76,6 +76,11 @@
utils
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ crt-core
+ ${awsjavasdk.version}
+
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
index c8b814f81cfb..1ccf7a826ced 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
@@ -15,12 +15,12 @@
package software.amazon.awssdk.http.crt;
+import static software.amazon.awssdk.crtcore.CrtConfigurationUtils.resolveHttpMonitoringOptions;
+import static software.amazon.awssdk.crtcore.CrtConfigurationUtils.resolveProxy;
import static software.amazon.awssdk.http.HttpMetric.HTTP_CLIENT_NAME;
import static software.amazon.awssdk.http.SdkHttpConfigurationOption.PROTOCOL;
-import static software.amazon.awssdk.http.crt.internal.AwsCrtConfigurationUtils.buildProxyOptions;
import static software.amazon.awssdk.http.crt.internal.AwsCrtConfigurationUtils.buildSocketOptions;
import static software.amazon.awssdk.http.crt.internal.AwsCrtConfigurationUtils.resolveCipherPreference;
-import static software.amazon.awssdk.http.crt.internal.AwsCrtConfigurationUtils.resolveHttpMonitoringOptions;
import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
import static software.amazon.awssdk.utils.Validate.paramNotNull;
@@ -108,9 +108,9 @@ private AwsCrtAsyncHttpClient(DefaultBuilder builder, AttributeMap config) {
this.tlsContext = registerOwnedResource(clientTlsContext);
this.readBufferSize = builder.readBufferSize == null ? DEFAULT_STREAM_WINDOW_SIZE : builder.readBufferSize;
this.maxConnectionsPerEndpoint = config.get(SdkHttpConfigurationOption.MAX_CONNECTIONS);
- this.monitoringOptions = resolveHttpMonitoringOptions(builder.connectionHealthConfiguration);
+ this.monitoringOptions = resolveHttpMonitoringOptions(builder.connectionHealthConfiguration).orElse(null);
this.maxConnectionIdleInMilliseconds = config.get(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT).toMillis();
- this.proxyOptions = buildProxyOptions(builder.proxyConfiguration, tlsContext);
+ this.proxyOptions = resolveProxy(builder.proxyConfiguration, tlsContext).orElse(null);
}
}
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ConnectionHealthConfiguration.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ConnectionHealthConfiguration.java
index 0cc029db08dd..fd532f326f6e 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ConnectionHealthConfiguration.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ConnectionHealthConfiguration.java
@@ -17,7 +17,9 @@
import java.time.Duration;
import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.crtcore.CrtConnectionHealthConfiguration;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
/**
* Configuration that defines health checks for all connections established by
@@ -25,33 +27,20 @@
*
*/
@SdkPublicApi
-public final class ConnectionHealthConfiguration {
- private final long minimumThroughputInBps;
- private final Duration minimumThroughputTimeout;
+public final class ConnectionHealthConfiguration extends CrtConnectionHealthConfiguration
+ implements ToCopyableBuilder {
- private ConnectionHealthConfiguration(DefaultConnectionHealthConfigurationBuilder builder) {
- this.minimumThroughputInBps = Validate.paramNotNull(builder.minimumThroughputInBps,
- "minimumThroughputInBps");
- this.minimumThroughputTimeout = Validate.isPositive(builder.minimumThroughputTimeout,
- "minimumThroughputTimeout");
+ private ConnectionHealthConfiguration(DefaultBuilder builder) {
+ super(builder);
}
- /**
- * @return the minimum amount of throughput, in bytes per second, for a connection to be considered healthy.
- */
- public long minimumThroughputInBps() {
- return minimumThroughputInBps;
- }
-
- /**
- * @return How long a connection is allowed to be unhealthy before getting shut down.
- */
- public Duration minimumThroughputTimeout() {
- return minimumThroughputTimeout;
+ public static Builder builder() {
+ return new DefaultBuilder();
}
- public static Builder builder() {
- return new DefaultConnectionHealthConfigurationBuilder();
+ @Override
+ public Builder toBuilder() {
+ return new DefaultBuilder(this);
}
/**
@@ -59,52 +48,30 @@ public static Builder builder() {
*
* All implementations of this interface are mutable and not thread safe.
*/
- public interface Builder {
+ public interface Builder extends CrtConnectionHealthConfiguration.Builder,
+ CopyableBuilder {
- /**
- * Sets a throughput threshold for connections. Throughput below this value will be considered unhealthy.
- *
- * @param minimumThroughputInBps minimum amount of throughput, in bytes per second, for a connection to be
- * considered healthy.
- * @return Builder
- */
+ @Override
Builder minimumThroughputInBps(Long minimumThroughputInBps);
- /**
- * Sets how long a connection is allowed to be unhealthy before getting shut down.
- *
- *
- * It only supports seconds precision
- *
- * @param minimumThroughputTimeout How long a connection is allowed to be unhealthy
- * before getting shut down.
- * @return Builder
- */
+ @Override
Builder minimumThroughputTimeout(Duration minimumThroughputTimeout);
+ @Override
ConnectionHealthConfiguration build();
}
/**
* An SDK-internal implementation of {@link Builder}.
*/
- private static final class DefaultConnectionHealthConfigurationBuilder implements Builder {
- private Long minimumThroughputInBps;
- private Duration minimumThroughputTimeout;
+ private static final class DefaultBuilder extends
+ CrtConnectionHealthConfiguration.DefaultBuilder implements Builder {
- private DefaultConnectionHealthConfigurationBuilder() {
+ private DefaultBuilder() {
}
- @Override
- public Builder minimumThroughputInBps(Long minimumThroughputInBps) {
- this.minimumThroughputInBps = minimumThroughputInBps;
- return this;
- }
-
- @Override
- public Builder minimumThroughputTimeout(Duration minimumThroughputTimeout) {
- this.minimumThroughputTimeout = minimumThroughputTimeout;
- return this;
+ private DefaultBuilder(ConnectionHealthConfiguration configuration) {
+ super(configuration);
}
@Override
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ProxyConfiguration.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ProxyConfiguration.java
index 6321fbbb2356..7272b38ef2fd 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ProxyConfiguration.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ProxyConfiguration.java
@@ -15,153 +15,57 @@
package software.amazon.awssdk.http.crt;
-import java.util.Objects;
import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.crtcore.CrtProxyConfiguration;
import software.amazon.awssdk.utils.ProxySystemSetting;
import software.amazon.awssdk.utils.builder.CopyableBuilder;
import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
/**
- * Proxy configuration for {@link AwsCrtAsyncHttpClient}. This class is used to configure an HTTPS or HTTP proxy to be used by
- * the {@link AwsCrtAsyncHttpClient}.
+ * Proxy configuration for {@link AwsCrtAsyncHttpClient}. This class is used to configure an HTTPS or HTTP proxy to be used by the
+ * {@link AwsCrtAsyncHttpClient}.
*
* @see AwsCrtAsyncHttpClient.Builder#proxyConfiguration(ProxyConfiguration)
*/
@SdkPublicApi
-public final class ProxyConfiguration implements ToCopyableBuilder {
- private static final String HTTPS = "https";
- private final String scheme;
- private final String host;
- private final int port;
+public final class ProxyConfiguration extends CrtProxyConfiguration
+ implements ToCopyableBuilder {
- private final String username;
- private final String password;
- private final Boolean useSystemPropertyValues;
-
- private ProxyConfiguration(BuilderImpl builder) {
- this.useSystemPropertyValues = builder.useSystemPropertyValues;
- this.scheme = builder.scheme;
- this.host = resolveHost(builder.host);
- this.port = resolvePort(builder.port);
- this.username = builder.username;
- this.password = builder.password;
- }
-
- /**
- * @return The proxy scheme.
- */
- public String scheme() {
- return scheme;
- }
-
- /**
- * @return The proxy host from the configuration if set, else from the "https.proxyHost" or "http.proxyHost" system property,
- * based on the scheme used, if {@link ProxyConfiguration.Builder#useSystemPropertyValues(Boolean)} is set to true
- */
- public String host() {
- return host;
- }
-
- /**
- * @return The proxy port from the configuration if set, else from the "https.proxyPort" or "http.proxyPort" system property,
- * based on the scheme used, if {@link ProxyConfiguration.Builder#useSystemPropertyValues(Boolean)} is set to true
- */
- public int port() {
- return port;
- }
-
- /**
- * @return The proxy username from the configuration if set, else from the "https.proxyUser" or "http.proxyUser" system
- * property, based on the scheme used, if {@link ProxyConfiguration.Builder#useSystemPropertyValues(Boolean)} is set to true
- * */
- public String username() {
- if (Objects.equals(scheme(), HTTPS)) {
- return resolveValue(username, ProxySystemSetting.HTTPS_PROXY_USERNAME);
- }
- return resolveValue(username, ProxySystemSetting.PROXY_USERNAME);
- }
-
- /**
- * @return The proxy password from the configuration if set, else from the "https.proxyPassword" or "http.proxyPassword"
- * system property, based on the scheme used, if {@link ProxyConfiguration.Builder#useSystemPropertyValues(Boolean)} is set
- * to true
- * */
- public String password() {
- if (Objects.equals(scheme(), HTTPS)) {
- return resolveValue(password, ProxySystemSetting.HTTPS_PROXY_PASSWORD);
- }
- return resolveValue(password, ProxySystemSetting.PROXY_PASSWORD);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
-
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- ProxyConfiguration that = (ProxyConfiguration) o;
-
- if (port != that.port) {
- return false;
- }
-
- if (!Objects.equals(this.scheme, that.scheme)) {
- return false;
- }
-
- if (!Objects.equals(this.host, that.host)) {
- return false;
- }
-
- if (!Objects.equals(this.username, that.username)) {
- return false;
- }
-
- return Objects.equals(this.password, that.password);
- }
-
- @Override
- public int hashCode() {
- int result = scheme != null ? scheme.hashCode() : 0;
- result = 31 * result + (host != null ? host.hashCode() : 0);
- result = 31 * result + port;
- result = 31 * result + (username != null ? username.hashCode() : 0);
- result = 31 * result + (password != null ? password.hashCode() : 0);
-
- return result;
+ private ProxyConfiguration(DefaultBuilder builder) {
+ super(builder);
}
@Override
public Builder toBuilder() {
- return new BuilderImpl(this);
+ return new DefaultBuilder(this);
}
public static Builder builder() {
- return new BuilderImpl();
+ return new DefaultBuilder();
}
/**
* Builder for {@link ProxyConfiguration}.
*/
- public interface Builder extends CopyableBuilder {
+ public interface Builder extends CrtProxyConfiguration.Builder, CopyableBuilder {
/**
* Set the hostname of the proxy.
+ *
* @param host The proxy host.
* @return This object for method chaining.
*/
+ @Override
Builder host(String host);
/**
* Set the port that the proxy expects connections on.
+ *
* @param port The proxy port.
* @return This object for method chaining.
*/
+ @Override
Builder port(int port);
/**
@@ -172,6 +76,7 @@ public interface Builder extends CopyableBuilder {
* @param scheme The proxy scheme.
* @return This object for method chaining.
*/
+ @Override
Builder scheme(String scheme);
/**
@@ -182,6 +87,7 @@ public interface Builder extends CopyableBuilder {
* @param username The basic authentication username.
* @return This object for method chaining.
*/
+ @Override
Builder username(String username);
/**
@@ -192,103 +98,36 @@ public interface Builder extends CopyableBuilder {
* @param password The basic authentication password.
* @return This object for method chaining.
*/
+ @Override
Builder password(String password);
/**
- * The option whether to use system property values from {@link ProxySystemSetting} if any of the config options
- * are missing. The value is set to "true" by default which means SDK will automatically use system property values if
- * options are not provided during building the {@link ProxyConfiguration} object. To disable this behaviour, set this
- * value to false.
+ * The option whether to use system property values from {@link ProxySystemSetting} if any of the config options are
+ * missing. The value is set to "true" by default which means SDK will automatically use system property values if
+ * options
+ * are not provided during building the {@link ProxyConfiguration} object. To disable this behaviour, set this
+ * value to
+ * false.
*
* @param useSystemPropertyValues The option whether to use system property values
* @return This object for method chaining.
*/
- Builder useSystemPropertyValues(Boolean useSystemPropertyValues);
- }
-
- private String resolveHost(String host) {
- if (Objects.equals(scheme(), HTTPS)) {
- return resolveValue(host, ProxySystemSetting.HTTPS_PROXY_HOST);
- }
- return resolveValue(host, ProxySystemSetting.PROXY_HOST);
- }
-
- private int resolvePort(int port) {
- if (port == 0 && Boolean.TRUE.equals(useSystemPropertyValues)) {
- if (Objects.equals(scheme(), HTTPS)) {
- return ProxySystemSetting.HTTPS_PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0);
- }
- return ProxySystemSetting.PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0);
- }
- return port;
- }
-
- /**
- * Uses the configuration options, system setting property and returns the final value of the given member.
- */
- private String resolveValue(String value, ProxySystemSetting systemSetting) {
- return value == null && Boolean.TRUE.equals(useSystemPropertyValues) ?
- systemSetting.getStringValue().orElse(null) : value;
- }
-
- private static final class BuilderImpl implements Builder {
- private String scheme;
- private String host;
- private int port = 0;
- private String username;
- private String password;
- private Boolean useSystemPropertyValues = Boolean.TRUE;
-
- private BuilderImpl() {
- }
-
- private BuilderImpl(ProxyConfiguration proxyConfiguration) {
- this.useSystemPropertyValues = proxyConfiguration.useSystemPropertyValues;
- this.scheme = proxyConfiguration.scheme;
- this.host = proxyConfiguration.host;
- this.port = proxyConfiguration.port;
- this.username = proxyConfiguration.username;
- this.password = proxyConfiguration.password;
- }
-
@Override
- public Builder scheme(String scheme) {
- this.scheme = scheme;
- return this;
- }
+ Builder useSystemPropertyValues(Boolean useSystemPropertyValues);
- @Override
- public Builder host(String host) {
- this.host = host;
- return this;
- }
@Override
- public Builder port(int port) {
- this.port = port;
- return this;
- }
+ ProxyConfiguration build();
+ }
- @Override
- public Builder username(String username) {
- this.username = username;
- return this;
- }
+ private static final class DefaultBuilder extends CrtProxyConfiguration.DefaultBuilder implements Builder {
- @Override
- public Builder password(String password) {
- this.password = password;
- return this;
+ private DefaultBuilder(ProxyConfiguration proxyConfiguration) {
+ super(proxyConfiguration);
}
- @Override
- public Builder useSystemPropertyValues(Boolean useSystemPropertyValues) {
- this.useSystemPropertyValues = useSystemPropertyValues;
- return this;
- }
+ private DefaultBuilder() {
- public void setUseSystemPropertyValues(Boolean useSystemPropertyValues) {
- useSystemPropertyValues(useSystemPropertyValues);
}
@Override
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtils.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtils.java
index d0784a7b2bf4..f08c50187d05 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtils.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtils.java
@@ -18,14 +18,9 @@
import java.time.Duration;
import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.crt.http.HttpMonitoringOptions;
-import software.amazon.awssdk.crt.http.HttpProxyOptions;
import software.amazon.awssdk.crt.io.SocketOptions;
import software.amazon.awssdk.crt.io.TlsCipherPreference;
-import software.amazon.awssdk.crt.io.TlsContext;
import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
-import software.amazon.awssdk.http.crt.ConnectionHealthConfiguration;
-import software.amazon.awssdk.http.crt.ProxyConfiguration;
import software.amazon.awssdk.http.crt.TcpKeepAliveConfiguration;
import software.amazon.awssdk.utils.Logger;
import software.amazon.awssdk.utils.NumericUtils;
@@ -56,43 +51,6 @@ public static SocketOptions buildSocketOptions(TcpKeepAliveConfiguration tcpKeep
return clientSocketOptions;
}
- public static HttpProxyOptions buildProxyOptions(ProxyConfiguration proxyConfiguration, TlsContext tlsContext) {
- if (proxyConfiguration == null) {
- return null;
- }
-
- HttpProxyOptions clientProxyOptions = new HttpProxyOptions();
-
- clientProxyOptions.setHost(proxyConfiguration.host());
- clientProxyOptions.setPort(proxyConfiguration.port());
-
- if ("https".equalsIgnoreCase(proxyConfiguration.scheme())) {
- clientProxyOptions.setTlsContext(tlsContext);
- }
-
- if (proxyConfiguration.username() != null && proxyConfiguration.password() != null) {
- clientProxyOptions.setAuthorizationUsername(proxyConfiguration.username());
- clientProxyOptions.setAuthorizationPassword(proxyConfiguration.password());
- clientProxyOptions.setAuthorizationType(HttpProxyOptions.HttpProxyAuthorizationType.Basic);
- } else {
- clientProxyOptions.setAuthorizationType(HttpProxyOptions.HttpProxyAuthorizationType.None);
- }
-
- return clientProxyOptions;
- }
-
- public static HttpMonitoringOptions resolveHttpMonitoringOptions(ConnectionHealthConfiguration config) {
- if (config == null) {
- return null;
- }
-
- HttpMonitoringOptions httpMonitoringOptions = new HttpMonitoringOptions();
- httpMonitoringOptions.setMinThroughputBytesPerSecond(config.minimumThroughputInBps());
- int seconds = (int) config.minimumThroughputTimeout().getSeconds();
- httpMonitoringOptions.setAllowableThroughputFailureIntervalSeconds(seconds);
- return httpMonitoringOptions;
- }
-
public static TlsCipherPreference resolveCipherPreference(Boolean postQuantumTlsEnabled) {
TlsCipherPreference defaultTls = TlsCipherPreference.TLS_CIPHER_SYSTEM_DEFAULT;
if (postQuantumTlsEnabled == null || !postQuantumTlsEnabled) {
diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml
index ae45a19a3f7f..f07f76c078fc 100644
--- a/http-clients/netty-nio-client/pom.xml
+++ b/http-clients/netty-nio-client/pom.xml
@@ -20,7 +20,7 @@
http-clients
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
index d827fc65657f..cd73ebb7625c 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
@@ -376,6 +376,8 @@ public void onComplete() {
}
} catch (IOException e) {
notifyError(e);
+ runAndLogError(channelContext.channel(), () -> "Could not release channel back to the pool",
+ () -> closeAndRelease(channelContext));
}
}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java
index f5a417057bd3..4098aec8eac2 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java
@@ -235,6 +235,56 @@ public void onComplete() {
}
}
+ @Test
+ public void contentLengthValidationFails_closesAndReleasesConnection() {
+ channel.attr(ChannelAttributeKey.RESPONSE_CONTENT_LENGTH).set(1L);
+ channel.attr(ChannelAttributeKey.RESPONSE_DATA_READ).set(0L);
+
+ Publisher publisher = subscriber -> subscriber.onSubscribe(new Subscription() {
+ @Override
+ public void request(long l) {
+ subscriber.onComplete();
+ }
+
+ @Override
+ public void cancel() {
+ }
+ });
+
+ DefaultStreamedHttpResponse streamedResponse = new DefaultStreamedHttpResponse(HttpVersion.HTTP_1_1,
+ HttpResponseStatus.OK, publisher);
+
+ Subscriber subscriber = new Subscriber() {
+ private Subscription subscription;
+
+ @Override
+ public void onSubscribe(Subscription subscription) {
+ this.subscription = subscription;
+ subscription.request(Long.MAX_VALUE);
+ }
+
+ @Override
+ public void onNext(ByteBuffer byteBuffer) {
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ }
+
+ @Override
+ public void onComplete() {
+ }
+ };
+
+ ResponseHandler.PublisherAdapter publisherAdapter = new ResponseHandler.PublisherAdapter(streamedResponse, ctx,
+ requestContext, executeFuture);
+
+ publisherAdapter.subscribe(subscriber);
+
+ verify(ctx).close();
+ verify(channelPool).release(channel);
+ }
+
static final class TestSubscriber implements Subscriber {
private Subscription subscription;
diff --git a/http-clients/pom.xml b/http-clients/pom.xml
index b5adb97bc729..8209a1478144 100644
--- a/http-clients/pom.xml
+++ b/http-clients/pom.xml
@@ -21,7 +21,7 @@
aws-sdk-java-pom
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
index 538f24e138d9..a18f837f1c88 100644
--- a/http-clients/url-connection-client/pom.xml
+++ b/http-clients/url-connection-client/pom.xml
@@ -20,7 +20,7 @@
http-clients
software.amazon.awssdk
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
4.0.0
diff --git a/javadoc-resources/aws-sdk-java-v2-javadoc.css b/javadoc-resources/aws-sdk-java-v2-javadoc.css
new file mode 100644
index 000000000000..e9ce938ec978
--- /dev/null
+++ b/javadoc-resources/aws-sdk-java-v2-javadoc.css
@@ -0,0 +1,79 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/*
+Accessibility: This css file modify the basic javadoc css to
+conform to accessibility audit issues.
+ */
+
+/* make links have more contrast and not rely only on color */
+a:link {
+ font-weight: bold;
+}
+
+a[href]:hover, a[href]:focus {
+ color: #a85e1e;
+}
+
+.top-nav a[href]:hover, a[href]:focus {
+ color: white;
+ text-decoration: underline;
+}
+
+/* ensure no horizontal scrolling is needed with small horizontal width */
+@media (max-width: 800px) {
+ pre, code {
+ word-break: break-all;
+ word-wrap: break-word;
+ white-space: break-spaces;
+ }
+
+ .parameters {
+ white-space: break-spaces !important;
+ }
+
+ .sub-title {
+ word-break: break-all;
+ }
+
+ .member-signature {
+ word-break: break-all;
+ }
+
+ .block {
+ word-wrap: break-word;
+ }
+
+ .exceptions {
+ white-space: break-spaces !important;
+ }
+
+ .type-signature {
+ word-wrap: break-word;
+ }
+
+ .inherited-list {
+ word-wrap: break-word;
+ }
+
+ .details {
+ word-wrap: break-word;
+ }
+}
+
+/* fixes footer weird behavior */
+footer {
+ margin-left: 2vw;
+}
diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml
index b14f23d165da..d857e08929d1 100644
--- a/metric-publishers/cloudwatch-metric-publisher/pom.xml
+++ b/metric-publishers/cloudwatch-metric-publisher/pom.xml
@@ -17,7 +17,7 @@
software.amazon.awssdk
metric-publishers
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
cloudwatch-metric-publisher
diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml
index 03a3dcecd620..ccd4a93c5669 100644
--- a/metric-publishers/pom.xml
+++ b/metric-publishers/pom.xml
@@ -17,7 +17,7 @@
software.amazon.awssdk
aws-sdk-java-pom
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
metric-publishers
diff --git a/pom.xml b/pom.xml
index a502bb6daf8b..c62d1e1b462a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
software.amazon.awssdk
aws-sdk-java-pom
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
pom
AWS Java SDK :: Parent
The Amazon Web Services SDK for Java provides Java APIs
@@ -86,11 +86,11 @@
test/ruleset-testing-core
- https://github.com/aws/aws-sdk-java-v2.git
+ ${scm.github.url}
${project.version}
- 2.20.1
+ 2.20.46
2.13.2
2.13.4.2
2.13.2
@@ -112,9 +112,9 @@
3.10.0
3.5.101
2.2.21
- 1.10
+ 1.15
1.29
- 0.21.5
+ 0.21.12
5.8.1
@@ -172,6 +172,8 @@
${skipTests}
${project.basedir}/src/it/java
+ ${session.executionRootDirectory}
+ https://github.com/aws/aws-sdk-java-v2.git
@@ -502,6 +504,7 @@
org.slf4j:slf4j-api
+ commons-codec:commons-codec
org.junit.jupiter:*
org.mockito:*
org.junit.vintage:*
@@ -694,6 +697,9 @@
publishing
+
+ https://github.com/aws/aws-sdk-java-v2/tree/release
+
@@ -1020,6 +1026,11 @@
AWS SDK for Java API Reference - ${awsjavasdk.version}
AWS SDK for Java
:*.codegen:software.amazon.awssdk.services.protocol*
+ true
+ ${javadoc.resourcesDir}/javadoc-resources
+
+ aws-sdk-java-v2-javadoc.css
+
Greengrass
diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml
index 2d9114c53bf0..7fc2802f29fd 100644
--- a/release-scripts/pom.xml
+++ b/release-scripts/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
aws-sdk-java-pom
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
../pom.xml
release-scripts
diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml
index 6f922331379c..5759a748b151 100644
--- a/services-custom/dynamodb-enhanced/pom.xml
+++ b/services-custom/dynamodb-enhanced/pom.xml
@@ -21,7 +21,7 @@
software.amazon.awssdk
services-custom
- 2.20.2-SNAPSHOT
+ 2.20.47-SNAPSHOT
dynamodb-enhanced
AWS Java SDK :: DynamoDB :: Enhanced Client
@@ -106,6 +106,11 @@
aws-core
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ json-utils
+ ${awsjavasdk.version}
+
software.amazon.awssdk
http-client-spi
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java
index 513079acd0ca..45db89f5283c 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java
@@ -61,6 +61,7 @@
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalLongAttributeConverter;
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.PeriodAttributeConverter;
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SdkBytesAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SdkNumberAttributeConverter;
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SetAttributeConverter;
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ShortAttributeConverter;
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringAttributeConverter;
@@ -88,6 +89,8 @@
@ThreadSafe
@Immutable
public final class DefaultAttributeConverterProvider implements AttributeConverterProvider {
+ private static final DefaultAttributeConverterProvider INSTANCE = getDefaultBuilder().build();
+
private static final Logger log = Logger.loggerFor(DefaultAttributeConverterProvider.class);
private final ConcurrentHashMap, AttributeConverter> converterCache =
@@ -117,10 +120,9 @@ public DefaultAttributeConverterProvider() {
* Returns an attribute converter provider with all default converters set.
*/
public static DefaultAttributeConverterProvider create() {
- return getDefaultBuilder().build();
+ return INSTANCE;
}
-
/**
* Equivalent to {@code builder(EnhancedType.of(Object.class))}.
*/
@@ -246,7 +248,8 @@ private static Builder getDefaultBuilder() {
.addConverter(UuidAttributeConverter.create())
.addConverter(ZonedDateTimeAsStringAttributeConverter.create())
.addConverter(ZoneIdAttributeConverter.create())
- .addConverter(ZoneOffsetAttributeConverter.create());
+ .addConverter(ZoneOffsetAttributeConverter.create())
+ .addConverter(SdkNumberAttributeConverter.create());
}
/**
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableSchema.java
index c6926f73187d..bdf4ee35cbdb 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableSchema.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableSchema.java
@@ -20,6 +20,8 @@
import java.util.Map;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.document.DocumentTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.document.EnhancedDocument;
import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema;
import software.amazon.awssdk.enhanced.dynamodb.mapper.ImmutableTableSchema;
import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema;
@@ -84,6 +86,16 @@ static BeanTableSchema fromBean(Class beanClass) {
return BeanTableSchema.create(beanClass);
}
+ /**
+ * Provides interfaces to interact with DynamoDB tables as {@link EnhancedDocument} where the complete Schema of the table is
+ * not required.
+ *
+ * @return A {@link DocumentTableSchema.Builder} for instantiating DocumentTableSchema.
+ */
+ static DocumentTableSchema.Builder documentSchemaBuilder() {
+ return DocumentTableSchema.builder();
+ }
+
/**
* Scans an immutable class that has been annotated with DynamoDb immutable annotations and then returns a
* {@link ImmutableTableSchema} implementation of this interface that can map records to and from items of that
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/DocumentTableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/DocumentTableSchema.java
new file mode 100644
index 000000000000..a3283e969b36
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/DocumentTableSchema.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.document;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.DefaultAttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterProviderResolver;
+import software.amazon.awssdk.enhanced.dynamodb.internal.document.DefaultEnhancedDocument;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableMetadata;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+
+/**
+ * Implementation of {@link TableSchema} that builds a table schema based on DynamoDB Items.
+ *
+ * In Amazon DynamoDB, an item is a collection of attributes. Each attribute has a name and a value. An attribute value can be a
+ * scalar, a set, or a document type
+ *
+ * A DocumentTableSchema is used to create a {@link DynamoDbTable} which provides read and writes access to DynamoDB table as
+ * {@link EnhancedDocument}.
+ *
DocumentTableSchema specifying primaryKey, sortKey and a customAttributeConverter can be created as below
+ * {@snippet :
+ * DocumentTableSchema documentTableSchema = DocumentTableSchema.builder()
+ * .primaryKey("sampleHashKey", AttributeValueType.S)
+ * .sortKey("sampleSortKey", AttributeValueType.S)
+ * .attributeConverterProviders(customAttributeConverter, AttributeConverterProvider.defaultProvider())
+ * .build();
+ *}
+ *
DocumentTableSchema can also be created without specifying primaryKey and sortKey in which cases the
+ * {@link TableMetadata} of DocumentTableSchema will error if we try to access attributes from metaData. Also if
+ * attributeConverterProviders are not provided then {@link DefaultAttributeConverterProvider} will be used
+ * {@snippet :
+ * DocumentTableSchema documentTableSchema = DocumentTableSchema.builder().build();
+ *}
+ *
+ * @see Working
+ * with items and attributes
+ */
+@SdkPublicApi
+public final class DocumentTableSchema implements TableSchema {
+ private final TableMetadata tableMetadata;
+ private final List attributeConverterProviders;
+
+ private DocumentTableSchema(Builder builder) {
+ this.attributeConverterProviders = builder.attributeConverterProviders;
+ this.tableMetadata = builder.staticTableMetaDataBuilder.build();
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ @Override
+ public EnhancedDocument mapToItem(Map attributeMap) {
+ if (attributeMap == null) {
+ return null;
+ }
+ DefaultEnhancedDocument.DefaultBuilder builder =
+ (DefaultEnhancedDocument.DefaultBuilder) DefaultEnhancedDocument.builder();
+ attributeMap.forEach(builder::putObject);
+ return builder.attributeConverterProviders(attributeConverterProviders)
+ .build();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * This flag does not have significance for the Document API, unlike Java objects where the default value of an undefined
+ * Object is null.In contrast to mapped classes, where a schema is present, the DocumentSchema is unaware of the entire
+ * schema.Therefore, if an attribute is not present, it signifies that it is null, and there is no need to handle it in a
+ * separate way.However, if the user explicitly wants to nullify certain attributes, then the user needs to set those
+ * attributes as null in the Document that needs to be updated.
+ *
+ */
+ @Override
+ public Map itemToMap(EnhancedDocument item, boolean ignoreNulls) {
+ if (item == null) {
+ return null;
+ }
+ List providers = mergeAttributeConverterProviders(item);
+ return item.toBuilder().attributeConverterProviders(providers).build().toMap();
+ }
+
+ private List mergeAttributeConverterProviders(EnhancedDocument item) {
+ if (item.attributeConverterProviders() != null && !item.attributeConverterProviders().isEmpty()) {
+ Set providers = new LinkedHashSet<>();
+ providers.addAll(item.attributeConverterProviders());
+ providers.addAll(attributeConverterProviders);
+ return providers.stream().collect(Collectors.toList());
+ }
+ return attributeConverterProviders;
+ }
+
+ @Override
+ public Map itemToMap(EnhancedDocument item, Collection attributes) {
+ if (item.toMap() == null) {
+ return null;
+ }
+ List providers = mergeAttributeConverterProviders(item);
+ return item.toBuilder().attributeConverterProviders(providers).build().toMap().entrySet()
+ .stream()
+ .filter(entry -> attributes.contains(entry.getKey()))
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+ (left, right) -> left, LinkedHashMap::new));
+ }
+
+ @Override
+ public AttributeValue attributeValue(EnhancedDocument item, String attributeName) {
+ if (item == null) {
+ return null;
+ }
+ List providers = mergeAttributeConverterProviders(item);
+ return item.toBuilder()
+ .attributeConverterProviders(providers)
+ .build()
+ .toMap()
+ .get(attributeName);
+ }
+
+ @Override
+ public TableMetadata tableMetadata() {
+ return tableMetadata;
+ }
+
+ @Override
+ public EnhancedType itemType() {
+ return EnhancedType.of(EnhancedDocument.class);
+ }
+
+ @Override
+ public List attributeNames() {
+ return tableMetadata.keyAttributes().stream().map(key -> key.name()).collect(Collectors.toList());
+ }
+
+ @Override
+ public boolean isAbstract() {
+ return false;
+ }
+
+ @NotThreadSafe
+ public static final class Builder {
+
+ private final StaticTableMetadata.Builder staticTableMetaDataBuilder = StaticTableMetadata.builder();
+
+ /**
+ * By Default the defaultConverterProvider is used for converting AttributeValue to primitive types.
+ */
+ private List attributeConverterProviders =
+ Collections.singletonList(ConverterProviderResolver.defaultConverterProvider());
+
+ /**
+ * Adds information about a partition key associated with a specific index.
+ *
+ * @param indexName the name of the index to associate the partition key with
+ * @param attributeName the name of the attribute that represents the partition key
+ * @param attributeValueType the {@link AttributeValueType} of the partition key
+ * @throws IllegalArgumentException if a partition key has already been defined for this index
+ */
+ public Builder addIndexPartitionKey(String indexName, String attributeName, AttributeValueType attributeValueType) {
+ staticTableMetaDataBuilder.addIndexPartitionKey(indexName, attributeName, attributeValueType);
+ return this;
+ }
+
+ /**
+ * Adds information about a sort key associated with a specific index.
+ *
+ * @param indexName the name of the index to associate the sort key with
+ * @param attributeName the name of the attribute that represents the sort key
+ * @param attributeValueType the {@link AttributeValueType} of the sort key
+ * @throws IllegalArgumentException if a sort key has already been defined for this index
+ */
+ public Builder addIndexSortKey(String indexName, String attributeName, AttributeValueType attributeValueType) {
+ staticTableMetaDataBuilder.addIndexSortKey(indexName, attributeName, attributeValueType);
+ return this;
+ }
+
+ /**
+ * Specifies the {@link AttributeConverterProvider}s to use with the table schema. The list of attribute converter
+ * providers must provide {@link AttributeConverter}s for Custom types. The attribute converter providers will be loaded
+ * in the strict order they are supplied here.
+ *
+ * By default, {@link DefaultAttributeConverterProvider} will be used, and it will provide standard converters for most
+ * primitive and common Java types. Configuring this will override the default behavior, so it is recommended to always
+ * append `DefaultAttributeConverterProvider` when you configure the custom attribute converter providers.
+ *
+ * {@snippet :
+ * builder.attributeConverterProviders(customAttributeConverter, AttributeConverterProvider.defaultProvider());
+ *}
+ *
+ * @param attributeConverterProviders a list of attribute converter providers to use with the table schema
+ */
+ public Builder attributeConverterProviders(AttributeConverterProvider... attributeConverterProviders) {
+ this.attributeConverterProviders = Arrays.asList(attributeConverterProviders);
+ return this;
+ }
+
+ /**
+ * Specifies the {@link AttributeConverterProvider}s to use with the table schema. The list of attribute converter
+ * providers must provide {@link AttributeConverter}s for all types used in the schema. The attribute converter providers
+ * will be loaded in the strict order they are supplied here.
+ *
+ * By default, {@link DefaultAttributeConverterProvider} will be used, and it will provide standard converters for most
+ * primitive and common Java types. Configuring this will override the default behavior, so it is recommended to always
+ * append `DefaultAttributeConverterProvider` when you configure the custom attribute converter providers.
+ *
+ * {@snippet :
+ * List providers = new ArrayList<>( customAttributeConverter,
+ * AttributeConverterProvider.defaultProvider());
+ * builder.attributeConverterProviders(providers);
+ *}
+ *
+ * @param attributeConverterProviders a list of attribute converter providers to use with the table schema
+ */
+ public Builder attributeConverterProviders(List attributeConverterProviders) {
+ this.attributeConverterProviders = new ArrayList<>(attributeConverterProviders);
+ return this;
+ }
+
+ /**
+ * Builds a {@link StaticImmutableTableSchema} based on the values this builder has been configured with
+ */
+ public DocumentTableSchema build() {
+ return new DocumentTableSchema(this);
+ }
+ }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/EnhancedDocument.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/EnhancedDocument.java
new file mode 100644
index 000000000000..61bfa8bb3914
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/EnhancedDocument.java
@@ -0,0 +1,580 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.document;
+
+import static software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider.defaultProvider;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.SdkNumber;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.document.DefaultEnhancedDocument;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+
+/**
+ * Interface representing the Document API for DynamoDB. The Document API operations are designed to work with open content,
+ * such as data with no fixed schema, data that cannot be modeled using rigid types, or data that has a schema.
+ * This interface provides all the methods required to access a Document, as well as constructor methods for creating a
+ * Document that can be used to read and write to DynamoDB using the EnhancedDynamoDB client.
+ * Additionally, this interface provides flexibility when working with data, as it allows you to work with data that is not
+ * necessarily tied to a specific data model.
+ * The EnhancedDocument interface provides two ways to use AttributeConverterProviders:
+ * Enhanced Document with default attribute Converter to convert the attribute of DDB item to basic default primitive types in
+ * Java
+ * {@snippet :
+ * EnhancedDocument enhancedDocument = EnhancedDocument.builder().attributeConverterProviders(AttributeConverterProvider
+ * .defaultProvider()).build();
+ *}
+ *
Enhanced Document with Custom attribute Converter to convert the attribute of DDB Item to Custom Type.
+ * {@snippet :
+ * // CustomAttributeConverterProvider.create() is an example for some Custom converter provider
+ * EnhancedDocument enhancedDocumentWithCustomConverter = EnhancedDocument.builder().attributeConverterProviders
+ * (CustomAttributeConverterProvider.create(), AttributeConverterProvide.defaultProvider()
+ * .put("customObject", customObject, EnhancedType.of(CustomClass.class))
+ * .build();
+ *}
+ *
Enhanced Document can be created with Json as input using Static factory method.In this case it used
+ * defaultConverterProviders.
+ * {@snippet :
+ * EnhancedDocument enhancedDocumentWithCustomConverter = EnhancedDocument.fromJson("{\"k\":\"v\"}");
+ *}
+ * The attribute converter are always required to be provided, thus for default conversion
+ * {@link AttributeConverterProvider#defaultProvider()} must be supplied.
+ */
+@SdkPublicApi
+public interface EnhancedDocument {
+
+ /**
+ * Creates a new EnhancedDocument instance from a JSON string.
+ * The {@link AttributeConverterProvider#defaultProvider()} is used as the default ConverterProvider.
+ * To use a custom ConverterProvider, use the builder methods: {@link Builder#json(String)} to supply the JSON string,
+ * then use {@link Builder#attributeConverterProviders(AttributeConverterProvider...)} to provide the custom
+ * ConverterProvider.
+ * {@snippet :
+ * EnhancedDocument documentFromJson = EnhancedDocument.fromJson("{\"key\": \"Value\"}");
+ *}
+ * @param json The JSON string representation of a DynamoDB Item.
+ * @return A new instance of EnhancedDocument.
+ * @throws IllegalArgumentException if the json parameter is null
+ */
+ static EnhancedDocument fromJson(String json) {
+ Validate.paramNotNull(json, "json");
+ return DefaultEnhancedDocument.builder()
+ .json(json)
+ .attributeConverterProviders(defaultProvider())
+ .build();
+ }
+
+ /**
+ * Creates a new EnhancedDocument instance from a AttributeValue Map.
+ * The {@link AttributeConverterProvider#defaultProvider()} is used as the default ConverterProvider.
+ * Example usage:
+ * {@snippet :
+ * EnhancedDocument documentFromJson = EnhancedDocument.fromAttributeValueMap(stringKeyAttributeValueMao)});
+ *}
+ * @param attributeValueMap - Map with Attributes as String keys and AttributeValue as Value.
+ * @return A new instance of EnhancedDocument.
+ * @throws IllegalArgumentException if the json parameter is null
+ */
+ static EnhancedDocument fromAttributeValueMap(Map attributeValueMap) {
+ Validate.paramNotNull(attributeValueMap, "attributeValueMap");
+ return DefaultEnhancedDocument.builder()
+ .attributeValueMap(attributeValueMap)
+ .attributeConverterProviders(defaultProvider())
+ .build();
+ }
+
+ /**
+ * Creates a default builder for {@link EnhancedDocument}.
+ */
+ static Builder builder() {
+ return DefaultEnhancedDocument.builder();
+ }
+
+ /**
+ * Converts an existing EnhancedDocument into a builder object that can be used to modify its values and then create a new
+ * EnhancedDocument.
+ *
+ * @return A {@link EnhancedDocument.Builder} initialized with the values of this EnhancedDocument.
+ */
+ Builder toBuilder();
+
+ /**
+ * Checks if the document is a {@code null} value.
+ *
+ * @param attributeName Name of the attribute that needs to be checked.
+ * @return true if the specified attribute exists with a null value; false otherwise.
+ */
+ boolean isNull(String attributeName);
+
+ /**
+ * Checks if the attribute exists in the document.
+ *
+ * @param attributeName Name of the attribute that needs to be checked.
+ * @return true if the specified attribute exists with a null/non-null value; false otherwise.
+ */
+ boolean isPresent(String attributeName);
+
+ /**
+ * Returns the value of the specified attribute in the current document as a specified {@link EnhancedType}; or null if the
+ * attribute either doesn't exist or the attribute value is null.
+ *
+ * Retrieving String Type for a document
+ * {@snippet :
+ * String resultCustom = document.get("key", EnhancedType.of(String.class));
+ * }
+ * Retrieving Custom Type for which Convertor Provider was defined while creating the document
+ * {@snippet :
+ * Custom resultCustom = document.get("key", EnhancedType.of(Custom.class));
+ * }
+ * Retrieving list of strings in a document
+ * {@snippet :
+ * List resultList = document.get("key", EnhancedType.listOf(String.class));
+ * }
+ * Retrieving a Map with List of strings in its values
+ * {@snippet :
+ * Map>> resultNested = document.get("key", new EnhancedType>>(){});
+ * }
+ *
+ * @param attributeName Name of the attribute.
+ * @param type EnhancedType of the value
+ * @param The type of the attribute value.
+ * @return Attribute value of type T
+ * }
+ */
+ T get(String attributeName, EnhancedType type);
+
+ /**
+ * Returns the value of the specified attribute in the current document as a specified class type; or null if the
+ * attribute either doesn't exist or the attribute value is null.
+ *
+ * Retrieving String Type for a document
+ * {@snippet :
+ * String resultCustom = document.get("key", String.class);
+ * }
+ * Retrieving Custom Type for which Convertor Provider was defined while creating the document
+ * {@snippet :
+ * Custom resultCustom = document.get("key", Custom.class);
+ * }
+ *
+ * Note :
+ * This API should not be used to retrieve values of List and Map types.
+ * Instead, getList and getMap APIs should be used to retrieve attributes of type List and Map, respectively.
+ *
+ * @param attributeName Name of the attribute.
+ * @param clazz Class type of value.
+ * @param The type of the attribute value.
+ * @return Attribute value of type T
+ * }
+ */
+ T get(String attributeName, Class clazz);
+
+ /**
+ * Gets the String value of specified attribute in the document.
+ *
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a string; or null if the attribute either doesn't exist
+ * or the attribute value is null
+ */
+ String getString(String attributeName);
+
+ /**
+ * Gets the {@link SdkNumber} value of specified attribute in the document.
+ *
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a number; or null if the attribute either doesn't exist
+ * or the attribute value is null
+ */
+ SdkNumber getNumber(String attributeName);
+
+ /**
+ * Gets the {@link SdkBytes} value of specified attribute in the document.
+ *
+ * @param attributeName Name of the attribute.
+ * @return the value of the specified attribute in the current document as SdkBytes; or null if the attribute either
+ * doesn't exist or the attribute value is null.
+ */
+ SdkBytes getBytes(String attributeName);
+
+ /**
+ * Gets the Set of String values of the given attribute in the current document.
+ * @param attributeName the name of the attribute.
+ * @return the value of the specified attribute in the current document as a set of strings; or null if the attribute either
+ * does not exist or the attribute value is null.
+ */
+ Set getStringSet(String attributeName);
+
+ /**
+ * Gets the Set of String values of the given attribute in the current document.
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a set of SdkNumber; or null if the attribute either
+ * doesn't exist or the attribute value is null.
+ */
+ Set getNumberSet(String attributeName);
+
+ /**
+ * Gets the Set of String values of the given attribute in the current document.
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a set of SdkBytes;
+ * or null if the attribute doesn't exist.
+ */
+ Set getBytesSet(String attributeName);
+
+ /**
+ * Gets the List of values of type T for the given attribute in the current document.
+ *
+ * @param attributeName Name of the attribute.
+ * @param type {@link EnhancedType} of Type T.
+ * @param Type T of List elements
+ * @return value of the specified attribute in the current document as a list of type T,
+ * or null if the attribute does not exist.
+ */
+
+ List getList(String attributeName, EnhancedType type);
+
+ /**
+ * Returns a map of a specific Key-type and Value-type based on the given attribute name, key type, and value type.
+ * Example usage: When getting an attribute as a map of {@link UUID} keys and {@link Integer} values, use this API
+ * as shown below:
+ * {@snippet :
+ Map result = document.getMap("key", EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+ * }
+ * @param attributeName The name of the attribute that needs to be get as Map.
+ * @param keyType Enhanced Type of Key attribute, like String, UUID etc that can be represented as String Keys.
+ * @param valueType Enhanced Type of Values , which have converters defineds in
+ * {@link Builder#attributeConverterProviders(AttributeConverterProvider...)} for the document
+ * @return Map of type K and V with the given attribute name, key type, and value type.
+ * @param The type of the Map keys.
+ * @param The type of the Map values.
+ */
+ Map getMap(String attributeName, EnhancedType keyType, EnhancedType valueType);
+
+ /**
+ * Gets the JSON document value of the specified attribute.
+ *
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a JSON string; or null if the attribute either
+ * doesn't exist or the attribute value is null.
+ */
+ String getJson(String attributeName);
+
+ /**
+ * Gets the {@link Boolean} value for the specified attribute.
+ *
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a Boolean representation; or null if the attribute
+ * either doesn't exist or the attribute value is null.
+ * @throws RuntimeException
+ * if the attribute value cannot be converted to a Boolean representation.
+ * Note that the Boolean representation of 0 and 1 in Numbers and "0" and "1" in Strings is false and true,
+ * respectively.
+ *
+ */
+ Boolean getBoolean(String attributeName);
+
+
+ /**
+ * Retrieves a list of {@link AttributeValue} objects for a specified attribute in a document.
+ * This API should be used when the elements of the list are a combination of different types such as Strings, Maps,
+ * and Numbers.
+ * If all elements in the list are of a known fixed type, use {@link EnhancedDocument#getList(String, EnhancedType)} instead.
+ *
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a List of {@link AttributeValue}
+ */
+ List getListOfUnknownType(String attributeName);
+
+ /**
+ * Retrieves a Map with String keys and corresponding AttributeValue objects as values for a specified attribute in a
+ * document. This API is particularly useful when the values of the map are of different types such as strings, maps, and
+ * numbers. However, if all the values in the map for a given attribute key are of a known fixed type, it is recommended to
+ * use the method EnhancedDocument#getMap(String, EnhancedType, EnhancedType) instead.
+ *
+ * @param attributeName Name of the attribute.
+ * @return value of the specified attribute in the current document as a {@link AttributeValue}
+ */
+ Map getMapOfUnknownType(String attributeName);
+
+ /**
+ *
+ * @return document as a JSON string. Note all binary data will become base-64 encoded in the resultant string.
+ */
+ String toJson();
+
+ /**
+ * This method converts a document into a key-value map with the keys as String objects and the values as AttributeValue
+ * objects. It can be particularly useful for documents with attributes of unknown types, as it allows for further processing
+ * or manipulation of the document data in a AttributeValue format.
+ * @return Document as a String AttributeValue Key-Value Map
+ */
+ Map toMap();
+
+ /**
+ *
+ * @return List of AttributeConverterProvider defined for the given Document.
+ */
+ List attributeConverterProviders();
+
+ @NotThreadSafe
+ interface Builder {
+
+ /**
+ * Appends an attribute of name attributeName with specified {@link String} value to the document builder.
+ * Use this method when you need to add a string value to a document. If you need to add an attribute with a value of a
+ * different type, such as a number or a map, use the appropriate put method instead
+ *
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param value The string value that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putString(String attributeName, String value);
+
+ /**
+ * Appends an attribute of name attributeName with specified {@link Number} value to the document builder.
+ * Use this method when you need to add a number value to a document. If you need to add an attribute with a value of a
+ * different type, such as a string or a map, use the appropriate put method instead
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param value The number value that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putNumber(String attributeName, Number value);
+
+ /**
+ * Appends an attribute of name attributeName with specified {@link SdkBytes} value to the document builder.
+ * Use this method when you need to add a binary value to a document. If you need to add an attribute with a value of a
+ * different type, such as a string or a map, use the appropriate put method instead
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param value The byte array value that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putBytes(String attributeName, SdkBytes value);
+
+ /**
+ * Use this method when you need to add a boolean value to a document. If you need to add an attribute with a value of a
+ * different type, such as a string or a map, use the appropriate put method instead.
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param value The boolean value that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putBoolean(String attributeName, boolean value);
+
+ /**
+ * Appends an attribute of name attributeName with a null value.
+ * Use this method is the attribute needs to explicitly set to null in Dynamo DB table.
+ *
+ * @param attributeName the name of the attribute to be added to the document.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putNull(String attributeName);
+
+ /**
+ * Appends an attribute to the document builder with a Set of Strings as its value.
+ * This method is intended for use in DynamoDB where attribute values are stored as Sets of Strings.
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param values Set of String values that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putStringSet(String attributeName, Set values);
+
+ /**
+ * Appends an attribute of name attributeName with specified Set of {@link Number} values to the document builder.
+ *
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param values Set of Number values that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putNumberSet(String attributeName, Set values);
+
+ /**
+ * Appends an attribute of name attributeName with specified Set of {@link SdkBytes} values to the document builder.
+ *
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param values Set of SdkBytes values that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putBytesSet(String attributeName, Set values);
+
+ /**
+ * Appends an attribute with the specified name and a list of {@link EnhancedType} T type elements to the document
+ * builder.
+ * Use {@link EnhancedType#of(Class)} to specify the class type of the list elements.
+ * For example, to insert a list of String type:
+ * {@snippet :
+ * EnhancedDocument.builder().putList(stringList, EnhancedType.of(String.class))
+ * }
+ *
Example for inserting a List of Custom type .
+ * {@snippet :
+ * EnhancedDocument.builder().putList(stringList, EnhancedType.of(CustomClass.class));
+ * }
+ * Note that the AttributeConverterProvider added to the DocumentBuilder should provide the converter for the class T that
+ * is to be inserted.
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param value The list of values that needs to be set.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putList(String attributeName, List value, EnhancedType type);
+
+ /**
+ * Appends an attribute named {@code attributeName} with a value of type {@link EnhancedType} T.
+ * Use this method to insert attribute values of custom types that have attribute converters defined in a converter
+ * provider.
+ * Example:
+ {@snippet :
+ * EnhancedDocument.builder().put("customKey", customValue, EnhancedType.of(CustomClass.class));
+ *}
+ * Use {@link #putString(String, String)} or {@link #putNumber(String, Number)} for inserting simple value types of
+ * attributes.
+ * Use {@link #putList(String, List, EnhancedType)} or {@link #putMap(String, Map, EnhancedType, EnhancedType)} for
+ * inserting collections of attribute values.
+ * Note that the attribute converter provider added to the DocumentBuilder must provide the converter for the class T
+ * that is to be inserted.
+ @param attributeName the name of the attribute to be added to the document.
+ @param value the value to set.
+ @param type the Enhanced type of the value to set.
+ @return a builder instance to construct a {@link EnhancedDocument}.
+ @param the type of the value to set.
+ */
+ Builder put(String attributeName, T value, EnhancedType type);
+
+ /**
+ * Appends an attribute named {@code attributeName} with a value of Class type T.
+ * Use this method to insert attribute values of custom types that have attribute converters defined in a converter
+ * provider.
+ * Example:
+ {@snippet :
+ * EnhancedDocument.builder().put("customKey", customValue, CustomClass.class);
+ *}
+ * Use {@link #putString(String, String)} or {@link #putNumber(String, Number)} for inserting simple value types of
+ * attributes.
+ * Use {@link #putList(String, List, EnhancedType)} or {@link #putMap(String, Map, EnhancedType, EnhancedType)} for
+ * inserting collections of attribute values.
+ * Note that the attribute converter provider added to the DocumentBuilder must provide the converter for the class T
+ * that is to be inserted.
+ @param attributeName the name of the attribute to be added to the document.
+ @param value the value to set.
+ @param type the type of the value to set.
+ @return a builder instance to construct a {@link EnhancedDocument}.
+ @param the type of the value to set.
+ */
+ Builder put(String attributeName, T value, Class type);
+
+ /**
+ * Appends an attribute with the specified name and a Map containing keys and values of {@link EnhancedType} K
+ * and V types,
+ * respectively, to the document builder. Use {@link EnhancedType#of(Class)} to specify the class type of the keys and
+ * values.
+ * For example, to insert a map with String keys and Long values:
+ * {@snippet :
+ * EnhancedDocument.builder().putMap("stringMap", mapWithStringKeyNumberValue, EnhancedType.of(String.class),
+ * EnhancedType.of(String.class), EnhancedType.of(Long.class))
+ *}
+ *
For example, to insert a map of String Key and Custom Values:
+ * {@snippet :
+ * EnhancedDocument.builder().putMap("customMap", mapWithStringKeyCustomValue, EnhancedType.of(String.class),
+ * EnhancedType.of(String.class), EnhancedType.of(Custom.class))
+ *}
+ * Note that the AttributeConverterProvider added to the DocumentBuilder should provide the converter for the classes
+ * K and V that
+ * are to be inserted.
+ * @param attributeName the name of the attribute to be added to the document
+ * @param value The Map of values that needs to be set.
+ * @param keyType Enhanced type of Key class
+ * @param valueType Enhanced type of Value class.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putMap(String attributeName, Map value, EnhancedType keyType, EnhancedType valueType);
+
+ /**
+ Appends an attribute to the document builder with the specified name and value of a JSON document in string format.
+ * @param attributeName the name of the attribute to be added to the document.
+ * @param json JSON document in the form of a string.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder putJson(String attributeName, String json);
+
+
+ /**
+ * Removes a previously appended attribute.
+ * This can be used where a previously added attribute to the Builder is no longer needed.
+ * @param attributeName The attribute that needs to be removed.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder remove(String attributeName);
+
+ /**
+ * Appends collection of attributeConverterProvider to the document builder. These
+ * AttributeConverterProvider will be used to convert any given key to custom type T.
+ * The first matching converter from the given provider will be selected based on the order in which they are added.
+ * @param attributeConverterProvider determining the {@link AttributeConverter} to use for converting a value.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder addAttributeConverterProvider(AttributeConverterProvider attributeConverterProvider);
+
+ /**
+ * Sets the collection of attributeConverterProviders to the document builder. These AttributeConverterProvider will be
+ * used to convert value of any given key to custom type T.
+ * The first matching converter from the given provider will be selected based on the order in which they are added.
+ * @param attributeConverterProviders determining the {@link AttributeConverter} to use for converting a value.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder attributeConverterProviders(List attributeConverterProviders);
+
+ /**
+ * Sets collection of attributeConverterProviders to the document builder. These AttributeConverterProvider will be
+ * used to convert any given key to custom type T.
+ * The first matching converter from the given provider will be selected based on the order in which they are added.
+ * @param attributeConverterProvider determining the {@link AttributeConverter} to use for converting a value.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder attributeConverterProviders(AttributeConverterProvider... attributeConverterProvider);
+
+ /**
+ * Sets the attributes of the document builder to those specified in the provided JSON string, and completely replaces
+ * any previously set attributes.
+ *
+ * @param json a JSON document represented as a string
+ * @return a builder instance to construct a {@link EnhancedDocument}
+ * @throws NullPointerException if the json parameter is null
+ */
+ Builder json(String json);
+
+ /**
+ * Sets the attributes of the document builder to those specified in the provided from a AttributeValue Map, and
+ * completely replaces any previously set attributes.
+ *
+ * @param attributeValueMap - Map with Attributes as String keys and AttributeValue as Value.
+ * @return Builder instance to construct a {@link EnhancedDocument}
+ */
+ Builder attributeValueMap(Map attributeValueMap);
+
+ /**
+ * Builds an instance of {@link EnhancedDocument}.
+ *
+ * @return instance of {@link EnhancedDocument} implementation.
+ */
+ EnhancedDocument build();
+ }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtils.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtils.java
index c6f54f32e5e5..1036de6eb642 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtils.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtils.java
@@ -37,7 +37,7 @@
@SdkInternalApi
public final class EnhancedClientUtils {
private static final Set SPECIAL_CHARACTERS = Stream.of(
- '*', '.', '-', '#', '+', ':', '/', '(', ')',
+ '*', '.', '-', '#', '+', ':', '/', '(', ')', ' ',
'&', '<', '>', '?', '=', '!', '@', '%', '$', '|').collect(Collectors.toSet());
private EnhancedClientUtils() {
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProvider.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProvider.java
index a455051adb5f..8646810102dc 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProvider.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProvider.java
@@ -19,6 +19,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
@@ -67,4 +68,22 @@ public AttributeConverter converterFor(EnhancedType enhancedType) {
.map(p -> p.converterFor(enhancedType))
.findFirst().orElse(null);
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ ChainConverterProvider that = (ChainConverterProvider) o;
+ return Objects.equals(providerChain, that.providerChain);
+ }
+
+ @Override
+ public int hashCode() {
+ return providerChain != null ? providerChain.hashCode() : 0;
+ }
+
}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java
index 13e68b25cc01..0f6f20583187 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java
@@ -53,14 +53,19 @@ public static void validateFloat(Float input) {
}
public static String padLeft(int paddingAmount, int valueToPad) {
+ String result;
String value = Integer.toString(valueToPad);
- int padding = paddingAmount - value.length();
- StringBuilder result = new StringBuilder(paddingAmount);
- for (int i = 0; i < padding; i++) {
- result.append('0');
+ if (value.length() == paddingAmount) {
+ result = value;
+ } else {
+ int padding = paddingAmount - value.length();
+ StringBuilder sb = new StringBuilder(paddingAmount);
+ for (int i = 0; i < padding; i++) {
+ sb.append('0');
+ }
+ result = sb.append(value).toString();
}
- result.append(value);
- return result.toString();
+ return result;
}
public static String[] splitNumberOnDecimal(String valueToSplit) {
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonItemAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonItemAttributeConverter.java
new file mode 100644
index 000000000000..ce5a72278857
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonItemAttributeConverter.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.protocols.jsoncore.JsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.ArrayJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.BooleanJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.NullJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.NumberJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.ObjectJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.StringJsonNode;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.BinaryUtils;
+
+/**
+ * An Internal converter between JsonNode and {@link AttributeValue}.
+ *
+ *
+ * This converts the Attribute Value read from the DDB to JsonNode.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class JsonItemAttributeConverter implements AttributeConverter {
+ private static final Visitor VISITOR = new Visitor();
+
+ private JsonItemAttributeConverter() {
+ }
+
+ public static JsonItemAttributeConverter create() {
+ return new JsonItemAttributeConverter();
+ }
+
+ @Override
+ public EnhancedType type() {
+ return EnhancedType.of(JsonNode.class);
+ }
+
+ @Override
+ public AttributeValueType attributeValueType() {
+ return AttributeValueType.M;
+ }
+
+ @Override
+ public AttributeValue transformFrom(JsonNode input) {
+ JsonNodeToAttributeValueMapConverter attributeValueMapConverter = JsonNodeToAttributeValueMapConverter.instance();
+ return input.visit(attributeValueMapConverter);
+ }
+
+ @Override
+ public JsonNode transformTo(AttributeValue input) {
+ if (AttributeValue.fromNul(true).equals(input)) {
+ return NullJsonNode.instance();
+ }
+ return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+ }
+
+ private static final class Visitor extends TypeConvertingVisitor {
+ private Visitor() {
+ super(JsonNode.class, JsonItemAttributeConverter.class);
+ }
+
+ @Override
+ public JsonNode convertMap(Map value) {
+ if (value == null) {
+ return null;
+ }
+ Map jsonNodeMap = new LinkedHashMap<>();
+ value.entrySet().forEach(
+ k -> {
+ JsonNode jsonNode = this.convert(EnhancedAttributeValue.fromAttributeValue(k.getValue()));
+ jsonNodeMap.put(k.getKey(), jsonNode == null ? NullJsonNode.instance() : jsonNode);
+ });
+ return new ObjectJsonNode(jsonNodeMap);
+ }
+
+ @Override
+ public JsonNode convertString(String value) {
+ if (value == null) {
+ return null;
+ }
+ return new StringJsonNode(value);
+ }
+
+ @Override
+ public JsonNode convertNumber(String value) {
+ if (value == null) {
+ return null;
+ }
+ return new NumberJsonNode(value);
+ }
+
+ @Override
+ public JsonNode convertBytes(SdkBytes value) {
+ if (value == null) {
+ return null;
+ }
+ return new StringJsonNode(BinaryUtils.toBase64(value.asByteArray()));
+ }
+
+ @Override
+ public JsonNode convertBoolean(Boolean value) {
+ if (value == null) {
+ return null;
+ }
+ return new BooleanJsonNode(value);
+ }
+
+ @Override
+ public JsonNode convertSetOfStrings(List value) {
+ if (value == null) {
+ return null;
+ }
+ return new ArrayJsonNode(value.stream().map(StringJsonNode::new).collect(Collectors.toList()));
+ }
+
+ @Override
+ public JsonNode convertSetOfNumbers(List value) {
+ if (value == null) {
+ return null;
+ }
+ return new ArrayJsonNode(value.stream().map(NumberJsonNode::new).collect(Collectors.toList()));
+ }
+
+ @Override
+ public JsonNode convertSetOfBytes(List value) {
+ if (value == null) {
+ return null;
+ }
+ return new ArrayJsonNode(value.stream().map(
+ sdkByte -> new StringJsonNode(BinaryUtils.toBase64(sdkByte.asByteArray()))
+ ).collect(Collectors.toList()));
+ }
+
+ @Override
+ public JsonNode convertListOfAttributeValues(List value) {
+ if (value == null) {
+ return null;
+ }
+ return new ArrayJsonNode(value.stream().map(
+ attributeValue -> {
+ EnhancedAttributeValue enhancedAttributeValue = EnhancedAttributeValue.fromAttributeValue(attributeValue);
+ return enhancedAttributeValue.isNull() ? NullJsonNode.instance() : enhancedAttributeValue.convert(VISITOR);
+ }).collect(Collectors.toList()));
+ }
+ }
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonNodeToAttributeValueMapConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonNodeToAttributeValueMapConverter.java
new file mode 100644
index 000000000000..f7a8b6643f34
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonNodeToAttributeValueMapConverter.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.protocols.jsoncore.JsonNode;
+import software.amazon.awssdk.protocols.jsoncore.JsonNodeVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public class JsonNodeToAttributeValueMapConverter implements JsonNodeVisitor {
+
+ private static final JsonNodeToAttributeValueMapConverter INSTANCE = new JsonNodeToAttributeValueMapConverter();
+
+ private JsonNodeToAttributeValueMapConverter() {
+ }
+
+ public static JsonNodeToAttributeValueMapConverter instance() {
+ return INSTANCE;
+ }
+
+ @Override
+ public AttributeValue visitNull() {
+ return AttributeValue.fromNul(true);
+ }
+
+ @Override
+ public AttributeValue visitBoolean(boolean bool) {
+ return AttributeValue.builder().bool(bool).build();
+ }
+
+ @Override
+ public AttributeValue visitNumber(String number) {
+ return AttributeValue.builder().n(number).build();
+ }
+
+ @Override
+ public AttributeValue visitString(String string) {
+ return AttributeValue.builder().s(string).build();
+ }
+
+ @Override
+ public AttributeValue visitArray(List array) {
+ return AttributeValue.builder().l(array.stream()
+ .map(node -> node.visit(this))
+ .collect(Collectors.toList()))
+ .build();
+ }
+
+ @Override
+ public AttributeValue visitObject(Map object) {
+ return AttributeValue.builder().m(object.entrySet().stream()
+ .collect(Collectors.toMap(
+ Map.Entry::getKey,
+ entry -> entry.getValue().visit(this),
+ (left, right) -> left, LinkedHashMap::new)))
+ .build();
+ }
+
+ @Override
+ public AttributeValue visitEmbeddedObject(Object embeddedObject) {
+ throw new UnsupportedOperationException("Embedded objects are not supported within Document types.");
+ }
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SdkNumberAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SdkNumberAttributeConverter.java
new file mode 100644
index 000000000000..80b983fa2076
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SdkNumberAttributeConverter.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkNumber;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.SdkNumberStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link SdkNumber} and {@link AttributeValue}.
+ *
+ *
+ * This stores values in DynamoDB as a number.
+ *
+ *
+ * This supports reading the full range of integers supported by DynamoDB. For smaller numbers, consider using
+ * {@link ShortAttributeConverter}, {@link IntegerAttributeConverter} or {@link LongAttributeConverter}.
+ *
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class SdkNumberAttributeConverter implements AttributeConverter {
+ private static final Visitor VISITOR = new Visitor();
+ private static final SdkNumberStringConverter STRING_CONVERTER = SdkNumberStringConverter.create();
+
+ private SdkNumberAttributeConverter() {
+ }
+
+ public static SdkNumberAttributeConverter create() {
+ return new SdkNumberAttributeConverter();
+ }
+
+ @Override
+ public EnhancedType type() {
+ return EnhancedType.of(SdkNumber.class);
+ }
+
+ @Override
+ public AttributeValueType attributeValueType() {
+ return AttributeValueType.N;
+ }
+
+ @Override
+ public AttributeValue transformFrom(SdkNumber input) {
+ return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+ }
+
+ @Override
+ public SdkNumber transformTo(AttributeValue input) {
+ if (input.n() != null) {
+ return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+ }
+ return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+ }
+
+ private static final class Visitor extends TypeConvertingVisitor {
+ private Visitor() {
+ super(SdkNumber.class, SdkNumberAttributeConverter.class);
+ }
+
+ @Override
+ public SdkNumber convertString(String value) {
+ return STRING_CONVERTER.fromString(value);
+ }
+
+ @Override
+ public SdkNumber convertNumber(String value) {
+ return STRING_CONVERTER.fromString(value);
+ }
+ }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/SdkNumberStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/SdkNumberStringConverter.java
new file mode 100644
index 000000000000..c34ecfb982c3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/SdkNumberStringConverter.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkNumber;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link SdkNumber} and {@link String}.
+ *
+ *
+ * This converts values using {@link SdkNumber#toString()} and {@link SdkNumber#fromString(String)}}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class SdkNumberStringConverter implements StringConverter {
+ private SdkNumberStringConverter() {
+ }
+
+ public static SdkNumberStringConverter create() {
+ return new SdkNumberStringConverter();
+ }
+
+ @Override
+ public EnhancedType type() {
+ return EnhancedType.of(SdkNumber.class);
+ }
+
+ @Override
+ public SdkNumber fromString(String string) {
+ return SdkNumber.fromString(string);
+ }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/DefaultEnhancedDocument.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/DefaultEnhancedDocument.java
new file mode 100644
index 000000000000..1ec72a21b82a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/DefaultEnhancedDocument.java
@@ -0,0 +1,506 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.document;
+
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.document.JsonStringFormatHelper.addEscapeCharacters;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.document.JsonStringFormatHelper.stringValue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.SdkNumber;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.document.EnhancedDocument;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ChainConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ListAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.MapAttributeConverter;
+import software.amazon.awssdk.protocols.jsoncore.JsonNode;
+import software.amazon.awssdk.protocols.jsoncore.JsonNodeParser;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Lazy;
+import software.amazon.awssdk.utils.StringUtils;
+import software.amazon.awssdk.utils.Validate;
+
+
+/**
+ * Default implementation of {@link EnhancedDocument} used by the SDK to create Enhanced Documents. Attributes are initially saved
+ * as a String-Object Map when documents are created using the builder. Conversion to an AttributeValueMap is done lazily when
+ * values are accessed. When the document is retrieved from DynamoDB, the AttributeValueMap is internally saved as the attribute
+ * value map. Custom objects or collections are saved in the enhancedTypeMap to preserve the generic class information. Note that
+ * no default ConverterProviders are assigned, so ConverterProviders must be passed in the builder when creating enhanced
+ * documents.
+ */
+@Immutable
+@SdkInternalApi
+public class DefaultEnhancedDocument implements EnhancedDocument {
+
+ private static final Lazy NULL_SET_ERROR = new Lazy<>(
+ () -> new IllegalStateException("Set must not have null values."));
+
+ private static final JsonItemAttributeConverter JSON_ATTRIBUTE_CONVERTER = JsonItemAttributeConverter.create();
+ private static final String VALIDATE_TYPE_ERROR = "Values of type %s are not supported by this API, please use the "
+ + "%s%s API instead";
+ private static final AttributeValue NULL_ATTRIBUTE_VALUE = AttributeValue.fromNul(true);
+ private final Map nonAttributeValueMap;
+ private final Map enhancedTypeMap;
+ private final List attributeConverterProviders;
+ private final ChainConverterProvider attributeConverterChain;
+ private final Lazy> attributeValueMap = new Lazy<>(this::initializeAttributeValueMap);
+
+ public DefaultEnhancedDocument(DefaultBuilder builder) {
+ this.nonAttributeValueMap = unmodifiableMap(new LinkedHashMap<>(builder.nonAttributeValueMap));
+ this.attributeConverterProviders = unmodifiableList(new ArrayList<>(builder.attributeConverterProviders));
+ this.attributeConverterChain = ChainConverterProvider.create(attributeConverterProviders);
+ this.enhancedTypeMap = unmodifiableMap(builder.enhancedTypeMap);
+ }
+
+ public static Builder builder() {
+ return new DefaultBuilder();
+ }
+
+ public static AttributeConverter converterForClass(EnhancedType type,
+ ChainConverterProvider chainConverterProvider) {
+
+ if (type.rawClass().isAssignableFrom(List.class)) {
+ return (AttributeConverter) ListAttributeConverter
+ .create(converterForClass(type.rawClassParameters().get(0), chainConverterProvider));
+ }
+ if (type.rawClass().isAssignableFrom(Map.class)) {
+ return (AttributeConverter) MapAttributeConverter.mapConverter(
+ StringConverterProvider.defaultProvider().converterFor(type.rawClassParameters().get(0)),
+ converterForClass(type.rawClassParameters().get(1), chainConverterProvider));
+ }
+ return Optional.ofNullable(chainConverterProvider.converterFor(type))
+ .orElseThrow(() -> new IllegalStateException(
+ "AttributeConverter not found for class " + type
+ + ". Please add an AttributeConverterProvider for this type. If it is a default type, add the "
+ + "DefaultAttributeConverterProvider to the builder."));
+ }
+
+ @Override
+ public Builder toBuilder() {
+ return new DefaultBuilder(this);
+ }
+
+ @Override
+ public List attributeConverterProviders() {
+ return attributeConverterProviders;
+ }
+
+ @Override
+ public boolean isNull(String attributeName) {
+ if (!isPresent(attributeName)) {
+ return false;
+ }
+ Object attributeValue = nonAttributeValueMap.get(attributeName);
+ return attributeValue == null || NULL_ATTRIBUTE_VALUE.equals(attributeValue);
+ }
+
+ @Override
+ public boolean isPresent(String attributeName) {
+ return nonAttributeValueMap.containsKey(attributeName);
+ }
+
+ @Override
+ public T get(String attributeName, EnhancedType type) {
+ AttributeValue attributeValue = attributeValueMap.getValue().get(attributeName);
+ if (attributeValue == null) {
+ return null;
+ }
+ return fromAttributeValue(attributeValue, type);
+ }
+
+ @Override
+ public String getString(String attributeName) {
+ return get(attributeName, String.class);
+ }
+
+ @Override
+ public SdkNumber getNumber(String attributeName) {
+ return get(attributeName, SdkNumber.class);
+ }
+
+ @Override
+ public T get(String attributeName, Class clazz) {
+ checkAndValidateClass(clazz, false);
+ return get(attributeName, EnhancedType.of(clazz));
+ }
+
+ @Override
+ public SdkBytes getBytes(String attributeName) {
+ return get(attributeName, SdkBytes.class);
+ }
+
+ @Override
+ public Set getStringSet(String attributeName) {
+ return get(attributeName, EnhancedType.setOf(String.class));
+
+ }
+
+ @Override
+ public Set getNumberSet(String attributeName) {
+ return get(attributeName, EnhancedType.setOf(SdkNumber.class));
+ }
+
+ @Override
+ public Set getBytesSet(String attributeName) {
+ return get(attributeName, EnhancedType.setOf(SdkBytes.class));
+ }
+
+ @Override
+ public List getList(String attributeName, EnhancedType type) {
+ return get(attributeName, EnhancedType.listOf(type));
+ }
+
+ @Override
+ public Map getMap(String attributeName, EnhancedType keyType, EnhancedType valueType) {
+ return get(attributeName, EnhancedType.mapOf(keyType, valueType));
+ }
+
+ @Override
+ public String getJson(String attributeName) {
+ AttributeValue attributeValue = attributeValueMap.getValue().get(attributeName);
+ if (attributeValue == null) {
+ return null;
+ }
+ return stringValue(JSON_ATTRIBUTE_CONVERTER.transformTo(attributeValue));
+ }
+
+ @Override
+ public Boolean getBoolean(String attributeName) {
+ return get(attributeName, Boolean.class);
+ }
+
+ @Override
+ public List getListOfUnknownType(String attributeName) {
+ AttributeValue attributeValue = attributeValueMap.getValue().get(attributeName);
+ if (attributeValue == null) {
+ return null;
+ }
+ if (!attributeValue.hasL()) {
+ throw new IllegalStateException("Cannot get a List from attribute value of Type " + attributeValue.type());
+ }
+ return attributeValue.l();
+ }
+
+ @Override
+ public Map getMapOfUnknownType(String attributeName) {
+ AttributeValue attributeValue = attributeValueMap.getValue().get(attributeName);
+ if (attributeValue == null) {
+ return null;
+ }
+ if (!attributeValue.hasM()) {
+ throw new IllegalStateException("Cannot get a Map from attribute value of Type " + attributeValue.type());
+ }
+ return attributeValue.m();
+ }
+
+ @Override
+ public String toJson() {
+ if (nonAttributeValueMap.isEmpty()) {
+ return "{}";
+ }
+ return attributeValueMap.getValue().entrySet().stream()
+ .map(entry -> "\""
+ + addEscapeCharacters(entry.getKey())
+ + "\":"
+ + stringValue(JSON_ATTRIBUTE_CONVERTER.transformTo(entry.getValue())))
+ .collect(Collectors.joining(",", "{", "}"));
+ }
+
+ @Override
+ public Map toMap() {
+ return attributeValueMap.getValue();
+ }
+
+ private Map initializeAttributeValueMap() {
+ Map result = new LinkedHashMap<>(this.nonAttributeValueMap.size());
+ this.nonAttributeValueMap.forEach((k, v) -> {
+ if (v == null) {
+ result.put(k, NULL_ATTRIBUTE_VALUE);
+ } else {
+
+ result.put(k, toAttributeValue(v, enhancedTypeMap.getOrDefault(k, EnhancedType.of(v.getClass()))));
+ }
+
+ });
+ return result;
+ }
+
+ private AttributeValue toAttributeValue(T value, EnhancedType enhancedType) {
+ if (value instanceof AttributeValue) {
+ return (AttributeValue) value;
+ }
+ return converterForClass(enhancedType, attributeConverterChain).transformFrom(value);
+ }
+
+ private T fromAttributeValue(AttributeValue attributeValue, EnhancedType type) {
+ if (type.rawClass().equals(AttributeValue.class)) {
+ return (T) attributeValue;
+ }
+ return converterForClass(type, attributeConverterChain).transformTo(attributeValue);
+ }
+
+ public static class DefaultBuilder implements EnhancedDocument.Builder {
+
+ Map nonAttributeValueMap = new LinkedHashMap<>();
+ Map enhancedTypeMap = new HashMap<>();
+
+ List attributeConverterProviders = new ArrayList<>();
+
+ private DefaultBuilder() {
+ }
+
+
+ public DefaultBuilder(DefaultEnhancedDocument enhancedDocument) {
+ this.nonAttributeValueMap = new LinkedHashMap<>(enhancedDocument.nonAttributeValueMap);
+ this.attributeConverterProviders = new ArrayList<>(enhancedDocument.attributeConverterProviders);
+ this.enhancedTypeMap = new HashMap<>(enhancedDocument.enhancedTypeMap);
+ }
+
+ public Builder putObject(String attributeName, Object value) {
+ putObject(attributeName, value, false);
+ return this;
+ }
+
+ private Builder putObject(String attributeName, Object value, boolean ignoreNullValue) {
+ if (!ignoreNullValue) {
+ checkInvalidAttribute(attributeName, value);
+ } else {
+ validateAttributeName(attributeName);
+ }
+ enhancedTypeMap.remove(attributeName);
+ nonAttributeValueMap.remove(attributeName);
+ nonAttributeValueMap.put(attributeName, value);
+ return this;
+ }
+
+ @Override
+ public Builder putString(String attributeName, String value) {
+ return putObject(attributeName, value);
+ }
+
+ @Override
+ public Builder putNumber(String attributeName, Number value) {
+ return putObject(attributeName, value);
+ }
+
+ @Override
+ public Builder putBytes(String attributeName, SdkBytes value) {
+ return putObject(attributeName, value);
+ }
+
+ @Override
+ public Builder putBoolean(String attributeName, boolean value) {
+ return putObject(attributeName, Boolean.valueOf(value));
+ }
+
+ @Override
+ public Builder putNull(String attributeName) {
+ return putObject(attributeName, null, true);
+ }
+
+ @Override
+ public Builder putStringSet(String attributeName, Set values) {
+ checkInvalidAttribute(attributeName, values);
+ if (values.stream().anyMatch(Objects::isNull)) {
+ throw NULL_SET_ERROR.getValue();
+ }
+ return put(attributeName, values, EnhancedType.setOf(String.class));
+ }
+
+ @Override
+ public Builder putNumberSet(String attributeName, Set values) {
+ checkInvalidAttribute(attributeName, values);
+ Set sdkNumberSet =
+ values.stream().map(number -> {
+ if (number == null) {
+ throw NULL_SET_ERROR.getValue();
+ }
+ return SdkNumber.fromString(number.toString());
+ }).collect(Collectors.toCollection(LinkedHashSet::new));
+ return put(attributeName, sdkNumberSet, EnhancedType.setOf(SdkNumber.class));
+ }
+
+ @Override
+ public Builder putBytesSet(String attributeName, Set values) {
+ checkInvalidAttribute(attributeName, values);
+ if (values.stream().anyMatch(Objects::isNull)) {
+ throw NULL_SET_ERROR.getValue();
+ }
+ return put(attributeName, values, EnhancedType.setOf(SdkBytes.class));
+ }
+
+ @Override
+ public Builder putList(String attributeName, List value, EnhancedType type) {
+ checkInvalidAttribute(attributeName, value);
+ Validate.paramNotNull(type, "type");
+ return put(attributeName, value, EnhancedType.listOf(type));
+ }
+
+ @Override
+ public Builder put(String attributeName, T value, EnhancedType type) {
+ checkInvalidAttribute(attributeName, value);
+ Validate.notNull(attributeName, "attributeName cannot be null.");
+ enhancedTypeMap.put(attributeName, type);
+ nonAttributeValueMap.remove(attributeName);
+ nonAttributeValueMap.put(attributeName, value);
+ return this;
+ }
+
+ @Override
+ public Builder put(String attributeName, T value, Class type) {
+ checkAndValidateClass(type, true);
+ put(attributeName, value, EnhancedType.of(type));
+ return this;
+ }
+
+ @Override
+ public Builder putMap(String attributeName, Map value, EnhancedType keyType,
+ EnhancedType valueType) {
+ checkInvalidAttribute(attributeName, value);
+ Validate.notNull(attributeName, "attributeName cannot be null.");
+ Validate.paramNotNull(keyType, "keyType");
+ Validate.paramNotNull(valueType, "valueType");
+ return put(attributeName, value, EnhancedType.mapOf(keyType, valueType));
+ }
+
+ @Override
+ public Builder putJson(String attributeName, String json) {
+ checkInvalidAttribute(attributeName, json);
+ return putObject(attributeName, getAttributeValueFromJson(json));
+ }
+
+ @Override
+ public Builder remove(String attributeName) {
+ Validate.isTrue(!StringUtils.isEmpty(attributeName), "Attribute name must not be null or empty");
+ nonAttributeValueMap.remove(attributeName);
+ return this;
+ }
+
+ @Override
+ public Builder addAttributeConverterProvider(AttributeConverterProvider attributeConverterProvider) {
+ Validate.paramNotNull(attributeConverterProvider, "attributeConverterProvider");
+ attributeConverterProviders.add(attributeConverterProvider);
+ return this;
+ }
+
+ @Override
+ public Builder attributeConverterProviders(List attributeConverterProviders) {
+ Validate.paramNotNull(attributeConverterProviders, "attributeConverterProviders");
+ this.attributeConverterProviders.clear();
+ this.attributeConverterProviders.addAll(attributeConverterProviders);
+ return this;
+ }
+
+ @Override
+ public Builder attributeConverterProviders(AttributeConverterProvider... attributeConverterProviders) {
+ Validate.paramNotNull(attributeConverterProviders, "attributeConverterProviders");
+ return attributeConverterProviders(Arrays.asList(attributeConverterProviders));
+ }
+
+ @Override
+ public Builder json(String json) {
+ Validate.paramNotNull(json, "json");
+ AttributeValue attributeValue = getAttributeValueFromJson(json);
+ if (attributeValue != null && attributeValue.hasM()) {
+ nonAttributeValueMap = new LinkedHashMap<>(attributeValue.m());
+ }
+ return this;
+ }
+
+ @Override
+ public Builder attributeValueMap(Map attributeValueMap) {
+ Validate.paramNotNull(attributeConverterProviders, "attributeValueMap");
+ nonAttributeValueMap.clear();
+ attributeValueMap.forEach(this::putObject);
+ return this;
+ }
+
+ @Override
+ public EnhancedDocument build() {
+ return new DefaultEnhancedDocument(this);
+ }
+
+ private static AttributeValue getAttributeValueFromJson(String json) {
+ JsonNodeParser build = JsonNodeParser.builder().build();
+ JsonNode jsonNode = build.parse(json);
+ if (jsonNode == null) {
+ throw new IllegalArgumentException("Could not parse argument json " + json);
+ }
+ return JSON_ATTRIBUTE_CONVERTER.transformFrom(jsonNode);
+ }
+
+ private static void checkInvalidAttribute(String attributeName, Object value) {
+ validateAttributeName(attributeName);
+ Validate.notNull(value, "Value for %s must not be null. Use putNull API to insert a Null value", attributeName);
+ }
+
+ private static void validateAttributeName(String attributeName) {
+ Validate.isTrue(attributeName != null && !attributeName.trim().isEmpty(),
+ "Attribute name must not be null or empty.");
+ }
+
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ DefaultEnhancedDocument that = (DefaultEnhancedDocument) o;
+ return nonAttributeValueMap.equals(that.nonAttributeValueMap) && Objects.equals(enhancedTypeMap, that.enhancedTypeMap)
+ && Objects.equals(attributeValueMap, that.attributeValueMap) && Objects.equals(attributeConverterProviders,
+ that.attributeConverterProviders)
+ && attributeConverterChain.equals(that.attributeConverterChain);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = nonAttributeValueMap != null ? nonAttributeValueMap.hashCode() : 0;
+ result = 31 * result + (attributeConverterProviders != null ? attributeConverterProviders.hashCode() : 0);
+ return result;
+ }
+
+ private static void checkAndValidateClass(Class type, boolean isPut) {
+ Validate.paramNotNull(type, "type");
+ Validate.isTrue(!type.isAssignableFrom(List.class),
+ String.format(VALIDATE_TYPE_ERROR, "List", isPut ? "put" : "get", "List"));
+ Validate.isTrue(!type.isAssignableFrom(Map.class),
+ String.format(VALIDATE_TYPE_ERROR, "Map", isPut ? "put" : "get", "Map"));
+
+ }
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/JsonStringFormatHelper.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/JsonStringFormatHelper.java
new file mode 100644
index 000000000000..4fa04cb1b8f0
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/JsonStringFormatHelper.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.document;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.protocols.jsoncore.JsonNode;
+
+@SdkInternalApi
+public final class JsonStringFormatHelper {
+
+ private JsonStringFormatHelper() {
+ }
+
+ /**
+ * Helper function to convert a JsonNode to Json String representation
+ *
+ * @param jsonNode The JsonNode that needs to be converted to Json String.
+ * @return Json String of Json Node.
+ */
+ public static String stringValue(JsonNode jsonNode) {
+ if (jsonNode.isArray()) {
+ return StreamSupport.stream(jsonNode.asArray().spliterator(), false)
+ .map(JsonStringFormatHelper::stringValue)
+ .collect(Collectors.joining(",", "[", "]"));
+ }
+ if (jsonNode.isObject()) {
+ return mapToString(jsonNode);
+ }
+ return jsonNode.isString() ? "\"" + addEscapeCharacters(jsonNode.text()) + "\"" : jsonNode.toString();
+ }
+
+ /**
+ * Escapes characters for a give given string
+ *
+ * @param input Input string
+ * @return String with escaped characters.
+ */
+ public static String addEscapeCharacters(String input) {
+ StringBuilder output = new StringBuilder();
+ for (int i = 0; i < input.length(); i++) {
+ char ch = input.charAt(i);
+ switch (ch) {
+ case '\\':
+ output.append("\\\\"); // escape backslash with a backslash
+ break;
+ case '\n':
+ output.append("\\n"); // newline character
+ break;
+ case '\r':
+ output.append("\\r"); // carriage return character
+ break;
+ case '\t':
+ output.append("\\t"); // tab character
+ break;
+ case '\f':
+ output.append("\\f"); // form feed
+ break;
+ case '\"':
+ output.append("\\\""); // double-quote character
+ break;
+ case '\'':
+ output.append("\\'"); // single-quote character
+ break;
+ default:
+ output.append(ch);
+ break;
+ }
+ }
+ return output.toString();
+ }
+
+ private static String mapToString(JsonNode jsonNode) {
+ Map value = jsonNode.asObject();
+
+ if (value.isEmpty()) {
+ return "{}";
+ }
+
+ StringBuilder output = new StringBuilder();
+ output.append("{");
+ value.forEach((k, v) -> output.append("\"").append(k).append("\":")
+ .append(stringValue(v)).append(","));
+ output.setCharAt(output.length() - 1, '}');
+ return output.toString();
+ }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java
index efe41d41d7b1..5d08ee4a3ae3 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java
@@ -589,8 +589,15 @@ private B constructNewBuilder() {
@Override
public AttributeConverter converterForAttribute(Object key) {
ResolvedImmutableAttribute resolvedImmutableAttribute = indexedMappers.get(key);
- return resolvedImmutableAttribute != null
- ? resolvedImmutableAttribute.attributeConverter()
- : null;
+ if (resolvedImmutableAttribute != null) {
+ return resolvedImmutableAttribute.attributeConverter();
+ }
+
+ // If no resolvedAttribute is found look through flattened attributes
+ FlattenedMapper flattenedMapper = indexedFlattenedMappers.get(key);
+ if (flattenedMapper != null) {
+ return (AttributeConverter) flattenedMapper.getOtherItemTableSchema().converterForAttribute(key);
+ }
+ return null;
}
}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponse.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponse.java
index cdf0200f09da..ca7d14ecfcbe 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponse.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponse.java
@@ -23,6 +23,7 @@
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
import software.amazon.awssdk.services.dynamodb.model.ItemCollectionMetrics;
+import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
/**
@@ -46,7 +47,8 @@ private UpdateItemEnhancedResponse(Builder builder) {
}
/**
- * The attribute values as they appeared before the {@code UpdateItem} operation.
+ * The returned attribute values. These correspond to the DynamoDB {@link ReturnValue} setting. By default,
+ * the attributes reflect the values after the {@code UpdateItem} operation has been applied ({@link ReturnValue#ALL_NEW}).
*/
public T attributes() {
return attributes;
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/JsonItemAttributeConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/JsonItemAttributeConverterTest.java
new file mode 100644
index 000000000000..b264671e43fe
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/JsonItemAttributeConverterTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromNumber;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromString;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.SdkNumber;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.CharacterArrayAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter;
+import software.amazon.awssdk.protocols.jsoncore.JsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.ArrayJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.BooleanJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.NumberJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.ObjectJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.StringJsonNode;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+class JsonItemAttributeConverterTest {
+
+ @Test
+ void jsonAttributeConverterWithString() {
+ JsonItemAttributeConverter converter = JsonItemAttributeConverter.create();
+ StringJsonNode stringJsonNode = new StringJsonNode("testString");
+ assertThat(transformFrom(converter, stringJsonNode).s()).isEqualTo("testString");
+ assertThat(transformTo(converter, AttributeValue.fromS("testString"))).isEqualTo(stringJsonNode);
+ }
+
+ @Test
+ void jsonAttributeConverterWithBoolean() {
+ JsonItemAttributeConverter converter = JsonItemAttributeConverter.create();
+ BooleanJsonNode booleanJsonNode = new BooleanJsonNode(true);
+ assertThat(transformFrom(converter, booleanJsonNode).bool()).isTrue();
+ assertThat(transformFrom(converter, booleanJsonNode).s()).isNull();
+ assertThat(transformTo(converter, AttributeValue.fromBool(true))).isEqualTo(booleanJsonNode);
+ }
+
+ @Test
+ void jsonAttributeConverterWithNumber() {
+ JsonItemAttributeConverter converter = JsonItemAttributeConverter.create();
+ NumberJsonNode numberJsonNode = new NumberJsonNode("20");
+ assertThat(transformFrom(converter, numberJsonNode).n()).isEqualTo("20");
+ assertThat(transformFrom(converter, numberJsonNode).s()).isNull();
+ assertThat(transformTo(converter, AttributeValue.fromN("20"))).isEqualTo(numberJsonNode);
+ }
+
+ @Test
+ void jsonAttributeConverterWithSdkBytes() {
+ JsonItemAttributeConverter converter = JsonItemAttributeConverter.create();
+ StringJsonNode sdkByteJsonNode = new StringJsonNode(SdkBytes.fromUtf8String("a").asUtf8String());
+
+ assertThat(transformFrom(converter, sdkByteJsonNode).s()).isEqualTo(SdkBytes.fromUtf8String("a").asUtf8String());
+ assertThat(transformFrom(converter, sdkByteJsonNode).b()).isNull();
+ assertThat(transformTo(converter, AttributeValue.fromB(SdkBytes.fromUtf8String("a")))).isEqualTo(new StringJsonNode("YQ=="));
+ }
+
+ @Test
+ void jsonAttributeConverterWithSet() {
+ JsonItemAttributeConverter converter = JsonItemAttributeConverter.create();
+ ArrayJsonNode arrayJsonNode =
+ new ArrayJsonNode(Stream.of(new NumberJsonNode("10"), new NumberJsonNode("20")).collect(Collectors.toList()));
+
+ assertThat(transformFrom(converter, arrayJsonNode).l())
+ .isEqualTo(Stream.of(AttributeValue.fromN("10"), AttributeValue.fromN("20"))
+ .collect(Collectors.toList()));
+ }
+
+ @Test
+ void jsonAttributeWithMap(){
+
+ Map jsonNodeMap = new LinkedHashMap<>();
+ jsonNodeMap.put("key", new StringJsonNode("value"));
+ ObjectJsonNode objectJsonNode = new ObjectJsonNode(jsonNodeMap);
+ JsonItemAttributeConverter converter = JsonItemAttributeConverter.create();
+ AttributeValue convertedMap = converter.transformFrom(objectJsonNode);
+
+ assertThat(convertedMap.hasM()).isTrue();
+ Map expectedMap = new LinkedHashMap<>();
+ expectedMap.put("key", AttributeValue.fromS("value"));
+ assertThat(convertedMap).isEqualTo(AttributeValue.fromM(expectedMap));
+ }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/document/CustomAttributeForDocumentConverterProvider.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/document/CustomAttributeForDocumentConverterProvider.java
new file mode 100644
index 000000000000..1222333c7a71
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/document/CustomAttributeForDocumentConverterProvider.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.document;
+
+import java.util.Map;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.IntegerStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.ImmutableMap;
+
+public class CustomAttributeForDocumentConverterProvider implements AttributeConverterProvider {
+ private final Map, AttributeConverter> converterCache = ImmutableMap.of(
+ EnhancedType.of(CustomClassForDocumentAPI.class), new CustomClassForDocumentAttributeConverter(),
+ EnhancedType.of(Integer.class), new CustomIntegerAttributeConverter()
+ );
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public AttributeConverter converterFor(EnhancedType enhancedType) {
+ return (AttributeConverter
