You know, for certain, that all of your {@link CompletableFuture} usage is strictly non-blocking, and you wish to
- * remove the minor overhead incurred by using a separate thread. In this case, you can use
- * {@code Runnable::run} to execute the future-completion directly from within the I/O thread.
*
+ * WARNING
+ *
+ * We strongly discourage using {@code Runnable::run}, which executes the future-completion directly from
+ * within the I/O thread because it may block the I/O thread and cause deadlock, especially if you are sending
+ * another SDK request in the {@link CompletableFuture} chain since the SDK may perform blocking calls in some cases.
*/
public static final SdkAdvancedAsyncClientOption FUTURE_COMPLETION_EXECUTOR =
new SdkAdvancedAsyncClientOption<>(Executor.class);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/InputStreamResponseTransformer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/InputStreamResponseTransformer.java
index 084a293f6344..434894a44c8c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/InputStreamResponseTransformer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/InputStreamResponseTransformer.java
@@ -22,7 +22,7 @@
import software.amazon.awssdk.core.SdkResponse;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.utils.async.InputStreamSubscriber;
+import software.amazon.awssdk.http.async.AbortableInputStreamSubscriber;
/**
* A {@link AsyncResponseTransformer} that allows performing blocking reads on the response data.
@@ -50,7 +50,7 @@ public void onResponse(ResponseT response) {
@Override
public void onStream(SdkPublisher publisher) {
- InputStreamSubscriber inputStreamSubscriber = new InputStreamSubscriber();
+ AbortableInputStreamSubscriber inputStreamSubscriber = AbortableInputStreamSubscriber.builder().build();
publisher.subscribe(inputStreamSubscriber);
future.complete(new ResponseInputStream<>(response, inputStreamSubscriber));
}
diff --git a/docs/design/core/migration-tool/DecisionLog.md b/docs/design/core/migration-tool/DecisionLog.md
new file mode 100644
index 000000000000..68aeba2281ab
--- /dev/null
+++ b/docs/design/core/migration-tool/DecisionLog.md
@@ -0,0 +1,31 @@
+# Decision Log for AWS SDK fro Java v2 Migration Tool
+
+## Log Entry Template
+
+**Source**: (Meeting/aside/pair programming discussion/daily standup) to (discuss/implement) X
+
+**Attendees**: Anirudh, Anna-Karin, David, Dongie, Debora, Olivier, Matt, Jason, John, Zoe
+
+**Closed Decisions:**
+
+1. Question? Decision. Justification
+
+**Open Decisions:**
+
+1. (Old/Reopened/new) Question?
+
+## 01/26/2024
+
+**Source:** Daily standup and offline discussion to discuss where we should host the source code of the v2 migration tool
+
+**Attendees:** Anna-Karin, David, Debora, Olivier, Matt, Jason, John, Zoe
+
+**Closed Decisions:**
+
+1. Should we host the source code in the same aws-sdk-java-v2 repo? Yes, because 1) no extra release infrastructure is needed since it can be released as part of the SDK release 2) it's easier to write scripts to generate recipes, for example, we need to write script to retrieve service IDs for all services and current version. 3) it has better discoverability. The only disadvantage is that it will increase the scope of the repo and increase the build and release time slightly. The alternatives are: 1) setting up a new GitHub repo, which require us to set up and maintain new CICD pipeline. 2) hosting the code internally, which would be a bad customer experience since the code is not public and there is no place for users to raise questions/PRs.
+
+2. Should we publish the tool to Maven central instead of vending a JAR through S3? Yes, because most customers, if not all, prefer to consume the library from the package manager instead of a JAR.
+
+**Open Decisions:**
+
+None
diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml
index 0e2e4e6e9891..2e92a3daa58b 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.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
http-client-spi
AWS Java SDK :: HTTP Client Interface
@@ -90,6 +90,16 @@
byte-buddy
test
+
+ org.mockito
+ mockito-junit-jupiter
+ test
+
+
+ org.mockito
+ mockito-inline
+ test
+
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/AbortableInputStreamSubscriber.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/AbortableInputStreamSubscriber.java
new file mode 100644
index 000000000000..630869825700
--- /dev/null
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/AbortableInputStreamSubscriber.java
@@ -0,0 +1,116 @@
+/*
+ * 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.http.async;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkTestInternalApi;
+import software.amazon.awssdk.http.Abortable;
+import software.amazon.awssdk.utils.FunctionalUtils;
+import software.amazon.awssdk.utils.async.InputStreamSubscriber;
+
+/**
+ * Wrapper of {@link InputStreamSubscriber} that also implements {@link Abortable}. It will invoke {@link #close()}
+ * when {@link #abort()} is invoked. Upon closing, the underlying {@link InputStreamSubscriber} will be closed, and additional
+ * action can be added via {@link Builder#doAfterClose(Runnable)}.
+ *
+ */
+@SdkProtectedApi
+public final class AbortableInputStreamSubscriber extends InputStream implements Subscriber, Abortable {
+ private final InputStreamSubscriber delegate;
+
+ private final Runnable doAfterClose;
+
+ private AbortableInputStreamSubscriber(Builder builder) {
+ this(builder, new InputStreamSubscriber());
+ }
+
+ @SdkTestInternalApi
+ AbortableInputStreamSubscriber(Builder builder, InputStreamSubscriber delegate) {
+ this.delegate = delegate;
+ this.doAfterClose = builder.doAfterClose == null ? FunctionalUtils.noOpRunnable() : builder.doAfterClose;
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ @Override
+ public void abort() {
+ close();
+ }
+
+ @Override
+ public int read() throws IOException {
+ return delegate.read();
+ }
+
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException {
+ return delegate.read(b, off, len);
+ }
+
+ @Override
+ public int read(byte[] b) throws IOException {
+ return delegate.read(b);
+ }
+
+ @Override
+ public void onSubscribe(Subscription s) {
+ delegate.onSubscribe(s);
+ }
+
+ @Override
+ public void onNext(ByteBuffer byteBuffer) {
+ delegate.onNext(byteBuffer);
+ }
+
+ @Override
+ public void onError(Throwable t) {
+ delegate.onError(t);
+ }
+
+ @Override
+ public void onComplete() {
+ delegate.onComplete();
+ }
+
+ @Override
+ public void close() {
+ delegate.close();
+ FunctionalUtils.invokeSafely(() -> doAfterClose.run());
+ }
+
+ public static final class Builder {
+ private Runnable doAfterClose;
+
+ /**
+ * Additional action to run when {@link #close()} is invoked
+ */
+ public Builder doAfterClose(Runnable doAfterClose) {
+ this.doAfterClose = doAfterClose;
+ return this;
+ }
+
+ public AbortableInputStreamSubscriber build() {
+ return new AbortableInputStreamSubscriber(this);
+ }
+ }
+}
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/async/AbortableInputStreamSubscriberTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/async/AbortableInputStreamSubscriberTest.java
new file mode 100644
index 000000000000..dc3e49ff7205
--- /dev/null
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/async/AbortableInputStreamSubscriberTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.http.async;
+
+import static org.mockito.Mockito.verify;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import software.amazon.awssdk.utils.async.InputStreamSubscriber;
+
+@ExtendWith(MockitoExtension.class)
+public class AbortableInputStreamSubscriberTest {
+
+ private AbortableInputStreamSubscriber abortableInputStreamSubscriber;
+
+ @Mock
+ private Runnable onClose;
+
+ @Mock
+ private InputStreamSubscriber inputStreamSubscriber;
+
+ @BeforeEach
+ void setUp() {
+ abortableInputStreamSubscriber = new AbortableInputStreamSubscriber(AbortableInputStreamSubscriber.builder()
+ .doAfterClose(onClose),
+ inputStreamSubscriber);
+
+
+ }
+
+ @Test
+ void close_closeConfigured_shouldInvokeOnClose() {
+ abortableInputStreamSubscriber.close();
+ verify(inputStreamSubscriber).close();
+ verify(onClose).run();
+ }
+
+ @Test
+ void abort_shouldInvokeOnClose() {
+ abortableInputStreamSubscriber = new AbortableInputStreamSubscriber(AbortableInputStreamSubscriber.builder()
+ .doAfterClose(onClose),
+ inputStreamSubscriber);
+ abortableInputStreamSubscriber.abort();
+ verify(onClose).run();
+ }
+
+ @Test
+ void close_closeNotConfigured_shouldCloseDelegate() {
+ abortableInputStreamSubscriber = new AbortableInputStreamSubscriber(AbortableInputStreamSubscriber.builder(),
+ inputStreamSubscriber);
+ abortableInputStreamSubscriber.close();
+ verify(inputStreamSubscriber).close();
+ }
+}
diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
index 4be1be53e231..ce7da3e007e4 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.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
apache-client
diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml
index 34e32979d9ae..f52424475406 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.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
4.0.0
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/response/InputStreamAdaptingHttpStreamResponseHandler.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/response/InputStreamAdaptingHttpStreamResponseHandler.java
index b6b95307722e..66568efc2b6f 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/response/InputStreamAdaptingHttpStreamResponseHandler.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/response/InputStreamAdaptingHttpStreamResponseHandler.java
@@ -31,9 +31,9 @@
import software.amazon.awssdk.http.AbortableInputStream;
import software.amazon.awssdk.http.SdkHttpFullResponse;
import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.async.AbortableInputStreamSubscriber;
import software.amazon.awssdk.http.crt.AwsCrtHttpClient;
import software.amazon.awssdk.utils.Logger;
-import software.amazon.awssdk.utils.async.InputStreamSubscriber;
import software.amazon.awssdk.utils.async.SimplePublisher;
/**
@@ -87,8 +87,10 @@ public void onResponseHeaders(HttpStream stream, int responseStatusCode, int blo
@Override
public int onResponseBody(HttpStream stream, byte[] bodyBytesIn) {
if (inputStreamSubscriber == null) {
- inputStreamSubscriber = new AbortableInputStreamSubscriber(() -> responseHandlerHelper.closeConnection(stream),
- new InputStreamSubscriber());
+ inputStreamSubscriber =
+ AbortableInputStreamSubscriber.builder()
+ .doAfterClose(() -> responseHandlerHelper.closeConnection(stream))
+ .build();
simplePublisher.subscribe(inputStreamSubscriber);
// For response with a payload, we need to complete the future here to allow downstream to retrieve the data from
// the stream directly.
diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml
index 63da6f308d20..5021ee9298e4 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.23.21-SNAPSHOT
+ 2.24.10-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 4d653a45f729..eb3ecd09eb3c 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
@@ -314,7 +314,7 @@ private void onCancel() {
try {
SdkCancellationException e = new SdkCancellationException(
"Subscriber cancelled before all events were published");
- log.warn(channelContext.channel(), () -> "Subscriber cancelled before all events were published");
+ log.debug(channelContext.channel(), () -> "Subscriber cancelled before all events were published");
executeFuture.completeExceptionally(e);
} finally {
runAndLogError(channelContext.channel(), () -> "Could not release channel back to the pool",
diff --git a/http-clients/pom.xml b/http-clients/pom.xml
index efee0251e32b..996151459f5b 100644
--- a/http-clients/pom.xml
+++ b/http-clients/pom.xml
@@ -21,7 +21,7 @@
aws-sdk-java-pom
software.amazon.awssdk
- 2.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
4.0.0
diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
index 296f9b7995cd..92ff42131946 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.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
4.0.0
diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml
index d1480cc0fdd3..bf56192cabf9 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.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
cloudwatch-metric-publisher
diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml
index 8a6c6b90a3fe..7d21a5b37424 100644
--- a/metric-publishers/pom.xml
+++ b/metric-publishers/pom.xml
@@ -17,7 +17,7 @@
software.amazon.awssdk
aws-sdk-java-pom
- 2.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
metric-publishers
diff --git a/pom.xml b/pom.xml
index 552fc9f7f176..120c4566d4ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
software.amazon.awssdk
aws-sdk-java-pom
- 2.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
pom
AWS Java SDK :: Parent
The Amazon Web Services SDK for Java provides Java APIs
@@ -88,6 +88,7 @@
test/ruleset-testing-core
test/old-client-version-compatibility-test
test/bundle-logging-bridge-binding-test
+ test/crt-unavailable-tests
${scm.github.url}
@@ -95,7 +96,7 @@
${project.version}
- 2.23.20
+ 2.24.9
2.15.2
2.15.2
2.13.2
diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml
index 6fa5f28877d6..66387c3b37c3 100644
--- a/release-scripts/pom.xml
+++ b/release-scripts/pom.xml
@@ -22,7 +22,7 @@
software.amazon.awssdk
aws-sdk-java-pom
- 2.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
../pom.xml
release-scripts
diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml
index 7ca674323746..d95e9845e8a3 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.23.21-SNAPSHOT
+ 2.24.10-SNAPSHOT
dynamodb-enhanced
AWS Java SDK :: DynamoDB :: Enhanced Client
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Expression.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Expression.java
index 1721bc75f17d..fa0f69ad9ed3 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Expression.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Expression.java
@@ -15,9 +15,13 @@
package software.amazon.awssdk.enhanced.dynamodb;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.Map;
+import java.util.stream.Collectors;
import software.amazon.awssdk.annotations.NotThreadSafe;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.annotations.ThreadSafe;
@@ -46,6 +50,9 @@
@SdkPublicApi
@ThreadSafe
public final class Expression {
+ public static final String AND = "AND";
+ public static final String OR = "OR";
+
private final String expression;
private final Map expressionValues;
private final Map expressionNames;
@@ -67,7 +74,7 @@ public static Builder builder() {
}
/**
- * Coalesces two complete expressions into a single expression. The expression string will be joined using the
+ * Coalesces two complete expressions into a single expression. The expression string will be joined using the
* supplied join token, and the ExpressionNames and ExpressionValues maps will be merged.
* @param expression1 The first expression to coalesce
* @param expression2 The second expression to coalesce
@@ -93,6 +100,61 @@ public static Expression join(Expression expression1, Expression expression2, St
.build();
}
+ /**
+ * @see #join(String, Collection)
+ */
+ public static Expression and(Collection expressions) {
+ return join(AND, expressions);
+ }
+
+ /**
+ * @see #join(String, Collection)
+ */
+ public static Expression or(Collection expressions) {
+ return join(OR, expressions);
+ }
+
+ /**
+ * @see #join(String, Collection)
+ */
+ public static Expression join(String joinToken, Expression... expressions) {
+ return join(joinToken, Arrays.asList(expressions));
+ }
+
+ /**
+ * Coalesces multiple complete expressions into a single expression. The expression string will be joined using the
+ * supplied join token, and the ExpressionNames and ExpressionValues maps will be merged.
+ * @param joinToken The join token to be used to join the expression strings (e.g.: 'AND', 'OR')
+ * @param expressions The expressions to coalesce
+ * @return The coalesced expression
+ * @throws IllegalArgumentException if a conflict occurs when merging ExpressionNames or ExpressionValues
+ */
+ public static Expression join(String joinToken, Collection expressions) {
+ joinToken = joinToken.trim();
+ if (expressions.isEmpty()) {
+ return null;
+ }
+
+ if (expressions.size() == 1) {
+ return expressions.toArray(new Expression[] {})[0];
+ }
+
+ joinToken = ") " + joinToken + " (";
+ String expression = expressions.stream()
+ .map(Expression::expression)
+ .collect(Collectors.joining(joinToken, "(", ")"));
+
+ Builder builder = Expression.builder()
+ .expression(expression);
+
+ expressions.forEach(expr -> {
+ builder.mergeExpressionValues(expr.expressionValues())
+ .mergeExpressionNames(expr.expressionNames());
+ });
+
+ return builder.build();
+ }
+
/**
* Coalesces two expression strings into a single expression string. The expression string will be joined using the
* supplied join token.
@@ -198,6 +260,28 @@ public Expression and(Expression expression) {
return join(this, expression, " AND ");
}
+ /**
+ * Coalesces multiple complete expressions into a single expression joined by 'AND'.
+ *
+ * @see #join(String, Collection)
+ */
+ public Expression and(Expression... expressions) {
+ LinkedList expressionList = new LinkedList<>(Arrays.asList(expressions));
+ expressionList.addFirst(this);
+ return join(AND, expressionList);
+ }
+
+ /**
+ * Coalesces multiple complete expressions into a single expression joined by 'OR'.
+ *
+ * @see #join(String, Collection)
+ */
+ public Expression or(Expression... expressions) {
+ LinkedList expressionList = new LinkedList<>(Arrays.asList(expressions));
+ expressionList.addFirst(this);
+ return join(OR, expressionList);
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -255,6 +339,33 @@ public Builder expressionValues(Map expressionValues) {
return this;
}
+ /**
+ * Merge the given ExpressionValues into the builders existing ExpressionValues
+ * @param expressionValues The values to merge into the ExpressionValues map
+ * @throws IllegalArgumentException if a conflict occurs when merging ExpressionValues
+ */
+ public Builder mergeExpressionValues(Map expressionValues) {
+ if (this.expressionValues == null) {
+ return expressionValues(expressionValues);
+ }
+
+ if (expressionValues == null) {
+ return this;
+ }
+
+ expressionValues.forEach((key, value) -> {
+ AttributeValue oldValue = this.expressionValues.put(key, value);
+
+ if (oldValue != null && !oldValue.equals(value)) {
+ throw new IllegalArgumentException(
+ String.format("Attempt to coalesce expressions with conflicting expression values. "
+ + "Expression value key = '%s'", key));
+ }
+ });
+
+ return this;
+ }
+
/**
* Adds a single element to the optional 'expression values' token map
*/
@@ -275,6 +386,33 @@ public Builder expressionNames(Map expressionNames) {
return this;
}
+ /**
+ * Merge the given ExpressionNames into the builders existing ExpressionNames
+ * @param expressionNames The values to merge into the ExpressionNames map
+ * @throws IllegalArgumentException if a conflict occurs when merging ExpressionNames
+ */
+ public Builder mergeExpressionNames(Map expressionNames) {
+ if (this.expressionNames == null) {
+ return expressionNames(expressionNames);
+ }
+
+ if (expressionNames == null) {
+ return this;
+ }
+
+ expressionNames.forEach((key, value) -> {
+ String oldValue = this.expressionNames.put(key, value);
+
+ if (oldValue != null && !oldValue.equals(value)) {
+ throw new IllegalArgumentException(
+ String.format("Attempt to coalesce expressions with conflicting expression names. "
+ + "Expression name key = '%s'", key));
+ }
+ });
+
+ return this;
+ }
+
/**
* Adds a single element to the optional 'expression names' token map
*/
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java
index c5c394e89bbb..aa18fe7f553b 100644
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java
@@ -144,4 +144,242 @@ public void joinValues_conflictingKey() {
exception.expectMessage("two");
Expression.joinValues(values1, values2);
}
+
+ @Test
+ public void join_correctlyJoins() {
+ Map
