From a7363145f256419e12eca19ca952f26485d5d3ad Mon Sep 17 00:00:00 2001 From: "Pfifer, Justin" Date: Wed, 14 Mar 2018 14:14:40 -0700 Subject: [PATCH] Moved most of the remaining classes. Still have some more to migrate, but is enough to start progress on other steps. --- .../kinesis/multilang/MultiLangDaemon.java | 4 +-- .../multilang/MultiLangDaemonConfig.java | 2 +- .../kinesis/multilang/MultiLangProtocol.java | 2 +- .../multilang/MultiLangRecordProcessor.java | 2 +- .../MultiLangRecordProcessorFactory.java | 2 +- .../config/KinesisClientLibConfigurator.java | 2 +- .../multilang/MultiLangDaemonConfigTest.java | 2 +- .../multilang/MultiLangDaemonTest.java | 2 +- .../multilang/MultiLangProtocolTest.java | 2 +- .../StreamingRecordProcessorFactoryTest.java | 2 +- .../StreamingRecordProcessorTest.java | 2 +- .../KinesisClientLibConfiguratorTest.java | 2 +- .../worker/NoOpWorkerStateChangeListener.java | 16 ---------- .../lib/worker/WorkerStateChangeListener.java | 16 ---------- .../amazon/kinesis/checkpoint/Checkpoint.java | 2 +- .../coordinator}/GracefulShutdownContext.java | 2 +- .../GracefulShutdownCoordinator.java | 2 +- .../KinesisClientLibConfiguration.java | 4 ++- .../NoOpWorkerStateChangeListener.java | 30 +++++++++++++++++++ .../RecordProcessorCheckpointer.java | 2 +- .../kinesis/coordinator}/StreamConfig.java | 21 ++++++------- .../amazon/kinesis/coordinator}/Worker.java | 5 +++- .../WorkerStateChangeListener.java | 30 +++++++++++++++++++ .../kinesis/leases/LeaseCoordinator.java | 2 +- .../kinesis/lifecycle/InitializeTask.java | 4 +-- .../amazon/kinesis/lifecycle/ProcessTask.java | 6 ++-- .../kinesis/lifecycle/ShardConsumer.java | 7 ++--- .../ShardConsumerShutdownNotification.java | 8 ++--- .../lifecycle}/ShutdownNotification.java | 2 +- .../lifecycle/ShutdownNotificationTask.java | 1 - .../kinesis/lifecycle/ShutdownTask.java | 2 +- .../kinesis/retrieval/KinesisProxy.java | 2 +- .../retrieval/KinesisProxyFactory.java | 2 +- .../retrieval}/ThrottlingReporter.java | 2 +- .../proxies/KinesisProxyTest.java | 2 +- .../RecordProcessorCheckpointerTest.java | 22 +++++++------- .../GracefulShutdownCoordinatorTest.java | 5 +++- .../KinesisClientLibConfigurationTest.java | 5 +++- .../kinesis/coordinator}/WorkerTest.java | 18 ++++++----- .../kinesis/lifecycle/ConsumerStatesTest.java | 7 ++--- .../kinesis/lifecycle/ProcessTaskTest.java | 8 ++--- .../kinesis/lifecycle/ShardConsumerTest.java | 9 +++--- .../kinesis/lifecycle/ShutdownTaskTest.java | 4 +-- .../retrieval}/ThrottlingReporterTest.java | 3 +- .../amazon/kinesis/utils}/TestStreamlet.java | 24 +++++++-------- .../kinesis/utils}/TestStreamletFactory.java | 28 ++++++++--------- 46 files changed, 185 insertions(+), 144 deletions(-) delete mode 100644 amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/NoOpWorkerStateChangeListener.java delete mode 100644 amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerStateChangeListener.java rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/GracefulShutdownContext.java (94%) rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/GracefulShutdownCoordinator.java (99%) rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/KinesisClientLibConfiguration.java (99%) create mode 100644 amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/NoOpWorkerStateChangeListener.java rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/RecordProcessorCheckpointer.java (99%) rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/StreamConfig.java (80%) rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/Worker.java (99%) create mode 100644 amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/WorkerStateChangeListener.java rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/lifecycle}/ShardConsumerShutdownNotification.java (88%) rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/lifecycle}/ShutdownNotification.java (94%) rename amazon-kinesis-client/src/main/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/retrieval}/ThrottlingReporter.java (95%) rename amazon-kinesis-client/src/test/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/GracefulShutdownCoordinatorTest.java (98%) rename amazon-kinesis-client/src/test/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/KinesisClientLibConfigurationTest.java (98%) rename amazon-kinesis-client/src/test/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/coordinator}/WorkerTest.java (99%) rename amazon-kinesis-client/src/test/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/retrieval}/ThrottlingReporterTest.java (95%) rename amazon-kinesis-client/src/test/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/utils}/TestStreamlet.java (88%) rename amazon-kinesis-client/src/test/java/{com/amazonaws/services/kinesis/clientlibrary/lib/worker => software/amazon/kinesis/utils}/TestStreamletFactory.java (57%) diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemon.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemon.java index e75cdc47..d7591f24 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemon.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemon.java @@ -24,8 +24,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import software.amazon.kinesis.processor.v2.IRecordProcessorFactory; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.Worker; import lombok.extern.slf4j.Slf4j; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfig.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfig.java index b6a98558..da78d1c8 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfig.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfig.java @@ -19,7 +19,7 @@ import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import com.amazonaws.services.kinesis.multilang.config.KinesisClientLibConfigurator; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocol.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocol.java index 42867c79..e80f9a2c 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocol.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocol.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeoutException; import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; import software.amazon.kinesis.processor.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import software.amazon.kinesis.lifecycle.ShutdownReason; import software.amazon.kinesis.lifecycle.InitializationInput; import software.amazon.kinesis.lifecycle.ProcessRecordsInput; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessor.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessor.java index d8d13fdd..22717017 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessor.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessor.java @@ -23,7 +23,7 @@ import java.util.concurrent.Future; import software.amazon.kinesis.processor.IRecordProcessorCheckpointer; import software.amazon.kinesis.processor.v2.IRecordProcessor; import software.amazon.kinesis.processor.v2.IShutdownNotificationAware; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import software.amazon.kinesis.lifecycle.InitializationInput; import software.amazon.kinesis.lifecycle.ProcessRecordsInput; import software.amazon.kinesis.lifecycle.ShutdownInput; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessorFactory.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessorFactory.java index 8bc258a7..ec6c5b62 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessorFactory.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessorFactory.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutorService; import software.amazon.kinesis.processor.v2.IRecordProcessor; import software.amazon.kinesis.processor.v2.IRecordProcessorFactory; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfigurator.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfigurator.java index 20cf56d0..af213f9e 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfigurator.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfigurator.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.UUID; import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import lombok.extern.slf4j.Slf4j; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfigTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfigTest.java index 8b4429ef..b33517bb 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfigTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfigTest.java @@ -28,7 +28,7 @@ import org.mockito.Mockito; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.kinesis.multilang.config.KinesisClientLibConfigurator; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; public class MultiLangDaemonConfigTest { diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonTest.java index 7ae6e5e7..d4f0c0fc 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonTest.java @@ -22,7 +22,7 @@ import org.mockito.Mockito; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; public class MultiLangDaemonTest { diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java index fb6ce3af..5435b0af 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java @@ -19,7 +19,7 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibD import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; import software.amazon.kinesis.processor.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import software.amazon.kinesis.lifecycle.ShutdownReason; import software.amazon.kinesis.lifecycle.InitializationInput; import software.amazon.kinesis.lifecycle.ProcessRecordsInput; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java index 36a456be..b565c4e7 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java @@ -14,7 +14,7 @@ */ package com.amazonaws.services.kinesis.multilang; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import org.junit.Assert; import org.junit.Test; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java index 57031e1b..305719bb 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java @@ -20,7 +20,7 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; import software.amazon.kinesis.processor.IPreparedCheckpointer; import software.amazon.kinesis.processor.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import software.amazon.kinesis.lifecycle.ShutdownReason; import software.amazon.kinesis.lifecycle.InitializationInput; import software.amazon.kinesis.lifecycle.ProcessRecordsInput; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java index cd130139..8706d16f 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java @@ -31,7 +31,7 @@ import org.junit.Test; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import software.amazon.kinesis.metrics.MetricsLevel; import com.google.common.collect.ImmutableSet; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/NoOpWorkerStateChangeListener.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/NoOpWorkerStateChangeListener.java deleted file mode 100644 index 152a43af..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/NoOpWorkerStateChangeListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -public class NoOpWorkerStateChangeListener implements WorkerStateChangeListener { - - /** - * Empty constructor for NoOp Worker State Change Listener - */ - public NoOpWorkerStateChangeListener() { - - } - - @Override - public void onWorkerStateChange(WorkerState newState) { - - } -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerStateChangeListener.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerStateChangeListener.java deleted file mode 100644 index 36ee39f0..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerStateChangeListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -/** - * A listener for callbacks on changes worker state - */ -@FunctionalInterface -public interface WorkerStateChangeListener { - enum WorkerState { - CREATED, - INITIALIZING, - STARTED, - SHUT_DOWN - } - - void onWorkerStateChange(WorkerState newState); -} diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/checkpoint/Checkpoint.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/checkpoint/Checkpoint.java index 363db9a0..80feeb5f 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/checkpoint/Checkpoint.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/checkpoint/Checkpoint.java @@ -17,7 +17,7 @@ package software.amazon.kinesis.checkpoint; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import com.amazonaws.services.kinesis.model.InvalidArgumentException; import com.amazonaws.services.kinesis.model.ProvisionedThroughputExceededException; import com.amazonaws.services.kinesis.model.ShardIteratorType; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownContext.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/GracefulShutdownContext.java similarity index 94% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownContext.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/GracefulShutdownContext.java index 22a4d92b..eaba9f6b 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownContext.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/GracefulShutdownContext.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import lombok.Data; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinator.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/GracefulShutdownCoordinator.java similarity index 99% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinator.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/GracefulShutdownCoordinator.java index d61e2910..b587aa4e 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinator.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/GracefulShutdownCoordinator.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import java.util.concurrent.Callable; import java.util.concurrent.Future; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/KinesisClientLibConfiguration.java similarity index 99% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/KinesisClientLibConfiguration.java index afa85119..24963341 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/KinesisClientLibConfiguration.java @@ -12,12 +12,14 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import java.util.Date; import java.util.Optional; import java.util.Set; +import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; import org.apache.commons.lang.Validate; import com.amazonaws.ClientConfiguration; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/NoOpWorkerStateChangeListener.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/NoOpWorkerStateChangeListener.java new file mode 100644 index 00000000..f316b351 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/NoOpWorkerStateChangeListener.java @@ -0,0 +1,30 @@ +/* + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/asl/ + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package software.amazon.kinesis.coordinator; + +public class NoOpWorkerStateChangeListener implements WorkerStateChangeListener { + + /** + * Empty constructor for NoOp Worker State Change Listener + */ + public NoOpWorkerStateChangeListener() { + + } + + @Override + public void onWorkerStateChange(WorkerState newState) { + + } +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointer.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/RecordProcessorCheckpointer.java similarity index 99% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointer.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/RecordProcessorCheckpointer.java index 1dc5f869..68ace2ad 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointer.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/RecordProcessorCheckpointer.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/StreamConfig.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/StreamConfig.java similarity index 80% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/StreamConfig.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/StreamConfig.java index 615d7dc9..81b2aa1a 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/StreamConfig.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/StreamConfig.java @@ -1,19 +1,20 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; +import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; import software.amazon.kinesis.retrieval.IKinesisProxy; /** diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Worker.java similarity index 99% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Worker.java index 4b6ac7d6..8c147fcd 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Worker.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import java.util.Collection; import java.util.HashSet; @@ -40,6 +40,7 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; import com.amazonaws.services.kinesis.AmazonKinesis; import com.amazonaws.services.kinesis.AmazonKinesisClient; +import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; import software.amazon.kinesis.leases.KinesisClientLibLeaseCoordinator; import software.amazon.kinesis.leases.ParentsFirstShardPrioritization; import software.amazon.kinesis.leases.ShardInfo; @@ -47,6 +48,8 @@ import software.amazon.kinesis.leases.ShardPrioritization; import software.amazon.kinesis.leases.ShardSyncTask; import software.amazon.kinesis.leases.ShardSyncTaskManager; import software.amazon.kinesis.lifecycle.ShardConsumer; +import software.amazon.kinesis.lifecycle.ShardConsumerShutdownNotification; +import software.amazon.kinesis.lifecycle.ShutdownNotification; import software.amazon.kinesis.lifecycle.ShutdownReason; import software.amazon.kinesis.lifecycle.TaskResult; import software.amazon.kinesis.metrics.MetricsCollectingTaskDecorator; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/WorkerStateChangeListener.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/WorkerStateChangeListener.java new file mode 100644 index 00000000..0137de30 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/WorkerStateChangeListener.java @@ -0,0 +1,30 @@ +/* + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/asl/ + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package software.amazon.kinesis.coordinator; + +/** + * A listener for callbacks on changes worker state + */ +@FunctionalInterface +public interface WorkerStateChangeListener { + enum WorkerState { + CREATED, + INITIALIZING, + STARTED, + SHUT_DOWN + } + + void onWorkerStateChange(WorkerState newState); +} diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCoordinator.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCoordinator.java index e38a6fcb..b6b7533b 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCoordinator.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCoordinator.java @@ -26,7 +26,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import software.amazon.kinesis.leases.exceptions.DependencyException; import software.amazon.kinesis.leases.exceptions.InvalidStateException; import software.amazon.kinesis.leases.exceptions.LeasingException; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/InitializeTask.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/InitializeTask.java index 09dcc3d3..31367f13 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/InitializeTask.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/InitializeTask.java @@ -14,9 +14,9 @@ */ package software.amazon.kinesis.lifecycle; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.StreamConfig; +import software.amazon.kinesis.coordinator.StreamConfig; import software.amazon.kinesis.processor.ICheckpoint; import software.amazon.kinesis.processor.v2.IRecordProcessor; import software.amazon.kinesis.checkpoint.Checkpoint; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ProcessTask.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ProcessTask.java index 5e3a7b39..5bd917e8 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ProcessTask.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ProcessTask.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.ListIterator; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.StreamConfig; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ThrottlingReporter; +import software.amazon.kinesis.coordinator.StreamConfig; +import software.amazon.kinesis.retrieval.ThrottlingReporter; import software.amazon.kinesis.processor.v2.IRecordProcessor; import software.amazon.kinesis.retrieval.GetRecordsCache; import software.amazon.kinesis.retrieval.IKinesisProxy; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShardConsumer.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShardConsumer.java index ee923dfe..1352f2b6 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShardConsumer.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShardConsumer.java @@ -21,13 +21,12 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.BlockedOnParentShardException; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import software.amazon.kinesis.checkpoint.Checkpoint; import software.amazon.kinesis.metrics.MetricsCollectingTaskDecorator; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownNotification; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.StreamConfig; +import software.amazon.kinesis.coordinator.StreamConfig; import software.amazon.kinesis.processor.ICheckpoint; import software.amazon.kinesis.processor.v2.IRecordProcessor; import software.amazon.kinesis.leases.KinesisClientLease; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerShutdownNotification.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShardConsumerShutdownNotification.java similarity index 88% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerShutdownNotification.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShardConsumerShutdownNotification.java index 59c80400..dd18d291 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerShutdownNotification.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShardConsumerShutdownNotification.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.lifecycle; import java.util.concurrent.CountDownLatch; @@ -24,7 +24,7 @@ import software.amazon.kinesis.leases.LeaseCoordinator; * Contains callbacks for completion of stages in a requested record processor shutdown. * */ -class ShardConsumerShutdownNotification implements ShutdownNotification { +public class ShardConsumerShutdownNotification implements ShutdownNotification { private final LeaseCoordinator leaseCoordinator; private final KinesisClientLease lease; @@ -48,8 +48,8 @@ class ShardConsumerShutdownNotification implements ShutdownNotification { * @param shutdownCompleteLatch * used to inform the caller once the record processor is fully shutdown */ - ShardConsumerShutdownNotification(LeaseCoordinator leaseCoordinator, KinesisClientLease lease, - CountDownLatch notificationCompleteLatch, CountDownLatch shutdownCompleteLatch) { + public ShardConsumerShutdownNotification(LeaseCoordinator leaseCoordinator, KinesisClientLease lease, + CountDownLatch notificationCompleteLatch, CountDownLatch shutdownCompleteLatch) { this.leaseCoordinator = leaseCoordinator; this.lease = lease; this.notificationCompleteLatch = notificationCompleteLatch; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownNotification.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownNotification.java similarity index 94% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownNotification.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownNotification.java index 43a6b08e..4f2b9263 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownNotification.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownNotification.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.lifecycle; import software.amazon.kinesis.lifecycle.ShutdownInput; import software.amazon.kinesis.processor.v2.IRecordProcessor; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownNotificationTask.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownNotificationTask.java index 34c1171f..480fcbb4 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownNotificationTask.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownNotificationTask.java @@ -15,7 +15,6 @@ package software.amazon.kinesis.lifecycle; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownNotification; import software.amazon.kinesis.processor.IRecordProcessorCheckpointer; import software.amazon.kinesis.processor.v2.IRecordProcessor; import software.amazon.kinesis.processor.v2.IShutdownNotificationAware; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownTask.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownTask.java index 81002552..04026de2 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownTask.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownTask.java @@ -15,7 +15,7 @@ package software.amazon.kinesis.lifecycle; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; import software.amazon.kinesis.leases.ShardSyncer; import software.amazon.kinesis.processor.v2.IRecordProcessor; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxy.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxy.java index d8111a17..6afaae03 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxy.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxy.java @@ -28,7 +28,7 @@ import org.apache.commons.lang.StringUtils; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.kinesis.AmazonKinesis; import com.amazonaws.services.kinesis.AmazonKinesisClient; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import com.amazonaws.services.kinesis.model.DescribeStreamRequest; import com.amazonaws.services.kinesis.model.DescribeStreamResult; import com.amazonaws.services.kinesis.model.ExpiredIteratorException; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxyFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxyFactory.java index fcd8e27c..08c1962b 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxyFactory.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/KinesisProxyFactory.java @@ -18,7 +18,7 @@ import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.kinesis.AmazonKinesis; import com.amazonaws.services.kinesis.AmazonKinesisClient; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; /** * Factory used for instantiating KinesisProxy objects (to fetch data from Kinesis). diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporter.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/ThrottlingReporter.java similarity index 95% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporter.java rename to amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/ThrottlingReporter.java index 0753e005..8a679c93 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporter.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/ThrottlingReporter.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.retrieval; import org.slf4j.Logger; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java index 9c88ee31..84c38279 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; import com.amazonaws.services.dynamodbv2.streamsadapter.AmazonDynamoDBStreamsAdapterClient; import com.amazonaws.services.dynamodbv2.streamsadapter.AmazonDynamoDBStreamsAdapterClientChild; import com.amazonaws.services.kinesis.AmazonKinesis; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; import com.amazonaws.services.kinesis.model.ListShardsRequest; import com.amazonaws.services.kinesis.model.ListShardsResult; import com.amazonaws.services.kinesis.model.ResourceInUseException; diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/checkpoint/RecordProcessorCheckpointerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/checkpoint/RecordProcessorCheckpointerTest.java index 396fd1a4..67ea7087 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/checkpoint/RecordProcessorCheckpointerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/checkpoint/RecordProcessorCheckpointerTest.java @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map.Entry; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; import software.amazon.kinesis.metrics.IMetricsScope; import org.junit.After; @@ -87,7 +87,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#checkpoint()}. + * {@link RecordProcessorCheckpointer#checkpoint()}. */ @Test public final void testCheckpoint() throws Exception { @@ -108,7 +108,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#checkpoint(Record record)}. + * {@link RecordProcessorCheckpointer#checkpoint(Record record)}. */ @Test public final void testCheckpointRecord() throws Exception { @@ -124,7 +124,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#checkpoint(Record record)}. + * {@link RecordProcessorCheckpointer#checkpoint(Record record)}. */ @Test public final void testCheckpointSubRecord() throws Exception { @@ -141,7 +141,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#checkpoint(String sequenceNumber)}. + * {@link RecordProcessorCheckpointer#checkpoint(String sequenceNumber)}. */ @Test public final void testCheckpointSequenceNumber() throws Exception { @@ -156,7 +156,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#checkpoint(String sequenceNumber, long subSequenceNumber)}. + * {@link RecordProcessorCheckpointer#checkpoint(String sequenceNumber, long subSequenceNumber)}. */ @Test public final void testCheckpointExtendedSequenceNumber() throws Exception { @@ -186,7 +186,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#prepareCheckpoint()}. + * {@link RecordProcessorCheckpointer#prepareCheckpoint()}. */ @Test public final void testPrepareCheckpoint() throws Exception { @@ -218,7 +218,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#prepareCheckpoint(Record record)}. + * {@link RecordProcessorCheckpointer#prepareCheckpoint(Record record)}. */ @Test public final void testPrepareCheckpointRecord() throws Exception { @@ -243,7 +243,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#prepareCheckpoint(Record record)}. + * {@link RecordProcessorCheckpointer#prepareCheckpoint(Record record)}. */ @Test public final void testPrepareCheckpointSubRecord() throws Exception { @@ -269,7 +269,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#checkpoint(String sequenceNumber)}. + * {@link RecordProcessorCheckpointer#checkpoint(String sequenceNumber)}. */ @Test public final void testPrepareCheckpointSequenceNumber() throws Exception { @@ -293,7 +293,7 @@ public class RecordProcessorCheckpointerTest { /** * Test method for - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer#checkpoint(String sequenceNumber, long subSequenceNumber)}. + * {@link RecordProcessorCheckpointer#checkpoint(String sequenceNumber, long subSequenceNumber)}. */ @Test public final void testPrepareCheckpointExtendedSequenceNumber() throws Exception { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/GracefulShutdownCoordinatorTest.java similarity index 98% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/GracefulShutdownCoordinatorTest.java index 6207f967..98b3d4ae 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/GracefulShutdownCoordinatorTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -36,6 +36,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.verification.VerificationMode; +import software.amazon.kinesis.coordinator.GracefulShutdownContext; +import software.amazon.kinesis.coordinator.GracefulShutdownCoordinator; +import software.amazon.kinesis.coordinator.Worker; import software.amazon.kinesis.leases.ShardInfo; import software.amazon.kinesis.lifecycle.ShardConsumer; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/KinesisClientLibConfigurationTest.java similarity index 98% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/KinesisClientLibConfigurationTest.java index 93d7f50e..afa4b3a9 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/KinesisClientLibConfigurationTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -22,6 +22,7 @@ import static org.junit.Assert.fail; import java.util.Date; +import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; import org.junit.Test; import org.mockito.Mockito; @@ -32,6 +33,8 @@ import com.amazonaws.regions.RegionUtils; import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; import com.amazonaws.services.kinesis.AmazonKinesisClient; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.Worker; import software.amazon.kinesis.processor.IRecordProcessorFactory; import software.amazon.kinesis.metrics.MetricsLevel; import com.google.common.collect.ImmutableSet; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/WorkerTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/WorkerTest.java index ec4e4324..25cb3ad2 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/WorkerTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.coordinator; import static org.hamcrest.CoreMatchers.both; import static org.hamcrest.CoreMatchers.equalTo; @@ -64,6 +64,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; +import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; import org.hamcrest.Condition; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -104,9 +106,9 @@ import software.amazon.kinesis.processor.IRecordProcessorCheckpointer; import software.amazon.kinesis.processor.V1ToV2RecordProcessorFactoryAdapter; import software.amazon.kinesis.processor.v2.IRecordProcessor; import software.amazon.kinesis.processor.v2.IRecordProcessorFactory; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker.WorkerCWMetricsFactory; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker.WorkerThreadPoolExecutor; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.WorkerStateChangeListener.WorkerState; +import software.amazon.kinesis.coordinator.Worker.WorkerCWMetricsFactory; +import software.amazon.kinesis.coordinator.Worker.WorkerThreadPoolExecutor; +import software.amazon.kinesis.coordinator.WorkerStateChangeListener.WorkerState; import software.amazon.kinesis.retrieval.GetRecordsCache; import software.amazon.kinesis.retrieval.GetRecordsRetrievalStrategy; import software.amazon.kinesis.retrieval.IKinesisProxy; @@ -136,6 +138,8 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import software.amazon.kinesis.utils.TestStreamlet; +import software.amazon.kinesis.utils.TestStreamletFactory; /** * Unit tests of Worker. @@ -469,7 +473,7 @@ public class WorkerTest { /** * Runs worker with threadPoolSize == numShards - * Test method for {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker#run()}. + * Test method for {@link Worker#run()}. */ @Test public final void testRunWithThreadPoolSizeEqualToNumShards() throws Exception { @@ -480,7 +484,7 @@ public class WorkerTest { /** * Runs worker with threadPoolSize < numShards - * Test method for {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker#run()}. + * Test method for {@link Worker#run()}. */ @Test public final void testRunWithThreadPoolSizeLessThanNumShards() throws Exception { @@ -491,7 +495,7 @@ public class WorkerTest { /** * Runs worker with threadPoolSize > numShards - * Test method for {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker#run()}. + * Test method for {@link Worker#run()}. */ @Test public final void testRunWithThreadPoolSizeMoreThanNumShards() throws Exception { diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ConsumerStatesTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ConsumerStatesTest.java index 38cd09b4..f0f8e247 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ConsumerStatesTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ConsumerStatesTest.java @@ -29,11 +29,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownNotification; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.StreamConfig; +import software.amazon.kinesis.coordinator.StreamConfig; import org.hamcrest.Condition; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ProcessTaskTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ProcessTaskTest.java index 44544e36..98cbee6a 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ProcessTaskTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ProcessTaskTest.java @@ -39,11 +39,11 @@ import java.util.concurrent.TimeUnit; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.StreamConfig; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ThrottlingReporter; +import software.amazon.kinesis.coordinator.StreamConfig; +import software.amazon.kinesis.retrieval.ThrottlingReporter; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java index b87aa8fe..39c711ec 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java @@ -52,12 +52,11 @@ import java.util.concurrent.TimeUnit; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.KinesisClientLibConfiguration; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownNotification; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.StreamConfig; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.TestStreamlet; +import software.amazon.kinesis.coordinator.StreamConfig; +import software.amazon.kinesis.utils.TestStreamlet; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShutdownTaskTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShutdownTaskTest.java index fde3c213..5503c50d 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShutdownTaskTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShutdownTaskTest.java @@ -24,9 +24,9 @@ import java.util.Set; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.kinesis.coordinator.RecordProcessorCheckpointer; import software.amazon.kinesis.leases.ShardInfo; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.TestStreamlet; +import software.amazon.kinesis.utils.TestStreamlet; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/ThrottlingReporterTest.java similarity index 95% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/ThrottlingReporterTest.java index 8178d481..d0feb8f4 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/ThrottlingReporterTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.retrieval; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.never; @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.slf4j.Logger; +import software.amazon.kinesis.retrieval.ThrottlingReporter; @RunWith(MockitoJUnitRunner.class) public class ThrottlingReporterTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestStreamlet.java similarity index 88% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java rename to amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestStreamlet.java index af834448..36e2d0da 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestStreamlet.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.utils; import java.util.ArrayList; import java.util.HashSet; @@ -138,7 +138,7 @@ public class TestStreamlet implements IRecordProcessor, IShutdownNotificationAwa /** * @return the shardId */ - String getShardId() { + public String getShardId() { return shardId; } @@ -152,7 +152,7 @@ public class TestStreamlet implements IRecordProcessor, IShutdownNotificationAwa /** * @return the numProcessRecordsCallsWithEmptyRecordList */ - long getNumProcessRecordsCallsWithEmptyRecordList() { + public long getNumProcessRecordsCallsWithEmptyRecordList() { return numProcessRecordsCallsWithEmptyRecordList; } diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestStreamletFactory.java similarity index 57% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java rename to amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestStreamletFactory.java index ef18a077..e81a853a 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestStreamletFactory.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.kinesis.utils; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,7 @@ import software.amazon.kinesis.processor.v2.IRecordProcessorFactory; /** * Factory for TestStreamlet record processors. */ -class TestStreamletFactory implements IRecordProcessorFactory { +public class TestStreamletFactory implements IRecordProcessorFactory { // Will be passed to the TestStreamlet. Can be used to check if all records have been processed. private Semaphore semaphore; @@ -35,7 +35,7 @@ class TestStreamletFactory implements IRecordProcessorFactory { /** * Constructor. */ - TestStreamletFactory(Semaphore semaphore, ShardSequenceVerifier shardSequenceVerifier) { + public TestStreamletFactory(Semaphore semaphore, ShardSequenceVerifier shardSequenceVerifier) { this.semaphore = semaphore; this.shardSequenceVerifier = shardSequenceVerifier; } @@ -51,14 +51,14 @@ class TestStreamletFactory implements IRecordProcessorFactory { return semaphore; } - ShardSequenceVerifier getShardSequenceVerifier() { + public ShardSequenceVerifier getShardSequenceVerifier() { return shardSequenceVerifier; } /** * @return the testStreamlets */ - List getTestStreamlets() { + public List getTestStreamlets() { return testStreamlets; }