Skip to content

Commit 01fb110

Browse files
committed
Merge branch 'master' into joviegas/DynamoDBAutoGeneratedUuid
2 parents 202b2cd + 523a6a4 commit 01fb110

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/Context.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,16 @@ public interface FailedExecution {
192192
SdkRequest request();
193193

194194
/**
195-
* The latest version of the {@link SdkHttpFullRequest} available when the execution failed. If the execution failed
196-
* before or during request marshalling, this will return {@link Optional#empty()}.
195+
* The latest version of the {@link SdkHttpRequest} available when the execution failed. This may be a
196+
* {@link SdkHttpFullRequest}; if so, it can be accessed by casting the returned {@link SdkHttpRequest}.
197+
* If the execution failed before or during request marshalling, this will return {@link Optional#empty()}.
197198
*/
198199
Optional<SdkHttpRequest> httpRequest();
199200

200201
/**
201-
* The latest version of the {@link SdkHttpFullResponse} available when the execution failed. If the execution failed
202-
* before or during transmission, this will return {@link Optional#empty()}.
202+
* The latest version of the {@link SdkHttpResponse} available when the execution failed. This may be a
203+
* {@link SdkHttpFullResponse}; if so, it can be accessed by casting the returned {@link SdkHttpResponse}.
204+
* If the execution failed before or during transmission, this will return {@link Optional#empty()}.
203205
*/
204206
Optional<SdkHttpResponse> httpResponse();
205207

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AutoGeneratedUuidRecordTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ public static void assertValidUuid(String uuid) {
108108

109109
private final DynamoDbEnhancedClient enhancedClient =
110110
DynamoDbEnhancedClient.builder()
111-
.dynamoDbClient(DynamoDbClient.create())
111+
.dynamoDbClient(getDynamoDbClient())
112112
.extensions(AutoGeneratedUuidExtension.create())
113113
.build();
114114
private final String concreteTableName;
115115

116116
@Rule
117117
public ExpectedException thrown = ExpectedException.none();
118118
{
119-
concreteTableName = "table-name";
119+
concreteTableName = getConcreteTableName("table-name");
120120
mappedTable = enhancedClient.table(concreteTableName, TABLE_SCHEMA);
121121
}
122122

0 commit comments

Comments
 (0)