From 8cde6799f28e4eb042a2791e70332526b9635d5a Mon Sep 17 00:00:00 2001 From: patchwork01 <110390516+patchwork01@users.noreply.github.com> Date: Thu, 20 Feb 2025 12:45:39 +0000 Subject: [PATCH 1/2] Reuse container in DynamoDBTestBase --- .../dynamodb/test/DynamoDBTestBase.java | 33 ++++---- .../tools/DynamoDBRecordBuilderIT.java | 32 ++++---- .../dynamodb/tools/DynamoDBTableTestBase.java | 4 +- .../dynamodb/tools/DynamoDBUtilsPagingIT.java | 78 +++++++++---------- .../tools/DynamoDBUtilsPagingLimitIT.java | 74 +++++++++--------- ...DynamoDBCompactionJobTrackerCreatorIT.java | 18 ++--- ...ynamoDBCompactionTaskTrackerCreatorIT.java | 14 ++-- .../DynamoDBCompactionJobTrackerTestBase.java | 8 +- ...DynamoDBCompactionTaskTrackerTestBase.java | 8 +- .../DynamoDBIngestBatcherStoreCreatorIT.java | 4 +- .../store/DynamoDBIngestBatcherStoreIT.java | 4 +- .../DynamoDBIngestBatcherStoreTestBase.java | 6 +- .../DynamoDBIngestJobTrackerCreatorIT.java | 6 +- .../DynamoDBIngestTaskTrackerCreatorIT.java | 6 +- .../DynamoDBIngestJobTrackerTestBase.java | 8 +- .../DynamoDBIngestTaskTrackerTestBase.java | 8 +- .../query/lambda/QueryMessageHandlerIT.java | 4 +- .../tracker/DynamoDBQueryTrackerIT.java | 28 +++---- ...TransactionLogSnapshotMetadataStoreIT.java | 4 +- 19 files changed, 171 insertions(+), 176 deletions(-) diff --git a/java/common/dynamodb-test/src/main/java/sleeper/dynamodb/test/DynamoDBTestBase.java b/java/common/dynamodb-test/src/main/java/sleeper/dynamodb/test/DynamoDBTestBase.java index f28110b7a4..66e64b008e 100644 --- a/java/common/dynamodb-test/src/main/java/sleeper/dynamodb/test/DynamoDBTestBase.java +++ b/java/common/dynamodb-test/src/main/java/sleeper/dynamodb/test/DynamoDBTestBase.java @@ -18,31 +18,26 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static sleeper.dynamodb.test.GenericContainerAwsV1ClientHelper.buildAwsV1Client; -@Testcontainers public abstract class DynamoDBTestBase { + public static final Logger LOGGER = LoggerFactory.getLogger(DynamoDBTestBase.class); - private static AmazonDynamoDB dynamoDBClientShared; - - @Container - public static final DynamoDBContainer CONTAINER = new DynamoDBContainer(); + public static final DynamoDBContainer CONTAINER = start(); + private static final AmazonDynamoDB DYNAMO_CLIENT = buildAwsV1Client(CONTAINER, CONTAINER.getDynamoPort(), AmazonDynamoDBClientBuilder.standard()); @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - protected final AmazonDynamoDB dynamoDBClient = dynamoDBClientShared; - - @BeforeAll - public static void initDynamoClient() { - dynamoDBClientShared = buildAwsV1Client(CONTAINER, CONTAINER.getDynamoPort(), AmazonDynamoDBClientBuilder.standard()); - } - - @AfterAll - public static void shutdownDynamoClient() { - dynamoDBClientShared.shutdown(); + protected final AmazonDynamoDB dynamoClient = DYNAMO_CLIENT; + + @SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE") + private static DynamoDBContainer start() { + DynamoDBContainer container = new DynamoDBContainer() + .withLogConsumer(outputFrame -> LOGGER.info(outputFrame.getUtf8StringWithoutLineEnding())) + .withEnv("DEBUG", "1"); + container.start(); + return container; } } diff --git a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBRecordBuilderIT.java b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBRecordBuilderIT.java index 55ad8fb8e2..1770b07f0a 100644 --- a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBRecordBuilderIT.java +++ b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBRecordBuilderIT.java @@ -36,9 +36,9 @@ void shouldCreateRecordWithStringAttribute() { .string(TEST_KEY, UUID.randomUUID().toString()) .string(TEST_VALUE, "value").build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(record); } @@ -49,9 +49,9 @@ void shouldCreateRecordWithIntAttribute() { .string(TEST_KEY, UUID.randomUUID().toString()) .number(TEST_VALUE, 123).build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(record); } @@ -62,9 +62,9 @@ void shouldCreateRecordWithLongAttribute() { .string(TEST_KEY, UUID.randomUUID().toString()) .number(TEST_VALUE, 123L).build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(record); } @@ -75,9 +75,9 @@ void shouldCreateRecordWithInstantAttribute() { .string(TEST_KEY, UUID.randomUUID().toString()) .number(TEST_VALUE, Instant.now().toEpochMilli()).build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(record); } @@ -89,9 +89,9 @@ void shouldCreateRecordWithNaN() { .string(TEST_KEY, key) .number(TEST_VALUE, Double.NaN).build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(record); } @@ -103,9 +103,9 @@ void shouldCreateRecordWithNullNumber() { .string(TEST_KEY, key) .number(TEST_VALUE, null).build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(record); } @@ -118,9 +118,9 @@ void shouldUnsetExistingNumberAttributeWhenProvidingNull() { .number(TEST_VALUE, 123) .number(TEST_VALUE, null).build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(new DynamoDBRecordBuilder() .string(TEST_KEY, key).build()); } @@ -134,9 +134,9 @@ void shouldUnsetExistingStringAttributeWhenProvidingNull() { .string(TEST_VALUE, "abc") .string(TEST_VALUE, null).build(); // When - dynamoDBClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); + dynamoClient.putItem(new PutItemRequest(TEST_TABLE_NAME, record)); // Then - ScanResult result = dynamoDBClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); + ScanResult result = dynamoClient.scan(new ScanRequest().withTableName(TEST_TABLE_NAME)); assertThat(result.getItems()).containsExactly(new DynamoDBRecordBuilder() .string(TEST_KEY, key).build()); } diff --git a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBTableTestBase.java b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBTableTestBase.java index ac18f59514..25ebdf6025 100644 --- a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBTableTestBase.java +++ b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBTableTestBase.java @@ -41,11 +41,11 @@ void setup() { @AfterEach public void tearDown() { - dynamoDBClient.deleteTable(TEST_TABLE_NAME); + dynamoClient.deleteTable(TEST_TABLE_NAME); } public void createTable() { - initialiseTable(dynamoDBClient, TEST_TABLE_NAME, + initialiseTable(dynamoClient, TEST_TABLE_NAME, List.of( new AttributeDefinition(TEST_KEY, ScalarAttributeType.S)), List.of( diff --git a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingIT.java b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingIT.java index 5d2f974fbd..4d35534652 100644 --- a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingIT.java +++ b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingIT.java @@ -50,7 +50,7 @@ public class DynamoDBUtilsPagingIT extends DynamoDBTestBase { @AfterEach public void tearDown() { - dynamoDBClient.deleteTable(tableName); + dynamoClient.deleteTable(tableName); } @Nested @@ -58,7 +58,7 @@ public void tearDown() { class RunningScan { @BeforeEach void setup() { - initialiseTable(dynamoDBClient, tableName, + initialiseTable(dynamoClient, tableName, List.of( new AttributeDefinition(TEST_KEY, ScalarAttributeType.S)), List.of( @@ -75,11 +75,11 @@ void shouldReturnPagedResultsWhenMoreRecordsThanLimit() { .string(TEST_KEY, UUID.randomUUID().toString()) .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, scan().withLimit(1))) + assertThat(streamPagedItems(dynamoClient, scan().withLimit(1))) .containsExactlyInAnyOrder(record1, record2); } @@ -90,10 +90,10 @@ void shouldReturnOnePageOfResultsWhenFewerRecordsThanLimit() { .string(TEST_KEY, UUID.randomUUID().toString()) .string(TEST_VALUE, "value1").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, scan().withLimit(2))) + assertThat(streamPagedItems(dynamoClient, scan().withLimit(2))) .containsExactlyInAnyOrder(record1); } @@ -104,10 +104,10 @@ void shouldReturnPagedResultsWhenRecordsEqualToLimit() { .string(TEST_KEY, UUID.randomUUID().toString()) .string(TEST_VALUE, "value1").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, scan().withLimit(1))) + assertThat(streamPagedItems(dynamoClient, scan().withLimit(1))) .containsExactlyInAnyOrder(record1); } @@ -118,10 +118,10 @@ void shouldNotReturnEmptyResultWhenFewerRecordsThanLimit() { .string(TEST_KEY, UUID.randomUUID().toString()) .string(TEST_VALUE, "value1").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); // When/Then - assertThat(streamPagedResults(dynamoDBClient, scan().withLimit(2))) + assertThat(streamPagedResults(dynamoClient, scan().withLimit(2))) .extracting(result -> result.getItems().size()) .containsExactly(1); } @@ -133,10 +133,10 @@ void shouldReturnEmptyResultForLastPageWhenRecordsEqualToLimit() { .string(TEST_KEY, UUID.randomUUID().toString()) .string(TEST_VALUE, "value1").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); // When/Then - assertThat(streamPagedResults(dynamoDBClient, scan().withLimit(1))) + assertThat(streamPagedResults(dynamoClient, scan().withLimit(1))) .extracting(result -> result.getItems().size()) .containsExactly(1, 0); } @@ -154,19 +154,19 @@ void shouldReturnPagedResultsWhenLastPageHasFewerRecordsThanLimit() { .string(TEST_KEY, UUID.randomUUID().toString()) .string(TEST_VALUE, "value3").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record3)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record3)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, scan().withLimit(2))) + assertThat(streamPagedItems(dynamoClient, scan().withLimit(2))) .containsExactlyInAnyOrder(record1, record2, record3); } @Test void shouldReturnNoResultsWhenNoRecordsExist() { // When/Then - assertThat(streamPagedItems(dynamoDBClient, scan().withLimit(1))) + assertThat(streamPagedItems(dynamoClient, scan().withLimit(1))) .isEmpty(); } } @@ -176,7 +176,7 @@ void shouldReturnNoResultsWhenNoRecordsExist() { class RunningQuery { @BeforeEach void setUp() { - initialiseTable(dynamoDBClient, tableName, + initialiseTable(dynamoClient, tableName, List.of( new AttributeDefinition(TEST_KEY, ScalarAttributeType.S), new AttributeDefinition(TEST_VALUE, ScalarAttributeType.S)), @@ -195,11 +195,11 @@ void shouldReturnPagedResultsWhenMoreRecordsThanLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "test-value-2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, queryForKey("test-key").withLimit(1))) + assertThat(streamPagedItems(dynamoClient, queryForKey("test-key").withLimit(1))) .containsExactlyInAnyOrder(record1, record2); } @@ -213,11 +213,11 @@ void shouldReturnOnePageOfResultsWhenFewerRecordsThanLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "test-value-2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, queryForKey("test-key").withLimit(3))) + assertThat(streamPagedItems(dynamoClient, queryForKey("test-key").withLimit(3))) .containsExactlyInAnyOrder(record1, record2); } @@ -231,11 +231,11 @@ void shouldReturnPagedResultsWhenRecordsEqualToLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "test-value-2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, queryForKey("test-key").withLimit(2))) + assertThat(streamPagedItems(dynamoClient, queryForKey("test-key").withLimit(2))) .containsExactlyInAnyOrder(record1, record2); } @@ -249,11 +249,11 @@ void shouldNotReturnEmptyResultWhenFewerRecordsThanLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "test-value-2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(streamPagedResults(dynamoDBClient, queryForKey("test-key").withLimit(3))) + assertThat(streamPagedResults(dynamoClient, queryForKey("test-key").withLimit(3))) .extracting(result -> result.getItems().size()) .containsExactly(2); } @@ -268,11 +268,11 @@ void shouldReturnEmptyResultForLastPageWhenRecordsEqualToLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "test-value-2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(streamPagedResults(dynamoDBClient, queryForKey("test-key").withLimit(2))) + assertThat(streamPagedResults(dynamoClient, queryForKey("test-key").withLimit(2))) .extracting(result -> result.getItems().size()) .containsExactly(2, 0); } @@ -290,19 +290,19 @@ void shouldReturnPagedResultsWhenLastPageHasFewerRecordsThanLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "test-value-3").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record3)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record3)); // When/Then - assertThat(streamPagedItems(dynamoDBClient, queryForKey("test-key").withLimit(4))) + assertThat(streamPagedItems(dynamoClient, queryForKey("test-key").withLimit(4))) .containsExactlyInAnyOrder(record1, record2, record3); } @Test void shouldReturnNoResultsWhenNoRecordsExist() { // When/Then - assertThat(streamPagedItems(dynamoDBClient, queryForKey("not-a-key").withLimit(1))) + assertThat(streamPagedItems(dynamoClient, queryForKey("not-a-key").withLimit(1))) .isEmpty(); } } diff --git a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingLimitIT.java b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingLimitIT.java index c2c70c32c9..08739adfaa 100644 --- a/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingLimitIT.java +++ b/java/common/dynamodb-tools/src/test/java/sleeper/dynamodb/tools/DynamoDBUtilsPagingLimitIT.java @@ -49,7 +49,7 @@ public class DynamoDBUtilsPagingLimitIT extends DynamoDBTestBase { @AfterEach public void tearDown() { - dynamoDBClient.deleteTable(tableName); + dynamoClient.deleteTable(tableName); } @Nested @@ -57,7 +57,7 @@ public void tearDown() { class RunningScan { @BeforeEach void setup() { - initialiseTable(dynamoDBClient, tableName, + initialiseTable(dynamoClient, tableName, List.of( new AttributeDefinition(TEST_KEY, ScalarAttributeType.S)), List.of( @@ -74,11 +74,11 @@ void shouldLoadRecordsMatchingLoadLimit() { .string(TEST_KEY, "key2") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 2, scan())) + assertThat(loadPagedItemsWithLimit(dynamoClient, 2, scan())) .satisfies(items -> { assertThat(items.getItems()).containsExactlyInAnyOrder(record1, record2); assertThat(items.isMoreItems()).isFalse(); @@ -95,11 +95,11 @@ void shouldLoadRecordsBelowLoadLimit() { .string(TEST_KEY, "key2") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 10, scan())) + assertThat(loadPagedItemsWithLimit(dynamoClient, 10, scan())) .satisfies(items -> { assertThat(items.getItems()).containsExactlyInAnyOrder(record1, record2); assertThat(items.isMoreItems()).isFalse(); @@ -116,11 +116,11 @@ void shouldLoadRecordsWhenLoadLimitIsMetOnFirstPage() { .string(TEST_KEY, "key2") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 1, scan().withLimit(10))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 1, scan().withLimit(10))) .satisfies(items -> { assertThat(items.getItems()) .hasSize(1) @@ -145,13 +145,13 @@ void shouldLoadRecordsWhenLoadLimitIsMetOnSecondPage() { .string(TEST_KEY, "key4") .string(TEST_VALUE, "value4").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record3)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record4)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record3)); + dynamoClient.putItem(new PutItemRequest(tableName, record4)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 3, scan().withLimit(2))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 3, scan().withLimit(2))) .satisfies(items -> { assertThat(items.getItems()) .hasSize(3) @@ -170,11 +170,11 @@ void shouldLoadRecordsWhenLoadLimitIsMetAtEndOfFirstPageAndAnotherPageIsAvailabl .string(TEST_KEY, "key2") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 1, scan().withLimit(1))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 1, scan().withLimit(1))) .satisfies(items -> { assertThat(items.getItems()) .hasSize(1) @@ -189,7 +189,7 @@ void shouldLoadRecordsWhenLoadLimitIsMetAtEndOfFirstPageAndAnotherPageIsAvailabl class RunningQuery { @BeforeEach void setUp() { - initialiseTable(dynamoDBClient, tableName, + initialiseTable(dynamoClient, tableName, List.of( new AttributeDefinition(TEST_KEY, ScalarAttributeType.S), new AttributeDefinition(TEST_VALUE, ScalarAttributeType.S)), @@ -208,11 +208,11 @@ void shouldLoadRecordsMatchingLoadLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 2, queryForKey("test-key"))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 2, queryForKey("test-key"))) .satisfies(items -> { assertThat(items.getItems()).containsExactlyInAnyOrder(record1, record2); assertThat(items.isMoreItems()).isFalse(); @@ -229,11 +229,11 @@ void shouldLoadRecordsBelowLoadLimit() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 10, queryForKey("test-key"))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 10, queryForKey("test-key"))) .satisfies(items -> { assertThat(items.getItems()).containsExactlyInAnyOrder(record1, record2); assertThat(items.isMoreItems()).isFalse(); @@ -250,11 +250,11 @@ void shouldLoadRecordsWhenLoadLimitIsMetOnFirstPage() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 1, queryForKey("test-key").withLimit(10))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 1, queryForKey("test-key").withLimit(10))) .satisfies(items -> { assertThat(items.getItems()) .hasSize(1) @@ -279,13 +279,13 @@ void shouldLoadRecordsWhenLoadLimitIsMetOnSecondPage() { .string(TEST_KEY, "test-key") .string(TEST_VALUE, "value4").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record3)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record4)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record3)); + dynamoClient.putItem(new PutItemRequest(tableName, record4)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 3, queryForKey("test-key").withLimit(2))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 3, queryForKey("test-key").withLimit(2))) .satisfies(items -> { assertThat(items.getItems()) .hasSize(3) @@ -304,11 +304,11 @@ void shouldLoadRecordsWhenLoadLimitIsMetAtEndOfFirstPageAndAnotherPageIsAvailabl .string(TEST_KEY, "test-key") .string(TEST_VALUE, "value2").build(); - dynamoDBClient.putItem(new PutItemRequest(tableName, record1)); - dynamoDBClient.putItem(new PutItemRequest(tableName, record2)); + dynamoClient.putItem(new PutItemRequest(tableName, record1)); + dynamoClient.putItem(new PutItemRequest(tableName, record2)); // When/Then - assertThat(loadPagedItemsWithLimit(dynamoDBClient, 1, queryForKey("test-key").withLimit(1))) + assertThat(loadPagedItemsWithLimit(dynamoClient, 1, queryForKey("test-key").withLimit(1))) .satisfies(items -> { assertThat(items.getItems()) .hasSize(1) diff --git a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/job/DynamoDBCompactionJobTrackerCreatorIT.java b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/job/DynamoDBCompactionJobTrackerCreatorIT.java index 81f3bd1ba2..69cb15b1bd 100644 --- a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/job/DynamoDBCompactionJobTrackerCreatorIT.java +++ b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/job/DynamoDBCompactionJobTrackerCreatorIT.java @@ -39,13 +39,13 @@ public class DynamoDBCompactionJobTrackerCreatorIT extends DynamoDBTestBase { @Test public void shouldCreateStore() { // When - DynamoDBCompactionJobTrackerCreator.create(instanceProperties, dynamoDBClient); - CompactionJobTracker store = CompactionJobTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + DynamoDBCompactionJobTrackerCreator.create(instanceProperties, dynamoClient); + CompactionJobTracker store = CompactionJobTrackerFactory.getTracker(dynamoClient, instanceProperties); // Then - assertThat(dynamoDBClient.describeTable(updatesTableName)) + assertThat(dynamoClient.describeTable(updatesTableName)) .extracting(DescribeTableResult::getTable).isNotNull(); - assertThat(dynamoDBClient.describeTable(jobsTableName)) + assertThat(dynamoClient.describeTable(jobsTableName)) .extracting(DescribeTableResult::getTable).isNotNull(); assertThat(store).isInstanceOf(DynamoDBCompactionJobTracker.class); } @@ -56,13 +56,13 @@ public void shouldNotCreateStoreIfDisabled() { instanceProperties.set(COMPACTION_TRACKER_ENABLED, "false"); // When - DynamoDBCompactionJobTrackerCreator.create(instanceProperties, dynamoDBClient); - CompactionJobTracker store = CompactionJobTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + DynamoDBCompactionJobTrackerCreator.create(instanceProperties, dynamoClient); + CompactionJobTracker store = CompactionJobTrackerFactory.getTracker(dynamoClient, instanceProperties); // Then - assertThatThrownBy(() -> dynamoDBClient.describeTable(updatesTableName)) + assertThatThrownBy(() -> dynamoClient.describeTable(updatesTableName)) .isInstanceOf(ResourceNotFoundException.class); - assertThatThrownBy(() -> dynamoDBClient.describeTable(jobsTableName)) + assertThatThrownBy(() -> dynamoClient.describeTable(jobsTableName)) .isInstanceOf(ResourceNotFoundException.class); assertThat(store).isSameAs(CompactionJobTracker.NONE); assertThatThrownBy(() -> store.getAllJobs("some-table")) @@ -75,6 +75,6 @@ public void shouldNotCreateStoreIfDisabled() { @AfterEach public void tearDown() { - DynamoDBCompactionJobTrackerCreator.tearDown(instanceProperties, dynamoDBClient); + DynamoDBCompactionJobTrackerCreator.tearDown(instanceProperties, dynamoClient); } } diff --git a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/task/DynamoDBCompactionTaskTrackerCreatorIT.java b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/task/DynamoDBCompactionTaskTrackerCreatorIT.java index 7510847cf2..6ee3496e84 100644 --- a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/task/DynamoDBCompactionTaskTrackerCreatorIT.java +++ b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/task/DynamoDBCompactionTaskTrackerCreatorIT.java @@ -38,11 +38,11 @@ public class DynamoDBCompactionTaskTrackerCreatorIT extends DynamoDBTestBase { @Test public void shouldCreateStore() { // When - DynamoDBCompactionTaskTrackerCreator.create(instanceProperties, dynamoDBClient); - CompactionTaskTracker tracker = CompactionTaskTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + DynamoDBCompactionTaskTrackerCreator.create(instanceProperties, dynamoClient); + CompactionTaskTracker tracker = CompactionTaskTrackerFactory.getTracker(dynamoClient, instanceProperties); // Then - assertThat(dynamoDBClient.describeTable(tableName)) + assertThat(dynamoClient.describeTable(tableName)) .extracting(DescribeTableResult::getTable).isNotNull(); assertThat(tracker).isInstanceOf(DynamoDBCompactionTaskTracker.class); } @@ -53,11 +53,11 @@ public void shouldNotCreateStoreIfDisabled() { instanceProperties.set(COMPACTION_TRACKER_ENABLED, "false"); // When - DynamoDBCompactionTaskTrackerCreator.create(instanceProperties, dynamoDBClient); - CompactionTaskTracker tracker = CompactionTaskTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + DynamoDBCompactionTaskTrackerCreator.create(instanceProperties, dynamoClient); + CompactionTaskTracker tracker = CompactionTaskTrackerFactory.getTracker(dynamoClient, instanceProperties); // Then - assertThatThrownBy(() -> dynamoDBClient.describeTable(tableName)) + assertThatThrownBy(() -> dynamoClient.describeTable(tableName)) .isInstanceOf(ResourceNotFoundException.class); assertThat(tracker).isSameAs(CompactionTaskTracker.NONE); assertThatThrownBy(tracker::getAllTasks).isInstanceOf(UnsupportedOperationException.class); @@ -67,6 +67,6 @@ public void shouldNotCreateStoreIfDisabled() { @AfterEach public void tearDown() { - DynamoDBCompactionTaskTrackerCreator.tearDown(instanceProperties, dynamoDBClient); + DynamoDBCompactionTaskTrackerCreator.tearDown(instanceProperties, dynamoClient); } } diff --git a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionJobTrackerTestBase.java b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionJobTrackerTestBase.java index ca2df44579..ed0165512b 100644 --- a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionJobTrackerTestBase.java +++ b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionJobTrackerTestBase.java @@ -77,16 +77,16 @@ public class DynamoDBCompactionJobTrackerTestBase extends DynamoDBTestBase { protected final String tableId = tableProperties.get(TABLE_ID); protected final CompactionJobFactory jobFactory = new CompactionJobFactory(instanceProperties, tableProperties); - protected final CompactionJobTracker tracker = CompactionJobTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + protected final CompactionJobTracker tracker = CompactionJobTrackerFactory.getTracker(dynamoClient, instanceProperties); @BeforeEach public void setUp() { - DynamoDBCompactionJobTrackerCreator.create(instanceProperties, dynamoDBClient); + DynamoDBCompactionJobTrackerCreator.create(instanceProperties, dynamoClient); } @AfterEach public void tearDown() { - dynamoDBClient.deleteTable(jobStatusTableName); + dynamoClient.deleteTable(jobStatusTableName); } protected CompactionJobTracker trackerWithTimeToLiveAndUpdateTimes(Duration timeToLive, Instant... updateTimes) { @@ -99,7 +99,7 @@ protected CompactionJobTracker trackerWithUpdateTime(Instant updateTime) { } protected CompactionJobTracker trackerWithUpdateTimes(Instant... updateTimes) { - return new DynamoDBCompactionJobTracker(dynamoDBClient, instanceProperties, + return new DynamoDBCompactionJobTracker(dynamoClient, instanceProperties, true, Arrays.stream(updateTimes).iterator()::next); } diff --git a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionTaskTrackerTestBase.java b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionTaskTrackerTestBase.java index 3f4b1d3524..2e79e207f6 100644 --- a/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionTaskTrackerTestBase.java +++ b/java/compaction/compaction-tracker/src/test/java/sleeper/compaction/tracker/testutils/DynamoDBCompactionTaskTrackerTestBase.java @@ -46,21 +46,21 @@ public class DynamoDBCompactionTaskTrackerTestBase extends DynamoDBTestBase { .withIgnoredFields("expiryDate").build(); private final InstanceProperties instanceProperties = createTestInstanceProperties(); private final String taskStatusTableName = taskStatusTableName(instanceProperties.get(ID)); - protected final CompactionTaskTracker tracker = CompactionTaskTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + protected final CompactionTaskTracker tracker = CompactionTaskTrackerFactory.getTracker(dynamoClient, instanceProperties); @BeforeEach public void setUp() { - DynamoDBCompactionTaskTrackerCreator.create(instanceProperties, dynamoDBClient); + DynamoDBCompactionTaskTrackerCreator.create(instanceProperties, dynamoClient); } @AfterEach public void tearDown() { - dynamoDBClient.deleteTable(taskStatusTableName); + dynamoClient.deleteTable(taskStatusTableName); } protected CompactionTaskTracker trackerWithTimeToLiveAndUpdateTimes(Duration timeToLive, Instant... updateTimes) { instanceProperties.set(COMPACTION_TASK_STATUS_TTL_IN_SECONDS, "" + timeToLive.getSeconds()); - return new DynamoDBCompactionTaskTracker(dynamoDBClient, instanceProperties, + return new DynamoDBCompactionTaskTracker(dynamoClient, instanceProperties, Arrays.stream(updateTimes).iterator()::next); } diff --git a/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreCreatorIT.java b/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreCreatorIT.java index 3901fa3ca5..815c2007d7 100644 --- a/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreCreatorIT.java +++ b/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreCreatorIT.java @@ -33,10 +33,10 @@ public class DynamoDBIngestBatcherStoreCreatorIT extends DynamoDBTestBase { @Test public void shouldCreateStore() { // When - DynamoDBIngestBatcherStoreCreator.create(instanceProperties, dynamoDBClient); + DynamoDBIngestBatcherStoreCreator.create(instanceProperties, dynamoClient); // Then - assertThat(dynamoDBClient.describeTable(tableName)) + assertThat(dynamoClient.describeTable(tableName)) .extracting(DescribeTableResult::getTable).isNotNull(); } } diff --git a/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreIT.java b/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreIT.java index 84a6c89b51..6313dd390d 100644 --- a/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreIT.java +++ b/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreIT.java @@ -340,7 +340,7 @@ void shouldSetExpiryTime() { store.addFile(fileIngestRequest); // Then - assertThat(streamPagedItems(dynamoDBClient, new ScanRequest().withTableName(requestsTableName))) + assertThat(streamPagedItems(dynamoClient, new ScanRequest().withTableName(requestsTableName))) .extracting(item -> getLongAttribute(item, EXPIRY_TIME, 0L)) .containsExactly(expectedExpiryTime.getEpochSecond()); } @@ -359,7 +359,7 @@ void shouldSetExpiryTimeWhenAssigningJob() { store.assignJobGetAssigned("test-job", List.of(fileIngestRequest)); // Then - assertThat(streamPagedItems(dynamoDBClient, new ScanRequest().withTableName(requestsTableName))) + assertThat(streamPagedItems(dynamoClient, new ScanRequest().withTableName(requestsTableName))) .extracting(item -> getLongAttribute(item, EXPIRY_TIME, 0L)) .containsExactly(expectedExpiryTime.getEpochSecond()); } diff --git a/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreTestBase.java b/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreTestBase.java index 74269dd45b..35db86a77c 100644 --- a/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreTestBase.java +++ b/java/ingest/ingest-batcher-store/src/test/java/sleeper/ingest/batcher/store/DynamoDBIngestBatcherStoreTestBase.java @@ -43,14 +43,14 @@ public class DynamoDBIngestBatcherStoreTestBase extends DynamoDBTestBase { List.of(table1, table2)); protected final String requestsTableName = DynamoDBIngestBatcherStore.ingestRequestsTableName(instanceProperties.get(ID)); protected final IngestBatcherStore store = new DynamoDBIngestBatcherStore( - dynamoDBClient, instanceProperties, tablePropertiesProvider); + dynamoClient, instanceProperties, tablePropertiesProvider); @BeforeEach void setUp() { - DynamoDBIngestBatcherStoreCreator.create(instanceProperties, dynamoDBClient); + DynamoDBIngestBatcherStoreCreator.create(instanceProperties, dynamoClient); } protected IngestBatcherStore storeWithFilesInAssignJobBatch(int filesInAssignJobBatch) { - return new DynamoDBIngestBatcherStore(dynamoDBClient, instanceProperties, tablePropertiesProvider, filesInAssignJobBatch); + return new DynamoDBIngestBatcherStore(dynamoClient, instanceProperties, tablePropertiesProvider, filesInAssignJobBatch); } } diff --git a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/job/DynamoDBIngestJobTrackerCreatorIT.java b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/job/DynamoDBIngestJobTrackerCreatorIT.java index 01fb9dd564..886490c9e0 100644 --- a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/job/DynamoDBIngestJobTrackerCreatorIT.java +++ b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/job/DynamoDBIngestJobTrackerCreatorIT.java @@ -34,15 +34,15 @@ public class DynamoDBIngestJobTrackerCreatorIT extends DynamoDBTestBase { @Test public void shouldCreateStore() { // When - DynamoDBIngestJobTrackerCreator.create(instanceProperties, dynamoDBClient); + DynamoDBIngestJobTrackerCreator.create(instanceProperties, dynamoClient); // Then - assertThat(dynamoDBClient.describeTable(tableName)) + assertThat(dynamoClient.describeTable(tableName)) .extracting(DescribeTableResult::getTable).isNotNull(); } @AfterEach public void tearDown() { - DynamoDBIngestJobTrackerCreator.tearDown(instanceProperties, dynamoDBClient); + DynamoDBIngestJobTrackerCreator.tearDown(instanceProperties, dynamoClient); } } diff --git a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/task/DynamoDBIngestTaskTrackerCreatorIT.java b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/task/DynamoDBIngestTaskTrackerCreatorIT.java index 78754d3fad..92b76675d7 100644 --- a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/task/DynamoDBIngestTaskTrackerCreatorIT.java +++ b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/task/DynamoDBIngestTaskTrackerCreatorIT.java @@ -34,15 +34,15 @@ public class DynamoDBIngestTaskTrackerCreatorIT extends DynamoDBTestBase { @Test public void shouldCreateStore() { // When - DynamoDBIngestTaskTrackerCreator.create(instanceProperties, dynamoDBClient); + DynamoDBIngestTaskTrackerCreator.create(instanceProperties, dynamoClient); // Then - assertThat(dynamoDBClient.describeTable(tableName)) + assertThat(dynamoClient.describeTable(tableName)) .extracting(DescribeTableResult::getTable).isNotNull(); } @AfterEach public void tearDown() { - DynamoDBIngestTaskTrackerCreator.tearDown(instanceProperties, dynamoDBClient); + DynamoDBIngestTaskTrackerCreator.tearDown(instanceProperties, dynamoClient); } } diff --git a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestJobTrackerTestBase.java b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestJobTrackerTestBase.java index 8d2ce1a8c5..0677d4d919 100644 --- a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestJobTrackerTestBase.java +++ b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestJobTrackerTestBase.java @@ -85,16 +85,16 @@ public class DynamoDBIngestJobTrackerTestBase extends DynamoDBTestBase { protected final String tableName = tableProperties.get(TABLE_NAME); protected final TableStatus table = tableProperties.getStatus(); protected final String tableId = tableProperties.get(TABLE_ID); - protected final IngestJobTracker tracker = IngestJobTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + protected final IngestJobTracker tracker = IngestJobTrackerFactory.getTracker(dynamoClient, instanceProperties); @BeforeEach public void setUp() { - DynamoDBIngestJobTrackerCreator.create(instanceProperties, dynamoDBClient); + DynamoDBIngestJobTrackerCreator.create(instanceProperties, dynamoClient); } @AfterEach public void tearDown() { - dynamoDBClient.deleteTable(jobStatusTableName); + dynamoClient.deleteTable(jobStatusTableName); } protected IngestJobTracker trackerWithTimeToLiveAndUpdateTimes(Duration timeToLive, Instant... updateTimes) { @@ -103,7 +103,7 @@ protected IngestJobTracker trackerWithTimeToLiveAndUpdateTimes(Duration timeToLi } protected IngestJobTracker trackerWithUpdateTimes(Instant... updateTimes) { - return IngestJobTrackerFactory.getTracker(dynamoDBClient, instanceProperties, + return IngestJobTrackerFactory.getTracker(dynamoClient, instanceProperties, Arrays.stream(updateTimes).iterator()::next); } diff --git a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestTaskTrackerTestBase.java b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestTaskTrackerTestBase.java index 796ee00ee1..557ce2a9d0 100644 --- a/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestTaskTrackerTestBase.java +++ b/java/ingest/ingest-tracker/src/test/java/sleeper/ingest/tracker/testutils/DynamoDBIngestTaskTrackerTestBase.java @@ -50,21 +50,21 @@ public class DynamoDBIngestTaskTrackerTestBase extends DynamoDBTestBase { .build(); private final InstanceProperties instanceProperties = IngestTrackerTestUtils.createInstanceProperties(); private final String taskStatusTableName = taskStatusTableName(instanceProperties.get(ID)); - protected final IngestTaskTracker tracker = IngestTaskTrackerFactory.getTracker(dynamoDBClient, instanceProperties); + protected final IngestTaskTracker tracker = IngestTaskTrackerFactory.getTracker(dynamoClient, instanceProperties); @BeforeEach public void setUp() { - DynamoDBIngestTaskTrackerCreator.create(instanceProperties, dynamoDBClient); + DynamoDBIngestTaskTrackerCreator.create(instanceProperties, dynamoClient); } @AfterEach public void tearDown() { - dynamoDBClient.deleteTable(taskStatusTableName); + dynamoClient.deleteTable(taskStatusTableName); } protected IngestTaskTracker trackerWithTimeToLiveAndUpdateTimes(Duration timeToLive, Instant... updateTimes) { instanceProperties.set(INGEST_TASK_STATUS_TTL_IN_SECONDS, "" + timeToLive.getSeconds()); - return new DynamoDBIngestTaskTracker(dynamoDBClient, instanceProperties, + return new DynamoDBIngestTaskTracker(dynamoClient, instanceProperties, Arrays.stream(updateTimes).iterator()::next); } diff --git a/java/query/query-lambda/src/test/java/sleeper/query/lambda/QueryMessageHandlerIT.java b/java/query/query-lambda/src/test/java/sleeper/query/lambda/QueryMessageHandlerIT.java index 4cddf326f6..eac5d9f355 100644 --- a/java/query/query-lambda/src/test/java/sleeper/query/lambda/QueryMessageHandlerIT.java +++ b/java/query/query-lambda/src/test/java/sleeper/query/lambda/QueryMessageHandlerIT.java @@ -49,11 +49,11 @@ public class QueryMessageHandlerIT extends DynamoDBTestBase { private final InstanceProperties instanceProperties = createInstanceProperties(); - private final DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + private final DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); @BeforeEach void setUp() { - new DynamoDBQueryTrackerCreator(instanceProperties, dynamoDBClient).create(); + new DynamoDBQueryTrackerCreator(instanceProperties, dynamoClient).create(); } private final TableProperties tableProperties = createTable("table-1"); diff --git a/java/query/query-runner/src/test/java/sleeper/query/runner/tracker/DynamoDBQueryTrackerIT.java b/java/query/query-runner/src/test/java/sleeper/query/runner/tracker/DynamoDBQueryTrackerIT.java index f91c59ed6b..cc9a7ea7a3 100644 --- a/java/query/query-runner/src/test/java/sleeper/query/runner/tracker/DynamoDBQueryTrackerIT.java +++ b/java/query/query-runner/src/test/java/sleeper/query/runner/tracker/DynamoDBQueryTrackerIT.java @@ -55,13 +55,13 @@ public class DynamoDBQueryTrackerIT extends DynamoDBTestBase { @BeforeEach public void createDynamoTable() { - new DynamoDBQueryTrackerCreator(instanceProperties, dynamoDBClient).create(); + new DynamoDBQueryTrackerCreator(instanceProperties, dynamoClient).create(); } @Test public void shouldReturnNullWhenGettingItemThatDoesNotExist() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When / Then assertThat(queryTracker.getStatus("non-existent")).isNull(); @@ -70,7 +70,7 @@ public void shouldReturnNullWhenGettingItemThatDoesNotExist() throws QueryTracke @Test public void shouldReturnQueriesFromDynamoIfTheyExist() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryCompleted(createQueryWithId("my-id"), new ResultsOutputInfo(10, Collections.emptyList())); @@ -84,7 +84,7 @@ public void shouldReturnQueriesFromDynamoIfTheyExist() throws QueryTrackerExcept @Test public void shouldCreateEntryInTableIfIdDoesNotExist() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryInProgress(createQueryWithId("my-id")); @@ -97,7 +97,7 @@ public void shouldCreateEntryInTableIfIdDoesNotExist() throws QueryTrackerExcept public void shouldSetAgeOffTimeAccordingToInstanceProperty() throws QueryTrackerException { // Given instanceProperties.setNumber(QUERY_TRACKER_ITEM_TTL_IN_DAYS, 3); - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryInProgress(createQueryWithId("my-id")); @@ -110,7 +110,7 @@ public void shouldSetAgeOffTimeAccordingToInstanceProperty() throws QueryTracker @Test public void shouldUpdateStateInTableIfIdDoesExist() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryQueued(createQueryWithId("my-id")); @@ -123,7 +123,7 @@ public void shouldUpdateStateInTableIfIdDoesExist() throws QueryTrackerException @Test public void shouldUpdateParentStateInTableWhenTheChildIsTheLastOneToComplete() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryInProgress(createQueryWithId("parent")); @@ -141,7 +141,7 @@ public void shouldUpdateParentStateInTableWhenTheChildIsTheLastOneToComplete() t @Test public void shouldNotUpdateParentStateInTableWhenMoreChildrenAreYetToComplete() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryInProgress(createQueryWithId("parent")); @@ -157,7 +157,7 @@ public void shouldNotUpdateParentStateInTableWhenMoreChildrenAreYetToComplete() @Test public void shouldUpdateParentStateToFailedInTableWhenAllChildrenFail() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryInProgress(createQueryWithId("parent")); @@ -173,7 +173,7 @@ public void shouldUpdateParentStateToFailedInTableWhenAllChildrenFail() throws Q @Test public void shouldUpdateParentStateToPartiallyFailedInTableWhenSomeChildrenFail() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryInProgress(createQueryWithId("parent")); @@ -189,7 +189,7 @@ public void shouldUpdateParentStateToPartiallyFailedInTableWhenSomeChildrenFail( @Test public void shouldUpdateParentStateWithTotalRecordsReturnedByAllChildren() throws QueryTrackerException { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryInProgress(createQueryWithId("parent")); @@ -208,7 +208,7 @@ public void shouldUpdateParentStateWithTotalRecordsReturnedByAllChildren() throw @Test void shouldStoreErrorMessageWhenQueryFailed() { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryFailed(createQueryWithId("failed-query"), new Exception("Query has failed")); @@ -225,7 +225,7 @@ void shouldStoreErrorMessageWhenQueryFailed() { @Test void shouldStoreErrorMessageWhenQueryCompletedWithError() { // Given - DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + DynamoDBQueryTracker queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); // When queryTracker.queryCompleted(createQueryWithId("completed-query-that-errored"), @@ -253,7 +253,7 @@ class GetTrackedQueries { @BeforeEach void setUp() { - queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoDBClient); + queryTracker = new DynamoDBQueryTracker(instanceProperties, dynamoClient); queryTracker.queryQueued(query1); queryTracker.queryInProgress(query2); queryTracker.queryCompleted(query3, new ResultsOutputInfo(456L, List.of())); diff --git a/java/statestore/src/test/java/sleeper/statestore/transactionlog/snapshots/DynamoDBTransactionLogSnapshotMetadataStoreIT.java b/java/statestore/src/test/java/sleeper/statestore/transactionlog/snapshots/DynamoDBTransactionLogSnapshotMetadataStoreIT.java index cb42e2dc2b..ebf2a9b10e 100644 --- a/java/statestore/src/test/java/sleeper/statestore/transactionlog/snapshots/DynamoDBTransactionLogSnapshotMetadataStoreIT.java +++ b/java/statestore/src/test/java/sleeper/statestore/transactionlog/snapshots/DynamoDBTransactionLogSnapshotMetadataStoreIT.java @@ -47,7 +47,7 @@ public class DynamoDBTransactionLogSnapshotMetadataStoreIT extends DynamoDBTestB @BeforeEach void setup() { - new DynamoDBTransactionLogSnapshotMetadataStoreCreator(instanceProperties, dynamoDBClient).create(); + new DynamoDBTransactionLogSnapshotMetadataStoreCreator(instanceProperties, dynamoClient).create(); } @Nested @@ -385,7 +385,7 @@ private DynamoDBTransactionLogSnapshotMetadataStore snapshotStore(TablePropertie } private DynamoDBTransactionLogSnapshotMetadataStore snapshotStore(TableProperties tableProperties, Supplier timeSupplier) { - return new DynamoDBTransactionLogSnapshotMetadataStore(instanceProperties, tableProperties, dynamoDBClient, timeSupplier); + return new DynamoDBTransactionLogSnapshotMetadataStore(instanceProperties, tableProperties, dynamoClient, timeSupplier); } private TransactionLogSnapshotMetadata filesSnapshot(long transactionNumber) { From 2216ef5eaebd8918e9aa9bbe507bc7f7aaf6f1b2 Mon Sep 17 00:00:00 2001 From: patchwork01 <110390516+patchwork01@users.noreply.github.com> Date: Thu, 20 Feb 2025 13:19:00 +0000 Subject: [PATCH 2/2] Remove unused dependency --- java/common/dynamodb-test/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java/common/dynamodb-test/pom.xml b/java/common/dynamodb-test/pom.xml index a357c45227..592d64b1cd 100644 --- a/java/common/dynamodb-test/pom.xml +++ b/java/common/dynamodb-test/pom.xml @@ -42,10 +42,6 @@ org.testcontainers testcontainers - - org.testcontainers - junit-jupiter - com.github.tomakehurst wiremock-jre8