diff --git a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/CoordinatorStateConfigBean.java b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/CoordinatorStateTableConfigBean.java similarity index 97% rename from amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/CoordinatorStateConfigBean.java rename to amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/CoordinatorStateTableConfigBean.java index eaf93f49..bb315706 100644 --- a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/CoordinatorStateConfigBean.java +++ b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/CoordinatorStateTableConfigBean.java @@ -22,7 +22,7 @@ import software.amazon.kinesis.coordinator.CoordinatorConfig.CoordinatorStateTab @Getter @Setter -public class CoordinatorStateConfigBean { +public class CoordinatorStateTableConfigBean { interface CoordinatorStateConfigBeanDelegate { String getCoordinatorStateTableName(); diff --git a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfiguration.java b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfiguration.java index 5c7a11b2..7eec3fde 100644 --- a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfiguration.java +++ b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfiguration.java @@ -203,11 +203,13 @@ public class MultiLangDaemonConfiguration { private final WorkerUtilizationAwareAssignmentConfigBean workerUtilizationAwareAssignmentConfigBean = new WorkerUtilizationAwareAssignmentConfigBean(); - @Delegate(types = WorkerMetricsTableConfigBean.WorkerMetricsTableConfigBeanDelegate.class) - private final WorkerMetricsTableConfigBean workerMetricsTableConfigBean = new WorkerMetricsTableConfigBean(); + @Delegate(types = WorkerMetricStatsTableConfigBean.WorkerMetricsTableConfigBeanDelegate.class) + private final WorkerMetricStatsTableConfigBean workerMetricStatsTableConfigBean = + new WorkerMetricStatsTableConfigBean(); - @Delegate(types = CoordinatorStateConfigBean.CoordinatorStateConfigBeanDelegate.class) - private final CoordinatorStateConfigBean coordinatorStateConfigBean = new CoordinatorStateConfigBean(); + @Delegate(types = CoordinatorStateTableConfigBean.CoordinatorStateConfigBeanDelegate.class) + private final CoordinatorStateTableConfigBean coordinatorStateTableConfigBean = + new CoordinatorStateTableConfigBean(); private boolean validateSequenceNumberBeforeCheckpointing; @@ -413,7 +415,7 @@ public class MultiLangDaemonConfiguration { private void handleCoordinatorConfig(CoordinatorConfig coordinatorConfig) { ConfigurationSettableUtils.resolveFields( - this.coordinatorStateConfigBean, coordinatorConfig.coordinatorStateConfig()); + this.coordinatorStateTableConfigBean, coordinatorConfig.coordinatorStateTableConfig()); } private void handleLeaseManagementConfig(LeaseManagementConfig leaseManagementConfig) { @@ -423,7 +425,7 @@ public class MultiLangDaemonConfiguration { this.workerUtilizationAwareAssignmentConfigBean, leaseManagementConfig.workerUtilizationAwareAssignmentConfig()); ConfigurationSettableUtils.resolveFields( - this.workerMetricsTableConfigBean, + this.workerMetricStatsTableConfigBean, leaseManagementConfig.workerUtilizationAwareAssignmentConfig().workerMetricsTableConfig()); } diff --git a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/WorkerMetricsTableConfigBean.java b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/WorkerMetricStatsTableConfigBean.java similarity index 97% rename from amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/WorkerMetricsTableConfigBean.java rename to amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/WorkerMetricStatsTableConfigBean.java index 5cb9a6ec..0828c9c6 100644 --- a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/WorkerMetricsTableConfigBean.java +++ b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/WorkerMetricStatsTableConfigBean.java @@ -22,7 +22,7 @@ import software.amazon.kinesis.leases.LeaseManagementConfig.WorkerMetricsTableCo @Getter @Setter -public class WorkerMetricsTableConfigBean { +public class WorkerMetricStatsTableConfigBean { interface WorkerMetricsTableConfigBeanDelegate { String getWorkerMetricsTableName(); diff --git a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfigurationTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfigurationTest.java index c451ef81..60a55c65 100644 --- a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfigurationTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/MultiLangDaemonConfigurationTest.java @@ -288,7 +288,7 @@ public class MultiLangDaemonConfigurationTest { configuration.resolvedConfiguration(shardRecordProcessorFactory); CoordinatorConfig coordinatorConfig = resolvedConfiguration.getCoordinatorConfig(); CoordinatorConfig.CoordinatorStateTableConfig coordinatorStateConfig = - coordinatorConfig.coordinatorStateConfig(); + coordinatorConfig.coordinatorStateTableConfig(); assertEquals(coordinatorStateConfig.tableName(), "testTable"); assertEquals(coordinatorStateConfig.billingMode(), testWorkerMetricsTableBillingMode); assertEquals(coordinatorStateConfig.readCapacity(), 123); @@ -298,7 +298,7 @@ public class MultiLangDaemonConfigurationTest { @Test public void testCoordinatorStateTableConfigUsesDefaults() { final CoordinatorConfig.CoordinatorStateTableConfig defaultCoordinatorStateTableConfig = - getTestConfigsBuilder().coordinatorConfig().coordinatorStateConfig(); + getTestConfigsBuilder().coordinatorConfig().coordinatorStateTableConfig(); final MultiLangDaemonConfiguration configuration = baseConfiguration(); configuration.setCoordinatorStateWriteCapacity(defaultCoordinatorStateTableConfig.writeCapacity() + 12345); @@ -307,7 +307,7 @@ public class MultiLangDaemonConfigurationTest { configuration.resolvedConfiguration(shardRecordProcessorFactory); final CoordinatorConfig.CoordinatorStateTableConfig resolvedCoordinatorStateTableConfig = - resolvedConfiguration.coordinatorConfig.coordinatorStateConfig(); + resolvedConfiguration.coordinatorConfig.coordinatorStateTableConfig(); assertNotEquals(defaultCoordinatorStateTableConfig, resolvedCoordinatorStateTableConfig); diff --git a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/PropertiesMappingE2ETest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/PropertiesMappingE2ETest.java index cf52a5ff..53920bf7 100644 --- a/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/PropertiesMappingE2ETest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/config/PropertiesMappingE2ETest.java @@ -32,13 +32,15 @@ public class PropertiesMappingE2ETest { assertEquals( "MultiLangTest-CoordinatorState-CustomName", - kclV3Config.coordinatorConfig.coordinatorStateConfig().tableName()); + kclV3Config.coordinatorConfig.coordinatorStateTableConfig().tableName()); assertEquals( BillingMode.PROVISIONED, - kclV3Config.coordinatorConfig.coordinatorStateConfig().billingMode()); + kclV3Config.coordinatorConfig.coordinatorStateTableConfig().billingMode()); assertEquals( - 1000, kclV3Config.coordinatorConfig.coordinatorStateConfig().readCapacity()); - assertEquals(500, kclV3Config.coordinatorConfig.coordinatorStateConfig().writeCapacity()); + 1000, + kclV3Config.coordinatorConfig.coordinatorStateTableConfig().readCapacity()); + assertEquals( + 500, kclV3Config.coordinatorConfig.coordinatorStateTableConfig().writeCapacity()); assertEquals( 10000L, @@ -150,10 +152,10 @@ public class PropertiesMappingE2ETest { assertEquals( "MultiLangTest-CoordinatorState", - kclV3Config.coordinatorConfig.coordinatorStateConfig().tableName()); + kclV3Config.coordinatorConfig.coordinatorStateTableConfig().tableName()); assertEquals( BillingMode.PAY_PER_REQUEST, - kclV3Config.coordinatorConfig.coordinatorStateConfig().billingMode()); + kclV3Config.coordinatorConfig.coordinatorStateTableConfig().billingMode()); assertEquals( 30_000L, diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/CoordinatorConfig.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/CoordinatorConfig.java index d646aab9..16346259 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/CoordinatorConfig.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/CoordinatorConfig.java @@ -33,7 +33,7 @@ public class CoordinatorConfig { public CoordinatorConfig(final String applicationName) { this.applicationName = applicationName; - this.coordinatorStateConfig = new CoordinatorStateTableConfig(applicationName); + this.coordinatorStateTableConfig = new CoordinatorStateTableConfig(applicationName); } /** @@ -153,5 +153,5 @@ public class CoordinatorConfig { * On-Demand. */ @NonNull - private final CoordinatorStateTableConfig coordinatorStateConfig; + private final CoordinatorStateTableConfig coordinatorStateTableConfig; } diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java index d54b81fd..1a9dfe87 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java @@ -295,7 +295,7 @@ public class Scheduler implements Runnable { this.leaseRefresher = this.leaseCoordinator.leaseRefresher(); final CoordinatorStateDAO coordinatorStateDAO = new CoordinatorStateDAO( - leaseManagementConfig.dynamoDBClient(), coordinatorConfig().coordinatorStateConfig()); + leaseManagementConfig.dynamoDBClient(), coordinatorConfig().coordinatorStateTableConfig()); this.leaseAssignmentModeProvider = new MigrationAdaptiveLeaseAssignmentModeProvider(); this.migrationComponentsInitializer = createDynamicMigrationComponentsInitializer(coordinatorStateDAO); this.migrationStateMachine = new MigrationStateMachineImpl( diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/CoordinatorStateDAOTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/CoordinatorStateDAOTest.java index 2ec51318..3232209f 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/CoordinatorStateDAOTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/CoordinatorStateDAOTest.java @@ -96,10 +96,10 @@ public class CoordinatorStateDAOTest { throws ExecutionException, InterruptedException, DependencyException { /* Test setup - create class under test **/ final CoordinatorConfig c = new CoordinatorConfig("testPayPerUseTableCreation"); - c.coordinatorStateConfig().billingMode(BillingMode.PAY_PER_REQUEST); + c.coordinatorStateTableConfig().billingMode(BillingMode.PAY_PER_REQUEST); final CoordinatorStateDAO doaUnderTest = - new CoordinatorStateDAO(dynamoDbAsyncClient, c.coordinatorStateConfig()); + new CoordinatorStateDAO(dynamoDbAsyncClient, c.coordinatorStateTableConfig()); /* Test step - initialize to create the table **/ doaUnderTest.initialize(); @@ -456,19 +456,19 @@ public class CoordinatorStateDAOTest { final ProvisionedThroughput throughput, final String tableName) { final CoordinatorConfig c = new CoordinatorConfig(applicationName); - c.coordinatorStateConfig().billingMode(mode); + c.coordinatorStateTableConfig().billingMode(mode); if (tableName != null) { - c.coordinatorStateConfig().tableName(tableName); + c.coordinatorStateTableConfig().tableName(tableName); } if (mode == BillingMode.PROVISIONED) { - c.coordinatorStateConfig() + c.coordinatorStateTableConfig() .writeCapacity(throughput.writeCapacityUnits()) .readCapacity(throughput.readCapacityUnits()); } - tableNameForTest = c.coordinatorStateConfig().tableName(); + tableNameForTest = c.coordinatorStateTableConfig().tableName(); - return c.coordinatorStateConfig(); + return c.coordinatorStateTableConfig(); } private void createCoordinatorState(final String keyValue) { diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/leader/DynamoDBLockBasedLeaderDeciderTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/leader/DynamoDBLockBasedLeaderDeciderTest.java index 96a7027d..cc000217 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/leader/DynamoDBLockBasedLeaderDeciderTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/leader/DynamoDBLockBasedLeaderDeciderTest.java @@ -41,8 +41,8 @@ class DynamoDBLockBasedLeaderDeciderTest { @BeforeEach void setup() throws DependencyException { final CoordinatorConfig c = new CoordinatorConfig("TestApplication"); - c.coordinatorStateConfig().tableName(TEST_LOCK_TABLE_NAME); - final CoordinatorStateDAO dao = new CoordinatorStateDAO(dynamoDBAsyncClient, c.coordinatorStateConfig()); + c.coordinatorStateTableConfig().tableName(TEST_LOCK_TABLE_NAME); + final CoordinatorStateDAO dao = new CoordinatorStateDAO(dynamoDBAsyncClient, c.coordinatorStateTableConfig()); dao.initialize(); IntStream.range(0, 10).sequential().forEach(index -> { final String workerId = getWorkerId(index);