From 45903202373388f6f47e291c8f37b7c4b3ffe01f Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Fri, 21 Aug 2026 16:16:31 -0700 Subject: [PATCH 1/5] Port over table admin operations + remaining test infra --- services-custom/dynamodb-mapper/pom.xml | 25 +- .../dynamodb/AbstractDynamoDBMapper.java | 4 +- .../mapper/dynamodb/DynamoDBMapper.java | 46 +-- .../dynamodb/DynamoDBMapperTableModel.java | 76 +++-- .../mapper/dynamodb/DynamoDBTableMapper.java | 23 +- .../mapper/dynamodb/IDynamoDBMapper.java | 4 +- .../GenerateDeleteTableRequestTest.java | 6 +- .../mapper/dynamodb/GsiAlwaysUpdateTest.java | 16 +- .../mapper/dynamodb/JsonIntegrationTest.java | 42 +-- .../GenerateCreateTableRequest2Test.java | 283 ++++++++++-------- .../GenerateCreateTableRequestTest.java | 224 +++++++------- .../mapper/HashKeyOnlyTableWithGSITest.java | 89 +++--- .../MapperLoadingStrategyConfigTest.java | 41 ++- .../test/resources/DynamoDBTableResource.java | 86 +++--- .../test/resources/TestResourceUtils.java | 4 +- .../test/resources/tables/BasicTempTable.java | 35 ++- .../tables/TempTableWithBinaryKey.java | 35 ++- .../tables/TempTableWithSecondaryIndexes.java | 129 ++++---- 18 files changed, 596 insertions(+), 572 deletions(-) diff --git a/services-custom/dynamodb-mapper/pom.xml b/services-custom/dynamodb-mapper/pom.xml index 43271ff9bbb3..6f05467f5e32 100644 --- a/services-custom/dynamodb-mapper/pom.xml +++ b/services-custom/dynamodb-mapper/pom.xml @@ -41,35 +41,16 @@ org.apache.maven.plugins maven-compiler-plugin - + software/amazon/awssdk/mapper/dynamodb/ConfigureS3LinksTest.java software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTest.java software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTestBase.java - software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java - software/amazon/awssdk/mapper/dynamodb/GsiAlwaysUpdateTest.java - software/amazon/awssdk/mapper/dynamodb/LocalDynamoDB.java - software/amazon/awssdk/mapper/dynamodb/LocalDynamoDBTestBase.java software/amazon/awssdk/mapper/dynamodb/S3ClientCacheIntegrationTest.java software/amazon/awssdk/mapper/dynamodb/S3LinkIDTest.java software/amazon/awssdk/mapper/dynamodb/S3LinkTest.java - software/amazon/awssdk/mapper/dynamodb/BatchLoadTest.java - software/amazon/awssdk/mapper/dynamodb/mapper/BatchWriteTest.java - - software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java - software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequest2Test.java - software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequestTest.java - software/amazon/awssdk/mapper/dynamodb/mapper/HashKeyOnlyTableWithGSITest.java - software/amazon/awssdk/mapper/dynamodb/mapper/MapperLoadingStrategyConfigTest.java - software/amazon/awssdk/mapper/dynamodb/test/resources/DynamoDBTableResource.java - software/amazon/awssdk/mapper/dynamodb/test/resources/ResourceCentricBlockJUnit4ClassRunner.java - software/amazon/awssdk/mapper/dynamodb/test/resources/TestResourceUtils.java - software/amazon/awssdk/mapper/dynamodb/test/resources/tables/BasicTempTable.java - software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithBinaryKey.java - software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithSecondaryIndexes.java diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractDynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractDynamoDBMapper.java index a47ca74fcd51..642794209711 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractDynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractDynamoDBMapper.java @@ -16,8 +16,8 @@ import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.FailedBatch; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; import com.amazonaws.services.s3.model.Region; import java.util.Arrays; diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java index e337b22a9da1..960d89a89738 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java @@ -24,7 +24,7 @@ import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; import software.amazon.awssdk.services.dynamodb.model.AttributeAction; -import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.AttributeValueUpdate; import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest; @@ -35,17 +35,17 @@ import software.amazon.awssdk.services.dynamodb.model.ConditionCheck; import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException; import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; import software.amazon.awssdk.services.dynamodb.model.Delete; import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest; import software.amazon.awssdk.services.dynamodb.model.DeleteRequest; -import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue; import software.amazon.awssdk.services.dynamodb.model.Get; import software.amazon.awssdk.services.dynamodb.model.GetItemRequest; import software.amazon.awssdk.services.dynamodb.model.GetItemResponse; import software.amazon.awssdk.services.dynamodb.model.ItemResponse; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes; import software.amazon.awssdk.services.dynamodb.model.Put; import software.amazon.awssdk.services.dynamodb.model.PutItemRequest; @@ -55,7 +55,7 @@ import software.amazon.awssdk.services.dynamodb.model.QueryResponse; import software.amazon.awssdk.services.dynamodb.model.ReturnValue; import software.amazon.awssdk.services.dynamodb.model.ReturnValuesOnConditionCheckFailure; -import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; import software.amazon.awssdk.services.dynamodb.model.ScanRequest; import software.amazon.awssdk.services.dynamodb.model.ScanResponse; import software.amazon.awssdk.services.dynamodb.model.Select; @@ -2255,31 +2255,39 @@ public CreateTableRequest generateCreateTableRequest(Class clazz, DynamoD config = mergeConfig(config); final DynamoDBMapperTableModel model = getTableModel(clazz, config); - final CreateTableRequest request = new CreateTableRequest(); - request.setTableName(getTableName(clazz, config)); - request.withKeySchema(new KeySchemaElement(model.hashKey().name(), com.amazonaws.services.dynamodbv2.model.KeyType.HASH)); + final List keySchema = new ArrayList(); + keySchema.add(KeySchemaElement.builder().attributeName(model.hashKey().name()).keyType(HASH).build()); if (model.rangeKeyIfExists() != null) { - request.withKeySchema(new KeySchemaElement(model.rangeKey().name(), com.amazonaws.services.dynamodbv2.model.KeyType.RANGE)); + keySchema.add(KeySchemaElement.builder().attributeName(model.rangeKey().name()).keyType(RANGE).build()); } - request.setGlobalSecondaryIndexes(model.globalSecondaryIndexes()); - request.setLocalSecondaryIndexes(model.localSecondaryIndexes()); + + final List attributeDefinitions = new ArrayList(); for (final DynamoDBMapperFieldModel field : model.fields()) { if (field.keyType() != null || field.indexed()) { - request.withAttributeDefinitions(new AttributeDefinition() - .withAttributeType(ScalarAttributeType.valueOf(field.attributeType().name())) - .withAttributeName(field.name()) - ); + attributeDefinitions.add(AttributeDefinition.builder() + .attributeType(ScalarAttributeType.valueOf(field.attributeType().name())) + .attributeName(field.name()) + .build()); } } - return request; + + final CreateTableRequest.Builder request = CreateTableRequest.builder() + .tableName(getTableName(clazz, config)) + .keySchema(keySchema) + .attributeDefinitions(attributeDefinitions); + if (model.globalSecondaryIndexes() != null) { + request.globalSecondaryIndexes(model.globalSecondaryIndexes()); + } + if (model.localSecondaryIndexes() != null) { + request.localSecondaryIndexes(model.localSecondaryIndexes()); + } + return request.build(); } @Override public DeleteTableRequest generateDeleteTableRequest(Class clazz, DynamoDBMapperConfig config) { config = mergeConfig(config); - DeleteTableRequest deleteTableRequest = new DeleteTableRequest(); - deleteTableRequest.setTableName(getTableName(clazz, config)); - return deleteTableRequest; + return DeleteTableRequest.builder().tableName(getTableName(clazz, config)).build(); } /** diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperTableModel.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperTableModel.java index b6e90f79b9d3..1357ee1b6e27 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperTableModel.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperTableModel.java @@ -16,18 +16,18 @@ import static software.amazon.awssdk.services.dynamodb.model.KeyType.HASH; import static software.amazon.awssdk.services.dynamodb.model.KeyType.RANGE; -import static com.amazonaws.services.dynamodbv2.model.ProjectionType.KEYS_ONLY; +import static software.amazon.awssdk.services.dynamodb.model.ProjectionType.KEYS_ONLY; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.KeyType; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.LocalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.Projection; -import com.amazonaws.services.dynamodbv2.model.ProjectionType; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.Projection; import java.util.Arrays; import java.util.ArrayList; +import java.util.List; import java.util.Collection; import java.util.Collections; import java.util.EnumMap; @@ -190,12 +190,15 @@ public GlobalSecondaryIndex globalSecondaryIndex(final String indexName) { return null; } final GlobalSecondaryIndex gsi = globalSecondaryIndexes.get(indexName); - final GlobalSecondaryIndex copy = new GlobalSecondaryIndex().withIndexName(gsi.getIndexName()); - copy.withProjection(new Projection().withProjectionType(gsi.getProjection().getProjectionType())); - for (final KeySchemaElement key : gsi.getKeySchema()) { - copy.withKeySchema(new KeySchemaElement(key.getAttributeName(), key.getKeyType())); + final List keySchema = new ArrayList(); + for (final KeySchemaElement key : gsi.keySchema()) { + keySchema.add(KeySchemaElement.builder().attributeName(key.attributeName()).keyType(key.keyType()).build()); } - return copy; + return GlobalSecondaryIndex.builder() + .indexName(gsi.indexName()) + .projection(Projection.builder().projectionType(gsi.projection().projectionType()).build()) + .keySchema(keySchema) + .build(); } /** @@ -224,12 +227,15 @@ public LocalSecondaryIndex localSecondaryIndex(final String indexName) { return null; } final LocalSecondaryIndex lsi = localSecondaryIndexes.get(indexName); - final LocalSecondaryIndex copy = new LocalSecondaryIndex().withIndexName(lsi.getIndexName()); - copy.withProjection(new Projection().withProjectionType(lsi.getProjection().getProjectionType())); - for (final KeySchemaElement key : lsi.getKeySchema()) { - copy.withKeySchema(new KeySchemaElement(key.getAttributeName(), key.getKeyType())); + final List keySchema = new ArrayList(); + for (final KeySchemaElement key : lsi.keySchema()) { + keySchema.add(KeySchemaElement.builder().attributeName(key.attributeName()).keyType(key.keyType()).build()); } - return copy; + return LocalSecondaryIndex.builder() + .indexName(lsi.indexName()) + .projection(Projection.builder().projectionType(lsi.projection().projectionType()).build()) + .keySchema(keySchema) + .build(); } /** @@ -371,33 +377,42 @@ public Builder with(final DynamoDBMapperFieldModel field) { } public Map globalSecondaryIndexes() { - final Map map = new LinkedHashMap(); + // v2 index models are immutable, so stage each index's key schema and build once. The hash + // key is collected first and the range key (if any) appended in a second pass, matching v1. + final Map> keySchemasByIndex = new LinkedHashMap>(); for (final DynamoDBMapperFieldModel field : fields.values()) { for (final String indexName : field.globalSecondaryIndexNames(HASH)) { - final GlobalSecondaryIndex gsi = new GlobalSecondaryIndex().withIndexName(indexName); - if (map.put(indexName, gsi) != null) { + final List keySchema = new ArrayList(); + keySchema.add(KeySchemaElement.builder().attributeName(field.name()).keyType(KeyType.HASH).build()); + if (keySchemasByIndex.put(indexName, keySchema) != null) { throw new DynamoDBMappingException( targetType.getSimpleName() + "[" + field.name() + "]; must not duplicate GSI " + indexName ); } - gsi.withProjection(new Projection().withProjectionType(KEYS_ONLY)); - gsi.withKeySchema(new KeySchemaElement(field.name(), com.amazonaws.services.dynamodbv2.model.KeyType.HASH)); } } for (final DynamoDBMapperFieldModel field : fields.values()) { for (final String indexName : field.globalSecondaryIndexNames(RANGE)) { - final GlobalSecondaryIndex gsi = map.get(indexName); - if (gsi == null) { + final List keySchema = keySchemasByIndex.get(indexName); + if (keySchema == null) { throw new DynamoDBMappingException( targetType.getSimpleName() + "[" + field.name() + "]; no HASH key for GSI " + indexName ); } - gsi.withKeySchema(new KeySchemaElement(field.name(), com.amazonaws.services.dynamodbv2.model.KeyType.RANGE)); + keySchema.add(KeySchemaElement.builder().attributeName(field.name()).keyType(KeyType.RANGE).build()); } } - if (map.isEmpty()) { + if (keySchemasByIndex.isEmpty()) { return Collections.emptyMap(); } + final Map map = new LinkedHashMap(); + for (final Map.Entry> entry : keySchemasByIndex.entrySet()) { + map.put(entry.getKey(), GlobalSecondaryIndex.builder() + .indexName(entry.getKey()) + .projection(Projection.builder().projectionType(KEYS_ONLY).build()) + .keySchema(entry.getValue()) + .build()); + } return Collections.unmodifiableMap(map); } @@ -405,15 +420,18 @@ public Map localSecondaryIndexes() { final Map map = new LinkedHashMap(); for (final DynamoDBMapperFieldModel field : fields.values()) { for (final String indexName : field.localSecondaryIndexNames()) { - final LocalSecondaryIndex lsi = new LocalSecondaryIndex().withIndexName(indexName); + final LocalSecondaryIndex lsi = LocalSecondaryIndex.builder() + .indexName(indexName) + .projection(Projection.builder().projectionType(KEYS_ONLY).build()) + .keySchema( + KeySchemaElement.builder().attributeName(keys.get(HASH).name()).keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName(field.name()).keyType(KeyType.RANGE).build()) + .build(); if (map.put(indexName, lsi) != null) { throw new DynamoDBMappingException( targetType.getSimpleName() + "[" + field.name() + "]; must not duplicate LSI " + indexName ); } - lsi.withProjection(new Projection().withProjectionType(KEYS_ONLY)); - lsi.withKeySchema(new KeySchemaElement(keys.get(HASH).name(), com.amazonaws.services.dynamodbv2.model.KeyType.HASH)); - lsi.withKeySchema(new KeySchemaElement(field.name(), com.amazonaws.services.dynamodbv2.model.KeyType.RANGE)); } } if (map.isEmpty()) { diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java index da273ac18d7a..5c3e034d6563 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java @@ -18,12 +18,16 @@ import software.amazon.awssdk.mapper.dynamodb.DynamoDBDeleteExpression; import software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression; import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest; import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException; import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException; import software.amazon.awssdk.services.dynamodb.model.TableDescription; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -465,7 +469,9 @@ public PaginatedParallelScanList parallelScan(DynamoDBScanExpression scanExpr * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB#describeTable */ public TableDescription describeTable() { - throw new UnsupportedOperationException("table admin not yet ported to v2"); + return db.describeTable(DescribeTableRequest.builder() + .tableName(mapper.getTableName(model.targetType(), config)) + .build()).table(); } /** @@ -477,7 +483,18 @@ public TableDescription describeTable() { * @see com.amazonaws.services.dynamodbv2.model.CreateTableRequest */ public TableDescription createTable(ProvisionedThroughput throughput) { - throw new UnsupportedOperationException("table admin not yet ported to v2"); + // v1 mutated the generated request in place to stamp throughput onto the table and every GSI; + // v2 requests/indexes are immutable, so rebuild each GSI with the throughput and rebuild the request. + final CreateTableRequest generated = mapper.generateCreateTableRequest(model.targetType()); + final CreateTableRequest.Builder request = generated.toBuilder().provisionedThroughput(throughput); + if (generated.hasGlobalSecondaryIndexes()) { + final List indexes = new ArrayList(); + for (final GlobalSecondaryIndex gsi : generated.globalSecondaryIndexes()) { + indexes.add(gsi.toBuilder().provisionedThroughput(throughput).build()); + } + request.globalSecondaryIndexes(indexes); + } + return db.createTable(request.build()).tableDescription(); } /** @@ -507,7 +524,7 @@ public boolean createTableIfNotExists(ProvisionedThroughput throughput) { * @see com.amazonaws.services.dynamodbv2.model.DeleteTableRequest */ public TableDescription deleteTable() { - throw new UnsupportedOperationException("table admin not yet ported to v2"); + return db.deleteTable(mapper.generateDeleteTableRequest(model.targetType())).tableDescription(); } /** diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java index dba27bf1f635..a8dc1e00cf8e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java @@ -19,8 +19,8 @@ import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; import com.amazonaws.services.s3.model.Region; import java.util.List; diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java index 6e58286589eb..c896357e8409 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java @@ -19,7 +19,7 @@ import org.junit.Test; -import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; /** * Unit tests for {@link DynamoDBMapper#generateDeleteTableRequest(Class)}. @@ -33,7 +33,7 @@ public class GenerateDeleteTableRequestTest { public void tableNameNotOverriden_UsesTableNameAttributeInAnnotation() { DynamoDBMapper dynamoDBMapper = new DynamoDBMapper(null); DeleteTableRequest deleteTableRequest = dynamoDBMapper.generateDeleteTableRequest(ObjectORMExample.class); - assertEquals(deleteTableRequest.getTableName(), TABLE_NAME); + assertEquals(deleteTableRequest.tableName(), TABLE_NAME); } @Test @@ -44,7 +44,7 @@ public void tableNameOverriddenInConfig_UsesPrefixedOverrideTableName() { DynamoDBMapper dynamoDBMapper = new DynamoDBMapper(null, config); DeleteTableRequest deleteTableRequest = dynamoDBMapper.generateDeleteTableRequest(ObjectORMExample.class); - assertEquals(deleteTableRequest.getTableName(), TABLE_PREFIX.concat(TABLE_NAME)); + assertEquals(deleteTableRequest.tableName(), TABLE_PREFIX.concat(TABLE_NAME)); } @DynamoDBTable(tableName = TABLE_NAME) diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GsiAlwaysUpdateTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GsiAlwaysUpdateTest.java index 95e353e784c0..39bad5025160 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GsiAlwaysUpdateTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GsiAlwaysUpdateTest.java @@ -14,17 +14,15 @@ */ package software.amazon.awssdk.mapper.dynamodb; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import static org.junit.Assert.assertNotEquals; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; import software.amazon.awssdk.mapper.dynamodb.DynamoDBTableMapper; -import com.amazonaws.services.dynamodbv2.model.DescribeTableRequest; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; +import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; import software.amazon.awssdk.mapper.dynamodb.pojos.GsiWithAlwaysUpdateTimestamp; -import com.amazonaws.waiters.WaiterParameters; import java.util.UUID; import org.junit.After; import org.junit.Before; @@ -35,7 +33,7 @@ public class GsiAlwaysUpdateTest extends LocalDynamoDBTestBase { private static final String TABLE_NAME = GsiAlwaysUpdateTest.class.getSimpleName() + "-" + System.currentTimeMillis(); - private AmazonDynamoDB ddb; + private DynamoDbClient ddb; private DynamoDBTableMapper mapper; @Before @@ -44,16 +42,14 @@ public void setup() throws InterruptedException { mapper = new DynamoDBMapper(ddb, DynamoDBMapperConfig.builder() .withTableNameOverride(new DynamoDBMapperConfig.TableNameOverride(TABLE_NAME)) .build()).newTableMapper(GsiWithAlwaysUpdateTimestamp.class); - mapper.createTable(new ProvisionedThroughput(5L, 5L)); - ddb.waiters().tableExists() - .run(new WaiterParameters(new DescribeTableRequest(TABLE_NAME))); + mapper.createTable(ProvisionedThroughput.builder().readCapacityUnits(5L).writeCapacityUnits(5L).build()); + ddb.waiter().waitUntilTableExists(b -> b.tableName(TABLE_NAME)); } @After public void tearDown() { mapper.deleteTableIfExists(); - ddb.waiters().tableNotExists() - .run(new WaiterParameters(new DescribeTableRequest(TABLE_NAME))); + ddb.waiter().waitUntilTableNotExists(b -> b.tableName(TABLE_NAME)); } @Test diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java index 696ad98e5609..b960058c9f1c 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java @@ -27,29 +27,27 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameOverride; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; -import com.amazonaws.services.dynamodbv2.model.ResourceNotFoundException; -import com.amazonaws.services.dynamodbv2.model.TableStatus; -import software.amazon.awssdk.mapper.dynamodb.test.AWSTestBase; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; +import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException; import static software.amazon.awssdk.mapper.dynamodb.pojos.TestDocClass.ChildClass; -public class JsonIntegrationTest extends AWSTestBase { +public class JsonIntegrationTest extends LocalDynamoDBTestBase { private static final String TABLE_NAME = "test-table-" + UUID.randomUUID().toString(); - private static AmazonDynamoDBClient client; + private static DynamoDbClient client; private static DynamoDBMapper mapper; @BeforeClass public static void setup() throws Exception { - setUpCredentials(); - client = new AmazonDynamoDBClient(credentials); + client = client(); mapper = new DynamoDBMapper( client, @@ -62,25 +60,13 @@ public static void setup() throws Exception { CreateTableRequest request = mapper .generateCreateTableRequest(TestDocClass.class) - .withProvisionedThroughput(new ProvisionedThroughput(1L, 1L)); + .toBuilder() + .provisionedThroughput(ProvisionedThroughput.builder() + .readCapacityUnits(1L).writeCapacityUnits(1L).build()) + .build(); client.createTable(request); - - Thread.sleep(10000); - - while (true) { - String status = client.describeTable(TABLE_NAME) - .getTable() - .getTableStatus(); - - if (status.equals(TableStatus.ACTIVE.toString())) { - break; - } else if (!status.equals(TableStatus.CREATING.toString())) { - throw new RuntimeException("Table creation failed"); - } - - Thread.sleep(2000); - } + client.waiter().waitUntilTableExists(b -> b.tableName(TABLE_NAME)); } @AfterClass @@ -90,7 +76,7 @@ public static void cleanup() { } try { - client.deleteTable(TABLE_NAME); + client.deleteTable(DeleteTableRequest.builder().tableName(TABLE_NAME).build()); } catch (ResourceNotFoundException e) { } } diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequest2Test.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequest2Test.java index 78fb4bc7b8c4..e898b97db005 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequest2Test.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequest2Test.java @@ -4,27 +4,28 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.mapper.dynamodb.LocalDynamoDBTestBase; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndexDescription; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.KeyType; -import com.amazonaws.services.dynamodbv2.model.LocalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.LocalSecondaryIndexDescription; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; -import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; -import com.amazonaws.services.dynamodbv2.model.TableDescription; -import com.amazonaws.services.dynamodbv2.util.TableUtils; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexDescription; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndexDescription; +import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.TableDescription; import software.amazon.awssdk.mapper.dynamodb.test.util.UnorderedCollectionComparator; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -36,9 +37,10 @@ public class GenerateCreateTableRequest2Test extends LocalDynamoDBTestBase { private static final Set testedTableName = new HashSet(); - private static final ProvisionedThroughput DEFAULT_CAPACITY = new ProvisionedThroughput(5L, 5L); + private static final ProvisionedThroughput DEFAULT_CAPACITY = + ProvisionedThroughput.builder().readCapacityUnits(5L).writeCapacityUnits(5L).build(); private static DynamoDBMapper mapper; - private static AmazonDynamoDB dynamo; + private static DynamoDbClient dynamo; @BeforeClass public static void setUp() throws Exception { @@ -49,158 +51,179 @@ public static void setUp() throws Exception { @AfterClass public static void tearDown() { for (String tableName : testedTableName) { - dynamo.deleteTable(tableName); + dynamo.deleteTable(DeleteTableRequest.builder().tableName(tableName).build()); } } @Test public void testParseIndexRangeKeyClass() throws Exception { CreateTableRequest request = mapper.generateCreateTableRequest(IndexRangeKeyClass.class); - String createdTableName = appendCurrentTimeToTableName(request); + String createdTableName = appendCurrentTimeToTableName(request.tableName()); testedTableName.add(createdTableName); - setProvisionedThroughput(request, DEFAULT_CAPACITY); + request = withTableNameAndThroughput(request, createdTableName, DEFAULT_CAPACITY); - TableDescription createdTableDescription = dynamo.createTable(request).getTableDescription(); + TableDescription createdTableDescription = dynamo.createTable(request).tableDescription(); - assertEquals(createdTableName, createdTableDescription.getTableName()); + assertEquals(createdTableName, createdTableDescription.tableName()); List expectedKeyElements = Arrays.asList( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("rangeKey", KeyType.RANGE) + KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("rangeKey").keyType(KeyType.RANGE).build() ); - assertEquals(expectedKeyElements, createdTableDescription.getKeySchema()); + assertEquals(expectedKeyElements, createdTableDescription.keySchema()); List expectedAttrDefinitions = Arrays.asList( - new AttributeDefinition("key", ScalarAttributeType.N), - new AttributeDefinition("rangeKey", ScalarAttributeType.N), - new AttributeDefinition("indexFooRangeKey", ScalarAttributeType.N), - new AttributeDefinition("indexBarRangeKey", ScalarAttributeType.N), - new AttributeDefinition("multipleIndexRangeKey", ScalarAttributeType.N) + AttributeDefinition.builder().attributeName("key").attributeType(ScalarAttributeType.N).build(), + AttributeDefinition.builder().attributeName("rangeKey").attributeType(ScalarAttributeType.N).build(), + AttributeDefinition.builder().attributeName("indexFooRangeKey").attributeType(ScalarAttributeType.N).build(), + AttributeDefinition.builder().attributeName("indexBarRangeKey").attributeType(ScalarAttributeType.N).build(), + AttributeDefinition.builder().attributeName("multipleIndexRangeKey").attributeType(ScalarAttributeType.N).build() ); assertTrue(UnorderedCollectionComparator.equalUnorderedCollections( expectedAttrDefinitions, - createdTableDescription.getAttributeDefinitions())); + createdTableDescription.attributeDefinitions())); List expectedLsi = Arrays.asList( - new LocalSecondaryIndex() - .withIndexName("index_foo") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("indexFooRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("index_bar") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("indexBarRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("index_foo_copy") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("multipleIndexRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("index_bar_copy") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("multipleIndexRangeKey", KeyType.RANGE))); - assertTrue(equalLsi(expectedLsi, createdTableDescription.getLocalSecondaryIndexes())); - - assertNull(request.getGlobalSecondaryIndexes()); - assertEquals(DEFAULT_CAPACITY, request.getProvisionedThroughput()); + LocalSecondaryIndex.builder() + .indexName("index_foo") + .keySchema( + KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("indexFooRangeKey").keyType(KeyType.RANGE).build()) + .build(), + LocalSecondaryIndex.builder() + .indexName("index_bar") + .keySchema( + KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("indexBarRangeKey").keyType(KeyType.RANGE).build()) + .build(), + LocalSecondaryIndex.builder() + .indexName("index_foo_copy") + .keySchema( + KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("multipleIndexRangeKey").keyType(KeyType.RANGE).build()) + .build(), + LocalSecondaryIndex.builder() + .indexName("index_bar_copy") + .keySchema( + KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("multipleIndexRangeKey").keyType(KeyType.RANGE).build()) + .build()); + assertTrue(equalLsi(expectedLsi, createdTableDescription.localSecondaryIndexes())); + + assertTrue(request.globalSecondaryIndexes().isEmpty()); + assertEquals(DEFAULT_CAPACITY, request.provisionedThroughput()); // Only one table with indexes can be created simultaneously - TableUtils.waitUntilActive(dynamo, createdTableName); + dynamo.waiter().waitUntilTableExists(b -> b.tableName(createdTableName)); } @Test public void testComplexIndexedHashRangeClass() throws Exception { CreateTableRequest request = mapper.generateCreateTableRequest(MapperQueryExpressionTest.HashRangeClass.class); - String createdTableName = appendCurrentTimeToTableName(request); + String createdTableName = appendCurrentTimeToTableName(request.tableName()); testedTableName.add(createdTableName); - setProvisionedThroughput(request, DEFAULT_CAPACITY); + request = withTableNameAndThroughput(request, createdTableName, DEFAULT_CAPACITY); - TableDescription createdTableDescription = dynamo.createTable(request).getTableDescription(); + TableDescription createdTableDescription = dynamo.createTable(request).tableDescription(); - assertEquals(createdTableName, createdTableDescription.getTableName()); + assertEquals(createdTableName, createdTableDescription.tableName()); List expectedKeyElements = Arrays.asList( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("primaryRangeKey", KeyType.RANGE) + KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build() ); - assertEquals(expectedKeyElements, createdTableDescription.getKeySchema()); + assertEquals(expectedKeyElements, createdTableDescription.keySchema()); List expectedAttrDefinitions = Arrays.asList( - new AttributeDefinition("primaryHashKey", ScalarAttributeType.S), - new AttributeDefinition("indexHashKey", ScalarAttributeType.S), - new AttributeDefinition("primaryRangeKey", ScalarAttributeType.S), - new AttributeDefinition("indexRangeKey", ScalarAttributeType.S), - new AttributeDefinition("anotherIndexRangeKey", ScalarAttributeType.S) + AttributeDefinition.builder().attributeName("primaryHashKey").attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName("indexHashKey").attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName("primaryRangeKey").attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName("indexRangeKey").attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName("anotherIndexRangeKey").attributeType(ScalarAttributeType.S).build() ); assertTrue(UnorderedCollectionComparator.equalUnorderedCollections( expectedAttrDefinitions, - createdTableDescription.getAttributeDefinitions())); + createdTableDescription.attributeDefinitions())); List expectedLsi = Arrays.asList( - new LocalSecondaryIndex() - .withIndexName("LSI-primary-range") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("primaryRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("LSI-index-range-1") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("LSI-index-range-2") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("LSI-index-range-3") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("anotherIndexRangeKey", KeyType.RANGE))); - assertTrue(equalLsi(expectedLsi, createdTableDescription.getLocalSecondaryIndexes())); + LocalSecondaryIndex.builder() + .indexName("LSI-primary-range") + .keySchema( + KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()) + .build(), + LocalSecondaryIndex.builder() + .indexName("LSI-index-range-1") + .keySchema( + KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()) + .build(), + LocalSecondaryIndex.builder() + .indexName("LSI-index-range-2") + .keySchema( + KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()) + .build(), + LocalSecondaryIndex.builder() + .indexName("LSI-index-range-3") + .keySchema( + KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("anotherIndexRangeKey").keyType(KeyType.RANGE).build()) + .build()); + assertTrue(equalLsi(expectedLsi, createdTableDescription.localSecondaryIndexes())); List expectedGsi = Arrays.asList( - new GlobalSecondaryIndex() - .withIndexName("GSI-primary-hash-index-range-1") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-primary-hash-index-range-2") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("anotherIndexRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-index-hash-primary-range") - .withKeySchema( - new KeySchemaElement("indexHashKey", KeyType.HASH), - new KeySchemaElement("primaryRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-index-hash-index-range-1") - .withKeySchema( - new KeySchemaElement("indexHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-index-hash-index-range-2") - .withKeySchema( - new KeySchemaElement("indexHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE))); - assertTrue(equalGsi(expectedGsi, createdTableDescription.getGlobalSecondaryIndexes())); - - assertEquals(DEFAULT_CAPACITY, request.getProvisionedThroughput()); + GlobalSecondaryIndex.builder() + .indexName("GSI-primary-hash-index-range-1") + .keySchema( + KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()) + .build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-primary-hash-index-range-2") + .keySchema( + KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("anotherIndexRangeKey").keyType(KeyType.RANGE).build()) + .build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-index-hash-primary-range") + .keySchema( + KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()) + .build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-index-hash-index-range-1") + .keySchema( + KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()) + .build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-index-hash-index-range-2") + .keySchema( + KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()) + .build()); + assertTrue(equalGsi(expectedGsi, createdTableDescription.globalSecondaryIndexes())); + + assertEquals(DEFAULT_CAPACITY, request.provisionedThroughput()); // Only one table with indexes can be created simultaneously - TableUtils.waitUntilActive(dynamo, createdTableName); + dynamo.waiter().waitUntilTableExists(b -> b.tableName(createdTableName)); } - private static void setProvisionedThroughput(CreateTableRequest request, ProvisionedThroughput throughput) { - request.setProvisionedThroughput(throughput); - if (request.getGlobalSecondaryIndexes() != null) { - for (GlobalSecondaryIndex gsi : request.getGlobalSecondaryIndexes()) { - gsi.setProvisionedThroughput(throughput); - } + private static CreateTableRequest withTableNameAndThroughput(CreateTableRequest request, + String tableName, + ProvisionedThroughput throughput) { + List gsis = request.globalSecondaryIndexes().stream() + .map(gsi -> gsi.toBuilder().provisionedThroughput(throughput).build()) + .collect(Collectors.toList()); + CreateTableRequest.Builder builder = request.toBuilder() + .tableName(tableName) + .provisionedThroughput(throughput); + // Only set the GSI list when the class actually declares one; passing an empty list + // to createTable is rejected by the service ("GSI list is empty/invalid"). + if (!gsis.isEmpty()) { + builder.globalSecondaryIndexes(gsis); } + return builder.build(); } private static boolean equalLsi(Collection a, Collection b) { @@ -217,8 +240,8 @@ private static class LocalSecondaryIndexDefinitionComparator @Override public boolean equals(LocalSecondaryIndex a, LocalSecondaryIndexDescription b) { - return a.getIndexName().equals(b.getIndexName()) - && a.getKeySchema().equals(b.getKeySchema()); + return a.indexName().equals(b.indexName()) + && a.keySchema().equals(b.keySchema()); } } @@ -229,14 +252,12 @@ private static class GlobalSecondaryIndexDefinitionComparator @Override public boolean equals(GlobalSecondaryIndex a, GlobalSecondaryIndexDescription b) { - return a.getIndexName().equals(b.getIndexName()) - && a.getKeySchema().equals(b.getKeySchema()); + return a.indexName().equals(b.indexName()) + && a.keySchema().equals(b.keySchema()); } } - private static String appendCurrentTimeToTableName(CreateTableRequest request) { - String appendedName = String.format("%s-%d", request.getTableName(), System.currentTimeMillis()); - request.setTableName(appendedName); - return appendedName; + private static String appendCurrentTimeToTableName(String tableName) { + return String.format("%s-%d", tableName, System.currentTimeMillis()); } } diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequestTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequestTest.java index 532c80148a08..d80bc79ab4e3 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequestTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/GenerateCreateTableRequestTest.java @@ -11,17 +11,15 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.amazonaws.auth.AnonymousAWSCredentials; import software.amazon.awssdk.mapper.dynamodb.test.util.DynamoDBTestBase; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.KeyType; -import com.amazonaws.services.dynamodbv2.model.LocalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; import software.amazon.awssdk.mapper.dynamodb.test.util.UnorderedCollectionComparator; /** @@ -33,133 +31,141 @@ public class GenerateCreateTableRequestTest extends DynamoDBTestBase { @BeforeClass public static void setUp() { - dynamo = new AmazonDynamoDBClient(new AnonymousAWSCredentials()); - mapper = new DynamoDBMapper(dynamo); + // generateCreateTableRequest is a pure client-side operation, so no service client is needed. + mapper = new DynamoDBMapper(null); } @Test public void testParseIndexRangeKeyClass() { CreateTableRequest request = mapper.generateCreateTableRequest(IndexRangeKeyClass.class); - assertEquals("aws-java-sdk-index-range-test", request.getTableName()); + assertEquals("aws-java-sdk-index-range-test", request.tableName()); List expectedKeyElements = Arrays.asList( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("rangeKey", KeyType.RANGE) + keySchema("key", KeyType.HASH), + keySchema("rangeKey", KeyType.RANGE) ); - assertEquals(expectedKeyElements, request.getKeySchema()); + assertEquals(expectedKeyElements, request.keySchema()); List expectedAttrDefinitions = Arrays.asList( - new AttributeDefinition("key", ScalarAttributeType.N), - new AttributeDefinition("rangeKey", ScalarAttributeType.N), - new AttributeDefinition("indexFooRangeKey", ScalarAttributeType.N), - new AttributeDefinition("indexBarRangeKey", ScalarAttributeType.N), - new AttributeDefinition("multipleIndexRangeKey", ScalarAttributeType.N) + attrDefinition("key", ScalarAttributeType.N), + attrDefinition("rangeKey", ScalarAttributeType.N), + attrDefinition("indexFooRangeKey", ScalarAttributeType.N), + attrDefinition("indexBarRangeKey", ScalarAttributeType.N), + attrDefinition("multipleIndexRangeKey", ScalarAttributeType.N) ); assertTrue(UnorderedCollectionComparator.equalUnorderedCollections( expectedAttrDefinitions, - request.getAttributeDefinitions())); + request.attributeDefinitions())); List expectedLsi = Arrays.asList( - new LocalSecondaryIndex() - .withIndexName("index_foo") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("indexFooRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("index_bar") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("indexBarRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("index_foo_copy") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("multipleIndexRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("index_bar_copy") - .withKeySchema( - new KeySchemaElement("key", KeyType.HASH), - new KeySchemaElement("multipleIndexRangeKey", KeyType.RANGE))); - assertTrue(equalLsi(expectedLsi, request.getLocalSecondaryIndexes())); - - assertNull(request.getGlobalSecondaryIndexes()); - assertNull(request.getProvisionedThroughput()); + LocalSecondaryIndex.builder() + .indexName("index_foo") + .keySchema( + keySchema("key", KeyType.HASH), + keySchema("indexFooRangeKey", KeyType.RANGE)).build(), + LocalSecondaryIndex.builder() + .indexName("index_bar") + .keySchema( + keySchema("key", KeyType.HASH), + keySchema("indexBarRangeKey", KeyType.RANGE)).build(), + LocalSecondaryIndex.builder() + .indexName("index_foo_copy") + .keySchema( + keySchema("key", KeyType.HASH), + keySchema("multipleIndexRangeKey", KeyType.RANGE)).build(), + LocalSecondaryIndex.builder() + .indexName("index_bar_copy") + .keySchema( + keySchema("key", KeyType.HASH), + keySchema("multipleIndexRangeKey", KeyType.RANGE)).build()); + assertTrue(equalLsi(expectedLsi, request.localSecondaryIndexes())); + + assertTrue(request.globalSecondaryIndexes().isEmpty()); + assertNull(request.provisionedThroughput()); } @Test public void testComplexIndexedHashRangeClass() { CreateTableRequest request = mapper.generateCreateTableRequest(MapperQueryExpressionTest.HashRangeClass.class); - assertEquals("table_name", request.getTableName()); + assertEquals("table_name", request.tableName()); List expectedKeyElements = Arrays.asList( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("primaryRangeKey", KeyType.RANGE) + keySchema("primaryHashKey", KeyType.HASH), + keySchema("primaryRangeKey", KeyType.RANGE) ); - assertEquals(expectedKeyElements, request.getKeySchema()); + assertEquals(expectedKeyElements, request.keySchema()); List expectedAttrDefinitions = Arrays.asList( - new AttributeDefinition("primaryHashKey", ScalarAttributeType.S), - new AttributeDefinition("indexHashKey", ScalarAttributeType.S), - new AttributeDefinition("primaryRangeKey", ScalarAttributeType.S), - new AttributeDefinition("indexRangeKey", ScalarAttributeType.S), - new AttributeDefinition("anotherIndexRangeKey", ScalarAttributeType.S) + attrDefinition("primaryHashKey", ScalarAttributeType.S), + attrDefinition("indexHashKey", ScalarAttributeType.S), + attrDefinition("primaryRangeKey", ScalarAttributeType.S), + attrDefinition("indexRangeKey", ScalarAttributeType.S), + attrDefinition("anotherIndexRangeKey", ScalarAttributeType.S) ); assertTrue(UnorderedCollectionComparator.equalUnorderedCollections( expectedAttrDefinitions, - request.getAttributeDefinitions())); + request.attributeDefinitions())); List expectedLsi = Arrays.asList( - new LocalSecondaryIndex() - .withIndexName("LSI-primary-range") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("primaryRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("LSI-index-range-1") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("LSI-index-range-2") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new LocalSecondaryIndex() - .withIndexName("LSI-index-range-3") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("anotherIndexRangeKey", KeyType.RANGE))); - assertTrue(equalLsi(expectedLsi, request.getLocalSecondaryIndexes())); + LocalSecondaryIndex.builder() + .indexName("LSI-primary-range") + .keySchema( + keySchema("primaryHashKey", KeyType.HASH), + keySchema("primaryRangeKey", KeyType.RANGE)).build(), + LocalSecondaryIndex.builder() + .indexName("LSI-index-range-1") + .keySchema( + keySchema("primaryHashKey", KeyType.HASH), + keySchema("indexRangeKey", KeyType.RANGE)).build(), + LocalSecondaryIndex.builder() + .indexName("LSI-index-range-2") + .keySchema( + keySchema("primaryHashKey", KeyType.HASH), + keySchema("indexRangeKey", KeyType.RANGE)).build(), + LocalSecondaryIndex.builder() + .indexName("LSI-index-range-3") + .keySchema( + keySchema("primaryHashKey", KeyType.HASH), + keySchema("anotherIndexRangeKey", KeyType.RANGE)).build()); + assertTrue(equalLsi(expectedLsi, request.localSecondaryIndexes())); List expectedGsi = Arrays.asList( - new GlobalSecondaryIndex() - .withIndexName("GSI-primary-hash-index-range-1") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-primary-hash-index-range-2") - .withKeySchema( - new KeySchemaElement("primaryHashKey", KeyType.HASH), - new KeySchemaElement("anotherIndexRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-index-hash-primary-range") - .withKeySchema( - new KeySchemaElement("indexHashKey", KeyType.HASH), - new KeySchemaElement("primaryRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-index-hash-index-range-1") - .withKeySchema( - new KeySchemaElement("indexHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE)), - new GlobalSecondaryIndex() - .withIndexName("GSI-index-hash-index-range-2") - .withKeySchema( - new KeySchemaElement("indexHashKey", KeyType.HASH), - new KeySchemaElement("indexRangeKey", KeyType.RANGE))); - assertTrue(equalGsi(expectedGsi, request.getGlobalSecondaryIndexes())); - - assertNull(request.getProvisionedThroughput()); + GlobalSecondaryIndex.builder() + .indexName("GSI-primary-hash-index-range-1") + .keySchema( + keySchema("primaryHashKey", KeyType.HASH), + keySchema("indexRangeKey", KeyType.RANGE)).build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-primary-hash-index-range-2") + .keySchema( + keySchema("primaryHashKey", KeyType.HASH), + keySchema("anotherIndexRangeKey", KeyType.RANGE)).build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-index-hash-primary-range") + .keySchema( + keySchema("indexHashKey", KeyType.HASH), + keySchema("primaryRangeKey", KeyType.RANGE)).build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-index-hash-index-range-1") + .keySchema( + keySchema("indexHashKey", KeyType.HASH), + keySchema("indexRangeKey", KeyType.RANGE)).build(), + GlobalSecondaryIndex.builder() + .indexName("GSI-index-hash-index-range-2") + .keySchema( + keySchema("indexHashKey", KeyType.HASH), + keySchema("indexRangeKey", KeyType.RANGE)).build()); + assertTrue(equalGsi(expectedGsi, request.globalSecondaryIndexes())); + + assertNull(request.provisionedThroughput()); + } + + private static KeySchemaElement keySchema(String attributeName, KeyType keyType) { + return KeySchemaElement.builder().attributeName(attributeName).keyType(keyType).build(); + } + + private static AttributeDefinition attrDefinition(String attributeName, ScalarAttributeType type) { + return AttributeDefinition.builder().attributeName(attributeName).attributeType(type).build(); } private static boolean equalLsi(Collection a, Collection b) { @@ -176,10 +182,10 @@ private static class LocalSecondaryIndexDefinitionComparator @Override public boolean equals(LocalSecondaryIndex a, LocalSecondaryIndex b) { - return a.getIndexName().equals(b.getIndexName()) - && a.getKeySchema().equals(b.getKeySchema()); + return a.indexName().equals(b.indexName()) + && a.keySchema().equals(b.keySchema()); } - + } private static class GlobalSecondaryIndexDefinitionComparator @@ -188,8 +194,8 @@ private static class GlobalSecondaryIndexDefinitionComparator @Override public boolean equals(GlobalSecondaryIndex a, GlobalSecondaryIndex b) { - return a.getIndexName().equals(b.getIndexName()) - && a.getKeySchema().equals(b.getKeySchema()); + return a.indexName().equals(b.indexName()) + && a.keySchema().equals(b.keySchema()); } } } diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/HashKeyOnlyTableWithGSITest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/HashKeyOnlyTableWithGSITest.java index 75ea015b563b..f0edf910b309 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/HashKeyOnlyTableWithGSITest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/HashKeyOnlyTableWithGSITest.java @@ -2,7 +2,7 @@ import static org.junit.Assert.assertEquals; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.mapper.dynamodb.LocalDynamoDBTestBase; import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexHashKey; @@ -11,20 +11,20 @@ import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import software.amazon.awssdk.mapper.dynamodb.PaginatedQueryList; -import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; -import com.amazonaws.services.dynamodbv2.model.Condition; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.KeyType; -import com.amazonaws.services.dynamodbv2.model.Projection; -import com.amazonaws.services.dynamodbv2.model.ProjectionType; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; -import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; -import com.amazonaws.services.dynamodbv2.util.TableUtils; -import java.util.ArrayList; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.AttributeValue; +import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator; +import software.amazon.awssdk.services.dynamodb.model.Condition; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.Projection; +import software.amazon.awssdk.services.dynamodb.model.ProjectionType; +import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; +import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; import java.util.List; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -36,38 +36,44 @@ public class HashKeyOnlyTableWithGSITest extends LocalDynamoDBTestBase { public static final String HASH_KEY_ONLY_TABLE_NAME = "no-primary-range-key-gsi-test"; - private static AmazonDynamoDB dynamo; + private static DynamoDbClient dynamo; @BeforeClass public static void setUp() throws Exception { dynamo = client(); - List keySchema = new ArrayList(); - keySchema.add(new KeySchemaElement("id", KeyType.HASH)); - - CreateTableRequest req = new CreateTableRequest(HASH_KEY_ONLY_TABLE_NAME, keySchema) - .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L)) - .withAttributeDefinitions( - new AttributeDefinition("id", ScalarAttributeType.S), - new AttributeDefinition("status", ScalarAttributeType.S), - new AttributeDefinition("ts", ScalarAttributeType.S)) - .withGlobalSecondaryIndexes( - new GlobalSecondaryIndex() - .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L)) - .withIndexName("statusAndCreation") - .withKeySchema( - new KeySchemaElement("status", KeyType.HASH), - new KeySchemaElement("ts", KeyType.RANGE)) - .withProjection( - new Projection().withProjectionType(ProjectionType.ALL))); - - TableUtils.createTableIfNotExists(dynamo, req); - TableUtils.waitUntilActive(dynamo, HASH_KEY_ONLY_TABLE_NAME); + + CreateTableRequest req = CreateTableRequest.builder() + .tableName(HASH_KEY_ONLY_TABLE_NAME) + .keySchema(KeySchemaElement.builder().attributeName("id").keyType(KeyType.HASH).build()) + .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(10L).writeCapacityUnits(10L).build()) + .attributeDefinitions( + AttributeDefinition.builder().attributeName("id").attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName("status").attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName("ts").attributeType(ScalarAttributeType.S).build()) + .globalSecondaryIndexes( + GlobalSecondaryIndex.builder() + .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(10L).writeCapacityUnits(10L).build()) + .indexName("statusAndCreation") + .keySchema( + KeySchemaElement.builder().attributeName("status").keyType(KeyType.HASH).build(), + KeySchemaElement.builder().attributeName("ts").keyType(KeyType.RANGE).build()) + .projection( + Projection.builder().projectionType(ProjectionType.ALL).build()) + .build()) + .build(); + + try { + dynamo.createTable(req); + } catch (ResourceInUseException e) { + // Table already exists. + } + dynamo.waiter().waitUntilTableExists(b -> b.tableName(HASH_KEY_ONLY_TABLE_NAME)); } @AfterClass public static void tearDown() throws Exception { - dynamo.deleteTable(HASH_KEY_ONLY_TABLE_NAME); + dynamo.deleteTable(DeleteTableRequest.builder().tableName(HASH_KEY_ONLY_TABLE_NAME).build()); } @DynamoDBTable(tableName = HASH_KEY_ONLY_TABLE_NAME) @@ -126,9 +132,10 @@ public void testGSIQuery() throws Exception { .withConsistentRead(false) .withHashKeyValues(user) .withRangeKeyCondition("ts", - new Condition() - .withComparisonOperator(ComparisonOperator.GT) - .withAttributeValueList(new AttributeValue("100"))); + Condition.builder() + .comparisonOperator(ComparisonOperator.GT) + .attributeValueList(AttributeValue.builder().s("100").build()) + .build()); queryResult = mapper.query(User.class, expr); } while (queryResult.size() == 0 && System.currentTimeMillis() < endTime); diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/MapperLoadingStrategyConfigTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/MapperLoadingStrategyConfigTest.java index bdea6d897bac..8eb1c3632d17 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/MapperLoadingStrategyConfigTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/mapper/MapperLoadingStrategyConfigTest.java @@ -2,7 +2,7 @@ import static org.junit.Assert.*; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.mapper.dynamodb.LocalDynamoDBTestBase; import java.lang.reflect.Field; import java.util.ArrayList; @@ -11,7 +11,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperIntegrationTestBase; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; @@ -19,9 +18,9 @@ import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; import software.amazon.awssdk.mapper.dynamodb.DynamoDBScanExpression; import software.amazon.awssdk.mapper.dynamodb.PaginatedList; -import com.amazonaws.services.dynamodbv2.model.AttributeValue; -import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; -import com.amazonaws.services.dynamodbv2.model.Condition; +import software.amazon.awssdk.services.dynamodb.model.AttributeValue; +import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator; +import software.amazon.awssdk.services.dynamodb.model.Condition; import software.amazon.awssdk.mapper.dynamodb.pojos.RangeKeyClass; /** @@ -34,14 +33,14 @@ public class MapperLoadingStrategyConfigTest extends LocalDynamoDBTestBase { private static int PARALLEL_SEGMENT = 3; private static int OBJECTS_NUM = 50; private static int RESULTS_NUM = OBJECTS_NUM - 2; // condition: rangeKey > 1.0 - private static AmazonDynamoDB dynamo; + private static DynamoDbClient dynamo; @BeforeClass public static void setUp() throws Exception { dynamo = client(); DynamoDBMapper mapper = new DynamoDBMapper(dynamo); dynamo.createTable(mapper.generateCreateTableRequest(RangeKeyClass.class) - .withProvisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT)); + .toBuilder().provisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT).build()); createTestData(); } @@ -138,8 +137,8 @@ private static PaginatedList getTestPaginatedQueryList(Pagination keyObject.setKey(hashKey); DynamoDBQueryExpression queryExpression = new DynamoDBQueryExpression().withHashKeyValues(keyObject); queryExpression.withRangeKeyCondition("rangeKey", - new Condition().withComparisonOperator(ComparisonOperator.GT.toString()).withAttributeValueList( - new AttributeValue().withN("1.0"))).withLimit(PAGE_SIZE); + Condition.builder().comparisonOperator(ComparisonOperator.GT).attributeValueList( + AttributeValue.builder().n("1.0").build()).build()).withLimit(PAGE_SIZE); return mapper.query(RangeKeyClass.class, queryExpression, new DynamoDBMapperConfig(paginationLoadingStrategy)); } @@ -150,12 +149,12 @@ private static PaginatedList getTestPaginatedScanList(PaginationL // Construct the scan expression with the exact same conditions DynamoDBScanExpression scanExpression = new DynamoDBScanExpression(); - scanExpression.addFilterCondition("key", - new Condition().withComparisonOperator(ComparisonOperator.EQ).withAttributeValueList( - new AttributeValue().withN(Long.toString(hashKey)))); - scanExpression.addFilterCondition("rangeKey", - new Condition().withComparisonOperator(ComparisonOperator.GT).withAttributeValueList( - new AttributeValue().withN("1.0"))); + scanExpression.addFilterCondition("key", + Condition.builder().comparisonOperator(ComparisonOperator.EQ).attributeValueList( + AttributeValue.builder().n(Long.toString(hashKey)).build()).build()); + scanExpression.addFilterCondition("rangeKey", + Condition.builder().comparisonOperator(ComparisonOperator.GT).attributeValueList( + AttributeValue.builder().n("1.0").build()).build()); scanExpression.setLimit(PAGE_SIZE); return mapper.scan(RangeKeyClass.class, scanExpression, new DynamoDBMapperConfig(paginationLoadingStrategy)); @@ -167,12 +166,12 @@ private static PaginatedList getTestPaginatedParallelScanList(Pag // Construct the scan expression with the exact same conditions DynamoDBScanExpression scanExpression = new DynamoDBScanExpression(); - scanExpression.addFilterCondition("key", - new Condition().withComparisonOperator(ComparisonOperator.EQ).withAttributeValueList( - new AttributeValue().withN(Long.toString(hashKey)))); - scanExpression.addFilterCondition("rangeKey", - new Condition().withComparisonOperator(ComparisonOperator.GT).withAttributeValueList( - new AttributeValue().withN("1.0"))); + scanExpression.addFilterCondition("key", + Condition.builder().comparisonOperator(ComparisonOperator.EQ).attributeValueList( + AttributeValue.builder().n(Long.toString(hashKey)).build()).build()); + scanExpression.addFilterCondition("rangeKey", + Condition.builder().comparisonOperator(ComparisonOperator.GT).attributeValueList( + AttributeValue.builder().n("1.0").build()).build()); scanExpression.setLimit(PAGE_SIZE); return mapper.parallelScan(RangeKeyClass.class, scanExpression, PARALLEL_SEGMENT, new DynamoDBMapperConfig(paginationLoadingStrategy)); diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/DynamoDBTableResource.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/DynamoDBTableResource.java index 15c8373fcabc..dae5813c2c34 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/DynamoDBTableResource.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/DynamoDBTableResource.java @@ -16,25 +16,25 @@ import java.util.List; -import com.amazonaws.AmazonServiceException; import software.amazon.awssdk.mapper.dynamodb.test.util.DynamoDBTestBase; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndexDescription; -import com.amazonaws.services.dynamodbv2.model.LocalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.LocalSecondaryIndexDescription; -import com.amazonaws.services.dynamodbv2.model.Projection; -import com.amazonaws.services.dynamodbv2.model.TableDescription; -import com.amazonaws.services.dynamodbv2.model.TableStatus; -import com.amazonaws.services.dynamodbv2.util.TableUtils; -import software.amazon.awssdk.mapper.dynamodb.test.resources.TestResource; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; +import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexDescription; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndexDescription; +import software.amazon.awssdk.services.dynamodb.model.Projection; +import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException; +import software.amazon.awssdk.services.dynamodb.model.TableDescription; +import software.amazon.awssdk.services.dynamodb.model.TableStatus; import software.amazon.awssdk.mapper.dynamodb.test.util.UnorderedCollectionComparator; import software.amazon.awssdk.mapper.dynamodb.test.util.UnorderedCollectionComparator.CrossTypeComparator; public abstract class DynamoDBTableResource implements TestResource { - protected abstract AmazonDynamoDB getClient(); + protected abstract DynamoDbClient getClient(); protected abstract CreateTableRequest getCreateTableRequest(); @@ -49,22 +49,20 @@ public void create(boolean waitTillFinished) { if (waitTillFinished) { System.out.println("Waiting for " + this + " to become active..."); - try { - TableUtils.waitUntilActive(getClient(), getCreateTableRequest().getTableName()); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } + getClient().waiter().waitUntilTableExists( + b -> b.tableName(getCreateTableRequest().tableName())); } } @Override public void delete(boolean waitTillFinished) { System.out.println("Deleting " + this + "..."); - getClient().deleteTable(getCreateTableRequest().getTableName()); + getClient().deleteTable(DeleteTableRequest.builder() + .tableName(getCreateTableRequest().tableName()).build()); if (waitTillFinished) { System.out.println("Waiting for " + this + " to become deleted..."); - DynamoDBTestBase.waitForTableToBecomeDeleted(getClient(), getCreateTableRequest().getTableName()); + DynamoDBTestBase.waitForTableToBecomeDeleted(getClient(), getCreateTableRequest().tableName()); } } @@ -73,29 +71,27 @@ public ResourceStatus getResourceStatus() { CreateTableRequest createRequest = getCreateTableRequest(); TableDescription table = null; try { - table = getClient().describeTable( - createRequest.getTableName()).getTable(); - } catch (AmazonServiceException ase) { - if ( ase.getErrorCode().equalsIgnoreCase("ResourceNotFoundException")) { - return ResourceStatus.NOT_EXIST; - } + table = getClient().describeTable(DescribeTableRequest.builder() + .tableName(createRequest.tableName()).build()).table(); + } catch (ResourceNotFoundException rnfe) { + return ResourceStatus.NOT_EXIST; } - String tableStatus = table.getTableStatus(); + TableStatus tableStatus = table.tableStatus(); - if (tableStatus.equals(TableStatus.ACTIVE.toString())) { + if (tableStatus == TableStatus.ACTIVE) { // returns AVAILABLE only if table KeySchema + LSIs + GSIs all match. - if (UnorderedCollectionComparator.equalUnorderedCollections(createRequest.getKeySchema(), table.getKeySchema()) - && equalUnorderedGsiLists(createRequest.getGlobalSecondaryIndexes(), table.getGlobalSecondaryIndexes()) - && equalUnorderedLsiLists(createRequest.getLocalSecondaryIndexes(), table.getLocalSecondaryIndexes()) + if (UnorderedCollectionComparator.equalUnorderedCollections(createRequest.keySchema(), table.keySchema()) + && equalUnorderedGsiLists(createRequest.globalSecondaryIndexes(), table.globalSecondaryIndexes()) + && equalUnorderedLsiLists(createRequest.localSecondaryIndexes(), table.localSecondaryIndexes()) ) { return ResourceStatus.AVAILABLE; } else { return ResourceStatus.EXIST_INCOMPATIBLE_RESOURCE; } - } else if (tableStatus.equals(TableStatus.CREATING.toString()) - || tableStatus.equals(TableStatus.UPDATING.toString()) - || tableStatus.equals(TableStatus.DELETING.toString())) { + } else if (tableStatus == TableStatus.CREATING + || tableStatus == TableStatus.UPDATING + || tableStatus == TableStatus.DELETING) { return ResourceStatus.TRANSIENT; } else { return ResourceStatus.NOT_EXIST; @@ -115,9 +111,9 @@ static boolean equalUnorderedGsiLists(List listA, List() { @Override public boolean equals(GlobalSecondaryIndex a, GlobalSecondaryIndexDescription b) { - return a.getIndexName().equals(b.getIndexName()) - && equalProjections(a.getProjection(), b.getProjection()) - && UnorderedCollectionComparator.equalUnorderedCollections(a.getKeySchema(), b.getKeySchema()); + return a.indexName().equals(b.indexName()) + && equalProjections(a.projection(), b.projection()) + && UnorderedCollectionComparator.equalUnorderedCollections(a.keySchema(), b.keySchema()); } }); } @@ -138,9 +134,9 @@ public boolean equals(LocalSecondaryIndex a, LocalSecondaryIndexDescription b) { // Project parameter might not be specified in the // CreateTableRequest. But it should be treated as equal // to the default projection type - KEYS_ONLY. - return a.getIndexName().equals(b.getIndexName()) - && equalProjections(a.getProjection(), b.getProjection()) - && UnorderedCollectionComparator.equalUnorderedCollections(a.getKeySchema(), b.getKeySchema()); + return a.indexName().equals(b.indexName()) + && equalProjections(a.projection(), b.projection()) + && UnorderedCollectionComparator.equalUnorderedCollections(a.keySchema(), b.keySchema()); } }); } @@ -154,11 +150,11 @@ static boolean equalProjections(Projection fromCreateTableRequest, Projection fr throw new IllegalStateException("The projection parameter should never be null."); } - return fromCreateTableRequest.getProjectionType().equals( - fromDescribeTableResult.getProjectionType()) + return fromCreateTableRequest.projectionType().equals( + fromDescribeTableResult.projectionType()) && UnorderedCollectionComparator.equalUnorderedCollections( - fromCreateTableRequest.getNonKeyAttributes(), - fromDescribeTableResult.getNonKeyAttributes()); + fromCreateTableRequest.nonKeyAttributes(), + fromDescribeTableResult.nonKeyAttributes()); } @@ -167,7 +163,7 @@ static boolean equalProjections(Projection fromCreateTableRequest, Projection fr */ @Override public String toString() { - return "DynamoDB Table [" + getCreateTableRequest().getTableName() + "]"; + return "DynamoDB Table [" + getCreateTableRequest().tableName() + "]"; } @Override diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/TestResourceUtils.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/TestResourceUtils.java index b0801e907d5f..dfb7eded09e0 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/TestResourceUtils.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/TestResourceUtils.java @@ -14,7 +14,7 @@ */ package software.amazon.awssdk.mapper.dynamodb.test.resources; -import com.amazonaws.AmazonClientException; +import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.mapper.dynamodb.test.resources.RequiredResources.ResourceCreationPolicy; import software.amazon.awssdk.mapper.dynamodb.test.resources.TestResource.ResourceStatus; @@ -60,6 +60,6 @@ public static ResourceStatus waitForFinalizedStatus(TestResource resource) throw Thread.sleep(1000 * 10); } - throw new AmazonClientException("Resource never escaped the transient state."); + throw SdkClientException.create("Resource never escaped the transient state."); } } diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/BasicTempTable.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/BasicTempTable.java index e8a19169e448..2b8e9f3eb305 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/BasicTempTable.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/BasicTempTable.java @@ -1,11 +1,11 @@ package software.amazon.awssdk.mapper.dynamodb.test.resources.tables; -import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.KeyType; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; -import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; public class BasicTempTable { public static final String TEMP_TABLE_NAME = "basic-temp-table"; @@ -13,20 +13,19 @@ public class BasicTempTable { public static final Long READ_CAPACITY = 10L; public static final Long WRITE_CAPACITY = 5L; public static final ProvisionedThroughput DEFAULT_PROVISIONED_THROUGHPUT = - new ProvisionedThroughput().withReadCapacityUnits(READ_CAPACITY).withWriteCapacityUnits(WRITE_CAPACITY); + ProvisionedThroughput.builder().readCapacityUnits(READ_CAPACITY).writeCapacityUnits(WRITE_CAPACITY).build(); public static CreateTableRequest getCreateTableRequest() { - CreateTableRequest request = new CreateTableRequest() - .withTableName(TEMP_TABLE_NAME) - .withKeySchema( - new KeySchemaElement().withAttributeName(HASH_KEY_NAME) - .withKeyType(KeyType.HASH)) - .withAttributeDefinitions( - new AttributeDefinition().withAttributeName( - HASH_KEY_NAME).withAttributeType( - ScalarAttributeType.S)); - request.setProvisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT); - return request; + return CreateTableRequest.builder() + .tableName(TEMP_TABLE_NAME) + .keySchema( + KeySchemaElement.builder().attributeName(HASH_KEY_NAME) + .keyType(KeyType.HASH).build()) + .attributeDefinitions( + AttributeDefinition.builder().attributeName(HASH_KEY_NAME) + .attributeType(ScalarAttributeType.S).build()) + .provisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT) + .build(); } } diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithBinaryKey.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithBinaryKey.java index 7e29ba67b310..5f420ff1e51e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithBinaryKey.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithBinaryKey.java @@ -1,11 +1,11 @@ package software.amazon.awssdk.mapper.dynamodb.test.resources.tables; -import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.KeyType; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; -import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; public class TempTableWithBinaryKey { @@ -14,20 +14,19 @@ public class TempTableWithBinaryKey { public static final Long READ_CAPACITY = 10L; public static final Long WRITE_CAPACITY = 5L; public static final ProvisionedThroughput DEFAULT_PROVISIONED_THROUGHPUT = - new ProvisionedThroughput().withReadCapacityUnits(READ_CAPACITY).withWriteCapacityUnits(WRITE_CAPACITY); + ProvisionedThroughput.builder().readCapacityUnits(READ_CAPACITY).writeCapacityUnits(WRITE_CAPACITY).build(); public static CreateTableRequest getCreateTableRequest() { - CreateTableRequest request = new CreateTableRequest() - .withTableName(TEMP_BINARY_TABLE_NAME) - .withKeySchema( - new KeySchemaElement().withAttributeName(HASH_KEY_NAME) - .withKeyType(KeyType.HASH)) - .withAttributeDefinitions( - new AttributeDefinition().withAttributeName( - HASH_KEY_NAME).withAttributeType( - ScalarAttributeType.B)); - request.setProvisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT); - return request; + return CreateTableRequest.builder() + .tableName(TEMP_BINARY_TABLE_NAME) + .keySchema( + KeySchemaElement.builder().attributeName(HASH_KEY_NAME) + .keyType(KeyType.HASH).build()) + .attributeDefinitions( + AttributeDefinition.builder().attributeName(HASH_KEY_NAME) + .attributeType(ScalarAttributeType.B).build()) + .provisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT) + .build(); } } diff --git a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithSecondaryIndexes.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithSecondaryIndexes.java index bc427c8af5f8..924ee04d85c1 100644 --- a/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithSecondaryIndexes.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/test/resources/tables/TempTableWithSecondaryIndexes.java @@ -1,15 +1,15 @@ package software.amazon.awssdk.mapper.dynamodb.test.resources.tables; -import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; -import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; -import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.dynamodbv2.model.KeyType; -import com.amazonaws.services.dynamodbv2.model.LocalSecondaryIndex; -import com.amazonaws.services.dynamodbv2.model.Projection; -import com.amazonaws.services.dynamodbv2.model.ProjectionType; -import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; -import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; +import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; +import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; +import software.amazon.awssdk.services.dynamodb.model.KeyType; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex; +import software.amazon.awssdk.services.dynamodb.model.Projection; +import software.amazon.awssdk.services.dynamodb.model.ProjectionType; +import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; +import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; /** * The table used by SecondaryIndexesIntegrationTest @@ -24,67 +24,58 @@ public class TempTableWithSecondaryIndexes { public static final String GSI_NAME = "global_secondary_index"; public static final String GSI_HASH_KEY_NAME = "global_secondary_index_hash_attribute"; public static final String GSI_RANGE_KEY_NAME = "global_secondary_index_range_attribute"; - public static final ProvisionedThroughput GSI_PROVISIONED_THROUGHPUT = new ProvisionedThroughput( - 5L, 5L); + public static final ProvisionedThroughput GSI_PROVISIONED_THROUGHPUT = + ProvisionedThroughput.builder().readCapacityUnits(5L).writeCapacityUnits(5L).build(); public static CreateTableRequest getCreateTableRequest() { - CreateTableRequest createTableRequest = new CreateTableRequest() - .withTableName(TEMP_TABLE_NAME) - .withKeySchema( - new KeySchemaElement().withAttributeName(HASH_KEY_NAME) - .withKeyType(KeyType.HASH), - new KeySchemaElement() - .withAttributeName(RANGE_KEY_NAME).withKeyType( - KeyType.RANGE)) - .withAttributeDefinitions( - new AttributeDefinition().withAttributeName( - HASH_KEY_NAME).withAttributeType( - ScalarAttributeType.S), - new AttributeDefinition().withAttributeName( - RANGE_KEY_NAME).withAttributeType( - ScalarAttributeType.N), - new AttributeDefinition().withAttributeName( - LSI_RANGE_KEY_NAME).withAttributeType( - ScalarAttributeType.N), - new AttributeDefinition().withAttributeName( - GSI_HASH_KEY_NAME).withAttributeType( - ScalarAttributeType.S), - new AttributeDefinition().withAttributeName( - GSI_RANGE_KEY_NAME).withAttributeType( - ScalarAttributeType.N)) - .withProvisionedThroughput(BasicTempTable.DEFAULT_PROVISIONED_THROUGHPUT) - .withLocalSecondaryIndexes( - new LocalSecondaryIndex() - .withIndexName(LSI_NAME) - .withKeySchema( - new KeySchemaElement() - .withAttributeName( - HASH_KEY_NAME) - .withKeyType(KeyType.HASH), - new KeySchemaElement() - .withAttributeName( - LSI_RANGE_KEY_NAME) - .withKeyType(KeyType.RANGE)) - .withProjection( - new Projection() - .withProjectionType(ProjectionType.KEYS_ONLY))) - .withGlobalSecondaryIndexes( - new GlobalSecondaryIndex().withIndexName(GSI_NAME) - .withKeySchema( - new KeySchemaElement() - .withAttributeName( - GSI_HASH_KEY_NAME) - .withKeyType(KeyType.HASH), - new KeySchemaElement() - .withAttributeName( - GSI_RANGE_KEY_NAME) - .withKeyType(KeyType.RANGE)) - .withProjection( - new Projection() - .withProjectionType(ProjectionType.KEYS_ONLY)) - .withProvisionedThroughput( - GSI_PROVISIONED_THROUGHPUT)); - return createTableRequest; + return CreateTableRequest.builder() + .tableName(TEMP_TABLE_NAME) + .keySchema( + KeySchemaElement.builder().attributeName(HASH_KEY_NAME) + .keyType(KeyType.HASH).build(), + KeySchemaElement.builder() + .attributeName(RANGE_KEY_NAME).keyType(KeyType.RANGE).build()) + .attributeDefinitions( + AttributeDefinition.builder().attributeName(HASH_KEY_NAME) + .attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName(RANGE_KEY_NAME) + .attributeType(ScalarAttributeType.N).build(), + AttributeDefinition.builder().attributeName(LSI_RANGE_KEY_NAME) + .attributeType(ScalarAttributeType.N).build(), + AttributeDefinition.builder().attributeName(GSI_HASH_KEY_NAME) + .attributeType(ScalarAttributeType.S).build(), + AttributeDefinition.builder().attributeName(GSI_RANGE_KEY_NAME) + .attributeType(ScalarAttributeType.N).build()) + .provisionedThroughput(BasicTempTable.DEFAULT_PROVISIONED_THROUGHPUT) + .localSecondaryIndexes( + LocalSecondaryIndex.builder() + .indexName(LSI_NAME) + .keySchema( + KeySchemaElement.builder() + .attributeName(HASH_KEY_NAME) + .keyType(KeyType.HASH).build(), + KeySchemaElement.builder() + .attributeName(LSI_RANGE_KEY_NAME) + .keyType(KeyType.RANGE).build()) + .projection( + Projection.builder() + .projectionType(ProjectionType.KEYS_ONLY).build()) + .build()) + .globalSecondaryIndexes( + GlobalSecondaryIndex.builder().indexName(GSI_NAME) + .keySchema( + KeySchemaElement.builder() + .attributeName(GSI_HASH_KEY_NAME) + .keyType(KeyType.HASH).build(), + KeySchemaElement.builder() + .attributeName(GSI_RANGE_KEY_NAME) + .keyType(KeyType.RANGE).build()) + .projection( + Projection.builder() + .projectionType(ProjectionType.KEYS_ONLY).build()) + .provisionedThroughput(GSI_PROVISIONED_THROUGHPUT) + .build()) + .build(); } } From fad612b5a9e0cf59ee3f498d2828e6be315af9a6 Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Mon, 24 Aug 2026 11:02:25 -0700 Subject: [PATCH 2/5] Avoid rebuilding GSI/LSI collections twice in generateCreateTableReques --- .../awssdk/mapper/dynamodb/DynamoDBMapper.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java index 960d89a89738..6d6ecab9f821 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java @@ -44,9 +44,11 @@ import software.amazon.awssdk.services.dynamodb.model.Get; import software.amazon.awssdk.services.dynamodb.model.GetItemRequest; import software.amazon.awssdk.services.dynamodb.model.GetItemResponse; +import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex; import software.amazon.awssdk.services.dynamodb.model.ItemResponse; import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes; +import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex; import software.amazon.awssdk.services.dynamodb.model.Put; import software.amazon.awssdk.services.dynamodb.model.PutItemRequest; import software.amazon.awssdk.services.dynamodb.model.PutItemResponse; @@ -2275,11 +2277,16 @@ public CreateTableRequest generateCreateTableRequest(Class clazz, DynamoD .tableName(getTableName(clazz, config)) .keySchema(keySchema) .attributeDefinitions(attributeDefinitions); - if (model.globalSecondaryIndexes() != null) { - request.globalSecondaryIndexes(model.globalSecondaryIndexes()); - } - if (model.localSecondaryIndexes() != null) { - request.localSecondaryIndexes(model.localSecondaryIndexes()); + // globalSecondaryIndexes()/localSecondaryIndexes() rebuild their collections on every call and + // return null (not empty) when the class declares none, so read once and guard on null to keep + // the v1 behavior of leaving the field unset. + final Collection globalSecondaryIndexes = model.globalSecondaryIndexes(); + if (globalSecondaryIndexes != null) { + request.globalSecondaryIndexes(globalSecondaryIndexes); + } + final Collection localSecondaryIndexes = model.localSecondaryIndexes(); + if (localSecondaryIndexes != null) { + request.localSecondaryIndexes(localSecondaryIndexes); } return request.build(); } From 755459ddf9ac2e7e76e1b103dd8f5ff0db727d0e Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Tue, 25 Aug 2026 11:08:36 -0700 Subject: [PATCH 3/5] Fix documentation that references v1 --- services-custom/dynamodb-mapper/pom.xml | 5 --- .../mapper/dynamodb/DynamoDBTableMapper.java | 12 +++--- .../dynamodb/DynamoDBVersionAttribute.java | 2 +- .../mapper/dynamodb/DynamoDBVersioned.java | 2 +- .../mapper/dynamodb/IDynamoDBMapper.java | 38 +++++++++---------- .../unmarshallers/BooleanSetUnmarshaller.java | 2 +- 6 files changed, 28 insertions(+), 33 deletions(-) diff --git a/services-custom/dynamodb-mapper/pom.xml b/services-custom/dynamodb-mapper/pom.xml index 6f05467f5e32..25818329c041 100644 --- a/services-custom/dynamodb-mapper/pom.xml +++ b/services-custom/dynamodb-mapper/pom.xml @@ -107,11 +107,6 @@ dynamodb ${awsjavasdk.version} - - com.amazonaws - aws-java-sdk-dynamodb - ${sdk-v1.version} - com.amazonaws aws-java-sdk-s3 diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java index 5c3e034d6563..06479e3c5096 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java @@ -132,7 +132,7 @@ * @param The range key value type; use ? if no range key. * * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper - * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB + * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient */ public final class DynamoDBTableMapper { @@ -466,7 +466,7 @@ public PaginatedParallelScanList parallelScan(DynamoDBScanExpression scanExpr * table, when it was created, the primary key schema, and any indexes on * the table. * @return The describe table results. - * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB#describeTable + * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#describeTable */ public TableDescription describeTable() { return db.describeTable(DescribeTableRequest.builder() @@ -479,7 +479,7 @@ public TableDescription describeTable() { * throughput for all global secondary indexes. * @param throughput The provisioned throughput. * @return The table decription. - * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB#createTable + * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#createTable * @see com.amazonaws.services.dynamodbv2.model.CreateTableRequest */ public TableDescription createTable(ProvisionedThroughput throughput) { @@ -502,7 +502,7 @@ public TableDescription createTable(ProvisionedThroughput throughput) { * ialready exists. * @param throughput The provisioned throughput. * @return True if created, or false if the table already existed. - * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB#createTable + * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#createTable * @see com.amazonaws.services.dynamodbv2.model.CreateTableRequest */ public boolean createTableIfNotExists(ProvisionedThroughput throughput) { @@ -520,7 +520,7 @@ public boolean createTableIfNotExists(ProvisionedThroughput throughput) { /** * Deletes the table. * @return The table decription. - * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB#deleteTable + * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#deleteTable * @see com.amazonaws.services.dynamodbv2.model.DeleteTableRequest */ public TableDescription deleteTable() { @@ -531,7 +531,7 @@ public TableDescription deleteTable() { * Deletes the table and ignores the {@code ResourceNotFoundException} if * it does not already exist. * @return True if the table was deleted, or false if the table did not exist. - * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB#deleteTable + * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#deleteTable * @see com.amazonaws.services.dynamodbv2.model.DeleteTableRequest */ public boolean deleteTableIfExists() { diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersionAttribute.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersionAttribute.java index 1deb20b85bc5..899edd44f1ba 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersionAttribute.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersionAttribute.java @@ -35,7 +35,7 @@ * matches the client's. New objects will be assigned a version of 1 when saved.

*

Note that for batchWrite, and by extension batchSave and batchDelete, no * version checks are performed, as required by the - * {@link com.amazonaws.services.dynamodbv2.AmazonDynamoDB#batchWriteItem(BatchWriteItemRequest)} + * {@link software.amazon.awssdk.services.dynamodb.DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} * API.

* * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBVersioned diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersioned.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersioned.java index 4cf51f17e8ea..02fc06990a4b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersioned.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersioned.java @@ -43,7 +43,7 @@ * *

Note that for batchWrite, and by extension batchSave and batchDelete, * no version checks are performed, as required by the - * {@link com.amazonaws.services.dynamodbv2.AmazonDynamoDB#batchWriteItem(BatchWriteItemRequest)} + * {@link software.amazon.awssdk.services.dynamodb.DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} * API.

* *

May be used as a meta-annotation.

diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java index a8dc1e00cf8e..ad1424b78fca 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java @@ -14,7 +14,7 @@ */ package software.amazon.awssdk.mapper.dynamodb; -import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; +import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.FailedBatch; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; @@ -159,8 +159,8 @@ public interface IDynamoDBMapper { /** * Saves an item in DynamoDB. The service method used is determined by the * {@link DynamoDBMapperConfig#getSaveBehavior()} value, to use either - * {@link AmazonDynamoDB#putItem} or - * {@link AmazonDynamoDB#updateItem}: + * {@link DynamoDbClient#putItem} or + * {@link DynamoDbClient#updateItem}: *
    *
  • UPDATE (default) : UPDATE will not affect unmodeled attributes on a save operation * and a null value for the modeled attribute will remove it from that item in DynamoDB. Because @@ -217,7 +217,7 @@ public interface IDynamoDBMapper { void delete(T object, DynamoDBDeleteExpression deleteExpression, DynamoDBMapperConfig config); /** - * Transactionally writes objects specified by transactionWriteRequest by calling {@link AmazonDynamoDB#transactWriteItems} API. + * Transactionally writes objects specified by transactionWriteRequest by calling {@link DynamoDbClient#transactWriteItems} API. * Changes to objects which are put or updated are applied in-memory. Such in-memory updates are NOT thread safe. *

    * This method ignores any SaveBehavior set on the mapper. Whether an object is put or updated is solely determined by the @@ -242,7 +242,7 @@ public interface IDynamoDBMapper { void transactionWrite(TransactionWriteRequest transactionWriteRequest); /** - * Transactionally writes objects specified by transactionWriteRequest by calling {@link AmazonDynamoDB#transactWriteItems} API. + * Transactionally writes objects specified by transactionWriteRequest by calling {@link DynamoDbClient#transactWriteItems} API. * Changes to objects which are put or updated are applied in-memory. Such in-memory updates are NOT thread safe. *

    * This method ignores any SaveBehavior set on the mapper. Whether an object is put or updated is solely determined by the @@ -272,7 +272,7 @@ public interface IDynamoDBMapper { void transactionWrite(TransactionWriteRequest transactionWriteRequest, DynamoDBMapperConfig config); /** - * Transactionally loads objects specified by transactionLoadRequest by calling {@link AmazonDynamoDB#transactGetItems} API. + * Transactionally loads objects specified by transactionLoadRequest by calling {@link DynamoDbClient#transactGetItems} API. *

    * Any exceptions from underlying API are thrown as is. For more information, please refer * https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactGetItems.html @@ -286,7 +286,7 @@ public interface IDynamoDBMapper { List transactionLoad(TransactionLoadRequest transactionLoadRequest); /** - * Transactionally loads objects specified by transactionLoadRequest by calling {@link AmazonDynamoDB#transactGetItems} API. + * Transactionally loads objects specified by transactionLoadRequest by calling {@link DynamoDbClient#transactGetItems} API. *

    * Any exceptions from underlying API are thrown as is. For more information, please refer * https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TransactGetItems.html @@ -306,7 +306,7 @@ public interface IDynamoDBMapper { /** * Deletes the objects given using one or more calls to the - * {@link AmazonDynamoDB#batchWriteItem} API. No version checks are + * {@link DynamoDbClient#batchWriteItem} API. No version checks are * performed, as required by the API. * * @see DynamoDBMapper#batchWrite(Iterable, Iterable) @@ -315,7 +315,7 @@ public interface IDynamoDBMapper { /** * Deletes the objects given using one or more calls to the - * {@link AmazonDynamoDB#batchWriteItem} API. No version checks are + * {@link DynamoDbClient#batchWriteItem} API. No version checks are * performed, as required by the API. * * @see DynamoDBMapper#batchWrite(Iterable, Iterable) @@ -324,11 +324,11 @@ public interface IDynamoDBMapper { /** * Saves the objects given using one or more calls to the - * {@link AmazonDynamoDB#batchWriteItem} API. No version checks are + * {@link DynamoDbClient#batchWriteItem} API. No version checks are * performed, as required by the API. *

    * This method ignores any SaveBehavior set on the mapper, and always behaves as if - * SaveBehavior.CLOBBER was specified, as the AmazonDynamoDB.batchWriteItem() request does not + * SaveBehavior.CLOBBER was specified, as the DynamoDbClient.batchWriteItem() request does not * support updating existing items. *

    * This method fails to save the batch if the size of an individual object in the batch exceeds @@ -342,11 +342,11 @@ public interface IDynamoDBMapper { /** * Saves the objects given using one or more calls to the - * {@link AmazonDynamoDB#batchWriteItem} API. No version checks are + * {@link DynamoDbClient#batchWriteItem} API. No version checks are * performed, as required by the API. *

    * This method ignores any SaveBehavior set on the mapper, and always behaves as if - * SaveBehavior.CLOBBER was specified, as the AmazonDynamoDB.batchWriteItem() request does not + * SaveBehavior.CLOBBER was specified, as the DynamoDbClient.batchWriteItem() request does not * support updating existing items. * *

    * This method fails to save the batch if the size of an individual object in the batch exceeds @@ -360,11 +360,11 @@ public interface IDynamoDBMapper { /** * Saves and deletes the objects given using one or more calls to the - * {@link AmazonDynamoDB#batchWriteItem} API. No version checks are + * {@link DynamoDbClient#batchWriteItem} API. No version checks are * performed, as required by the API. *

    * This method ignores any SaveBehavior set on the mapper, and always behaves as if - * SaveBehavior.CLOBBER was specified, as the AmazonDynamoDB.batchWriteItem() request does not + * SaveBehavior.CLOBBER was specified, as the DynamoDbClient.batchWriteItem() request does not * support updating existing items. *

    * This method fails to save the batch if the size of an individual object in the batch exceeds @@ -383,7 +383,7 @@ public interface IDynamoDBMapper { /** * Saves and deletes the objects given using one or more calls to the - * {@link AmazonDynamoDB#batchWriteItem} API. Use mapper config to + * {@link DynamoDbClient#batchWriteItem} API. Use mapper config to * control the retry strategy when UnprocessedItems are returned by the BatchWriteItem API *

    * This method fails to save the batch if the size of an individual object in the batch exceeds @@ -398,10 +398,10 @@ public interface IDynamoDBMapper { * * @param objectsToWrite * A list of objects to save to DynamoDB. No version checks are performed, as - * required by the {@link AmazonDynamoDB#batchWriteItem} API. + * required by the {@link DynamoDbClient#batchWriteItem} API. * @param objectsToDelete * A list of objects to delete from DynamoDB. No version checks are performed, - * as required by the {@link AmazonDynamoDB#batchWriteItem} + * as required by the {@link DynamoDbClient#batchWriteItem} * API. * @param config * Only {@link DynamoDBMapperConfig#getTableNameOverride()} and @@ -452,7 +452,7 @@ List batchWrite(Iterable objectsToWrite, /** * Retrieves the attributes for multiple items from multiple tables using their primary keys. - * {@link AmazonDynamoDB#batchGetItem} API. + * {@link DynamoDbClient#batchGetItem} API. * * @return A map of the loaded objects. Each key in the map is the name of a DynamoDB table. * Each value in the map is a list of objects that have been loaded from that table. All diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java index cb05e5b77f29..b18cc0f89e44 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java @@ -24,7 +24,7 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue; /** - * A special unmarshaller for Set<Boolean>, which the V1 schema stores as + * A special unmarshaller for Set<Boolean>, which the V1 schema stores as * an NS using 0/1 for true/false. In the V2 schema these fall through to * the {@code ObjectSetToListMarshaller} which stores them as an L or BOOLs. */ From 95366d01a7d02646db2fc6ea54320295bc97eedc Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Tue, 25 Aug 2026 12:04:26 -0700 Subject: [PATCH 4/5] Ignore ddb mapper brazil config for now so builds can run --- .brazil.json | 2 +- .../mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.brazil.json b/.brazil.json index ca68c3d1a48a..f5e231e1727f 100644 --- a/.brazil.json +++ b/.brazil.json @@ -319,7 +319,7 @@ "skipImport": true }, "dynamodb-mapper": { - "packageName": "AwsJavaSdk-DynamoDbMapper" + "skipImport": true } }, "dependencies": { diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java index b18cc0f89e44..cb05e5b77f29 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java @@ -24,7 +24,7 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue; /** - * A special unmarshaller for Set<Boolean>, which the V1 schema stores as + * A special unmarshaller for Set<Boolean>, which the V1 schema stores as * an NS using 0/1 for true/false. In the V2 schema these fall through to * the {@code ObjectSetToListMarshaller} which stores them as an L or BOOLs. */ From e119d8853941be5aee85c34cd320153388de2bee Mon Sep 17 00:00:00 2001 From: RanVaknin <50976344+RanVaknin@users.noreply.github.com> Date: Tue, 25 Aug 2026 15:05:37 -0700 Subject: [PATCH 5/5] Fix dangling references to v1 --- .../mapper/dynamodb/DynamoDBTableMapper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java index 06479e3c5096..16e33612bbf5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java @@ -315,7 +315,7 @@ public void save(T object, DynamoDBSaveExpression saveExpression) { * @throws ConditionalCheckFailedException If the object exists. * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#save * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression - * @see com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue + * @see software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue */ public void saveIfNotExists(T object) throws ConditionalCheckFailedException { final DynamoDBSaveExpression saveExpression = new DynamoDBSaveExpression(); @@ -333,7 +333,7 @@ public void saveIfNotExists(T object) throws ConditionalCheckFailedException { * @throws ConditionalCheckFailedException If the object does not exist. * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#save * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression - * @see com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue + * @see software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue */ public void saveIfExists(T object) throws ConditionalCheckFailedException { final DynamoDBSaveExpression saveExpression = new DynamoDBSaveExpression(); @@ -371,7 +371,7 @@ public final void delete(final T object, final DynamoDBDeleteExpression deleteEx * @throws ConditionalCheckFailedException If the object does not exist. * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#delete * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBDeleteExpression - * @see com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue + * @see software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue */ public void deleteIfExists(T object) throws ConditionalCheckFailedException { final DynamoDBDeleteExpression deleteExpression = new DynamoDBDeleteExpression(); @@ -480,7 +480,7 @@ public TableDescription describeTable() { * @param throughput The provisioned throughput. * @return The table decription. * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#createTable - * @see com.amazonaws.services.dynamodbv2.model.CreateTableRequest + * @see software.amazon.awssdk.services.dynamodb.model.CreateTableRequest */ public TableDescription createTable(ProvisionedThroughput throughput) { // v1 mutated the generated request in place to stamp throughput onto the table and every GSI; @@ -503,7 +503,7 @@ public TableDescription createTable(ProvisionedThroughput throughput) { * @param throughput The provisioned throughput. * @return True if created, or false if the table already existed. * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#createTable - * @see com.amazonaws.services.dynamodbv2.model.CreateTableRequest + * @see software.amazon.awssdk.services.dynamodb.model.CreateTableRequest */ public boolean createTableIfNotExists(ProvisionedThroughput throughput) { try { @@ -521,7 +521,7 @@ public boolean createTableIfNotExists(ProvisionedThroughput throughput) { * Deletes the table. * @return The table decription. * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#deleteTable - * @see com.amazonaws.services.dynamodbv2.model.DeleteTableRequest + * @see software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest */ public TableDescription deleteTable() { return db.deleteTable(mapper.generateDeleteTableRequest(model.targetType())).tableDescription(); @@ -532,7 +532,7 @@ public TableDescription deleteTable() { * it does not already exist. * @return True if the table was deleted, or false if the table did not exist. * @see software.amazon.awssdk.services.dynamodb.DynamoDbClient#deleteTable - * @see com.amazonaws.services.dynamodbv2.model.DeleteTableRequest + * @see software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest */ public boolean deleteTableIfExists() { try {