diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MessageWriter.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MessageWriter.java index 1659c1f3..f5b6dd05 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MessageWriter.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MessageWriter.java @@ -22,9 +22,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import com.amazonaws.services.kinesis.multilang.messages.CheckpointMessage; import com.amazonaws.services.kinesis.multilang.messages.InitializeMessage; import com.amazonaws.services.kinesis.multilang.messages.Message; 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 5b9aff0a..cc249101 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 @@ -23,9 +23,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.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..fae5ca93 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.aws.services.kinesis.clientlibrary.lib.worker.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 26112fce..6e74c52f 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 @@ -20,12 +20,12 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import com.amazonaws.services.kinesis.multilang.messages.CheckpointMessage; import com.amazonaws.services.kinesis.multilang.messages.InitializeMessage; import com.amazonaws.services.kinesis.multilang.messages.Message; 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 e5667759..b6652410 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 @@ -20,13 +20,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; 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/MultiLangRecordProcessorFactory.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessorFactory.java index 71f6bb83..817dada7 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 @@ -16,9 +16,9 @@ package com.amazonaws.services.kinesis.multilang; import java.util.concurrent.ExecutorService; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.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/InitialPositionInStreamPropertyValueDecoder.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/config/InitialPositionInStreamPropertyValueDecoder.java index 9e826680..bdc7ba7a 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/config/InitialPositionInStreamPropertyValueDecoder.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/config/InitialPositionInStreamPropertyValueDecoder.java @@ -17,7 +17,7 @@ package com.amazonaws.services.kinesis.multilang.config; import java.util.Arrays; import java.util.List; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; /** * Get an InitialiPosition enum property. 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..04d688dd 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.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; import lombok.extern.slf4j.Slf4j; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/InitializeMessage.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/InitializeMessage.java index cc6be56f..11e7e77a 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/InitializeMessage.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/InitializeMessage.java @@ -14,7 +14,7 @@ */ package com.amazonaws.services.kinesis.multilang.messages; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; import lombok.Getter; import lombok.Setter; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/JsonFriendlyRecord.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/JsonFriendlyRecord.java index 19100993..445d51a9 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/JsonFriendlyRecord.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/JsonFriendlyRecord.java @@ -16,7 +16,7 @@ package com.amazonaws.services.kinesis.multilang.messages; import java.util.Date; -import com.amazonaws.services.kinesis.clientlibrary.types.UserRecord; +import software.amazon.aws.services.kinesis.clientlibrary.types.UserRecord; import com.amazonaws.services.kinesis.model.Record; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ProcessRecordsMessage.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ProcessRecordsMessage.java index 12371eb8..ccd5b702 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ProcessRecordsMessage.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ProcessRecordsMessage.java @@ -17,7 +17,7 @@ package com.amazonaws.services.kinesis.multilang.messages; import java.util.ArrayList; import java.util.List; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import com.amazonaws.services.kinesis.model.Record; import lombok.Getter; import lombok.Setter; diff --git a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ShutdownMessage.java b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ShutdownMessage.java index 82ed5458..3ae5756f 100644 --- a/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ShutdownMessage.java +++ b/amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/messages/ShutdownMessage.java @@ -14,7 +14,7 @@ */ package com.amazonaws.services.kinesis.multilang.messages; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; /** * A message to indicate to the client's process that it should shutdown and then terminate. diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/Matchers.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/Matchers.java index 92ac15f7..6454b8b2 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/Matchers.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/Matchers.java @@ -21,8 +21,8 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeDiagnosingMatcher; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; public class Matchers { diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java index f9fd1d58..6a7b6e9b 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java @@ -23,14 +23,14 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; import com.amazonaws.services.kinesis.model.Record; import com.amazonaws.services.kinesis.multilang.messages.Message; import com.fasterxml.jackson.core.JsonProcessingException; 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..130727a1 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.aws.services.kinesis.clientlibrary.lib.worker.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..18bab6aa 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.aws.services.kinesis.clientlibrary.lib.worker.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 da14d256..1c128f40 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 @@ -14,15 +14,15 @@ */ package com.amazonaws.services.kinesis.multilang; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import com.amazonaws.services.kinesis.model.Record; import com.amazonaws.services.kinesis.multilang.messages.CheckpointMessage; import com.amazonaws.services.kinesis.multilang.messages.Message; 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 ba3e735b..d9a6265b 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,11 +14,11 @@ */ package com.amazonaws.services.kinesis.multilang; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; import org.junit.Assert; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; 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 f32fa5bf..376b5534 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 @@ -14,17 +14,17 @@ */ package com.amazonaws.services.kinesis.multilang; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; import com.amazonaws.services.kinesis.model.Record; import com.amazonaws.services.kinesis.multilang.messages.InitializeMessage; import com.amazonaws.services.kinesis.multilang.messages.Message; 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 7589d45a..d7144979 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 @@ -30,9 +30,9 @@ 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 com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import com.google.common.collect.ImmutableSet; public class KinesisClientLibConfiguratorTest { diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java index 2b2fe402..8ab5847a 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java @@ -17,12 +17,12 @@ package com.amazonaws.services.kinesis.multilang.messages; import java.nio.ByteBuffer; import java.util.ArrayList; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import org.junit.Assert; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; import com.amazonaws.services.kinesis.model.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/internal/KinesisClientLibIOException.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/internal/KinesisClientLibIOException.java deleted file mode 100644 index 951aedf9..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/internal/KinesisClientLibIOException.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.clientlibrary.exceptions.internal; - -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibRetryableException; - -/** - * Thrown when we encounter issues when reading/writing information (e.g. shard information from Kinesis may not be - * current/complete). - */ -public class KinesisClientLibIOException extends KinesisClientLibRetryableException { - private static final long serialVersionUID = 1L; - - /** - * Constructor. - * - * @param message Error message. - */ - public KinesisClientLibIOException(String message) { - super(message); - } - - /** - * Constructor. - * - * @param message Error message. - * @param e Cause. - */ - public KinesisClientLibIOException(String message, Exception e) { - super(message, e); - } -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessorFactory.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessorFactory.java deleted file mode 100644 index b87fd7ec..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessorFactory.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.clientlibrary.interfaces; - -/** - * The Amazon Kinesis Client Library will use this to instantiate a record processor per shard. - * Clients may choose to create separate instantiations, or re-use instantiations. - */ -public interface IRecordProcessorFactory { - - /** - * Returns a record processor to be used for processing data records for a (assigned) shard. - * - * @return Returns a processor object. - */ - IRecordProcessor createProcessor(); - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessorFactory.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessorFactory.java deleted file mode 100644 index 08010ee7..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessorFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.clientlibrary.interfaces.v2; - - -/** - * The Amazon Kinesis Client Library will use this to instantiate a record processor per shard. - * Clients may choose to create separate instantiations, or re-use instantiations. - */ -public interface IRecordProcessorFactory { - - /** - * Returns a record processor to be used for processing data records for a (assigned) shard. - * - * @return Returns a processor object. - */ - IRecordProcessor createProcessor(); - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DataFetchingStrategy.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DataFetchingStrategy.java deleted file mode 100644 index 05c2ab3f..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DataFetchingStrategy.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -/** - * - */ -public enum DataFetchingStrategy { - DEFAULT, PREFETCH_CACHED; -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetriever.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetriever.java deleted file mode 100644 index d5b4a782..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetriever.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -import com.amazonaws.services.kinesis.model.GetRecordsResult; - -import java.util.concurrent.Callable; - -/** - * This class uses the GetRecordsRetrievalStrategy class to retrieve the next set of records and update the cache. - */ -public interface GetRecordsRetriever { - GetRecordsResult getNextRecords(int maxRecords); -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ITask.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ITask.java deleted file mode 100644 index d19166a1..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ITask.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -import java.util.concurrent.Callable; - -/** - * Interface for shard processing tasks. - * A task may execute an application callback (e.g. initialize, process, shutdown). - */ -interface ITask extends Callable { - - /** - * Perform task logic. - * E.g. perform set up (e.g. fetch records) and invoke a callback (e.g. processRecords() API). - * - * @return TaskResult (captures any exceptions encountered during execution of the task) - */ - TaskResult call(); - - /** - * @return TaskType - */ - TaskType getTaskType(); - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStream.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStream.java deleted file mode 100644 index 94f9b455..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStream.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2012-2016 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 com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -/** - * Used to specify the position in the stream where a new application should start from. - * This is used during initial application bootstrap (when a checkpoint doesn't exist for a shard or its parents). - */ -public enum InitialPositionInStream { - /** - * Start after the most recent data record (fetch new data). - */ - LATEST, - - /** - * Start from the oldest available data record. - */ - TRIM_HORIZON, - - /** - * Start from the record at or after the specified server-side timestamp. - */ - AT_TIMESTAMP -} 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/V1ToV2RecordProcessorAdapter.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/V1ToV2RecordProcessorAdapter.java deleted file mode 100644 index 477acb74..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/V1ToV2RecordProcessorAdapter.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2015 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 com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput; - -/** - * Adapts a V1 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor IRecordProcessor} - * to V2 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor IRecordProcessor}. - */ -class V1ToV2RecordProcessorAdapter implements IRecordProcessor { - - private com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor recordProcessor; - - V1ToV2RecordProcessorAdapter( - com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor recordProcessor) { - this.recordProcessor = recordProcessor; - } - - @Override - public void initialize(InitializationInput initializationInput) { - recordProcessor.initialize(initializationInput.getShardId()); - } - - @Override - public void processRecords(ProcessRecordsInput processRecordsInput) { - recordProcessor.processRecords(processRecordsInput.getRecords(), processRecordsInput.getCheckpointer()); - - } - - @Override - public void shutdown(ShutdownInput shutdownInput) { - recordProcessor.shutdown(shutdownInput.getCheckpointer(), shutdownInput.getShutdownReason()); - } - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/V1ToV2RecordProcessorFactoryAdapter.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/V1ToV2RecordProcessorFactoryAdapter.java deleted file mode 100644 index 57146e64..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/V1ToV2RecordProcessorFactoryAdapter.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2015 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 com.amazonaws.services.kinesis.clientlibrary.lib.worker; - -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; - -/** - * Adapts a V1 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory - * IRecordProcessorFactory} to V2 - * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory IRecordProcessorFactory}. - */ -class V1ToV2RecordProcessorFactoryAdapter implements IRecordProcessorFactory { - - private com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory factory; - - V1ToV2RecordProcessorFactoryAdapter( - com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory factory) { - this.factory = factory; - } - - @Override - public IRecordProcessor createProcessor() { - return new V1ToV2RecordProcessorAdapter(factory.createProcessor()); - } -} 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/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyExtended.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyExtended.java deleted file mode 100644 index 7b3e8cc2..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyExtended.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.clientlibrary.proxies; - -import com.amazonaws.services.kinesis.model.Shard; - -/** - * Kinesis proxy interface extended with addition method(s). Operates on a - * single stream (set up at initialization). - * - */ -public interface IKinesisProxyExtended extends IKinesisProxy { - - /** - * Get the Shard corresponding to shardId associated with this - * IKinesisProxy. - * - * @param shardId - * Fetch the Shard with this given shardId - * @return the Shard with the given shardId - */ - Shard getShard(String shardId); -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyFactory.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyFactory.java deleted file mode 100644 index dd3c82e5..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyFactory.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.clientlibrary.proxies; - -/** - * Interface for a KinesisProxyFactory. - * - * @deprecated Deprecating since KinesisProxy is just created once, there is no use of a factory. There is no - * replacement for this class. This class will be removed in the next major/minor release. - * - */ -@Deprecated -public interface IKinesisProxyFactory { - - /** - * Return an IKinesisProxy object for the specified stream. - * @param streamName Stream from which data is consumed. - * @return IKinesisProxy object. - */ - IKinesisProxy getProxy(String streamName); - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/DependencyException.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/DependencyException.java deleted file mode 100644 index af5a8fec..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/DependencyException.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.leases.exceptions; - -/** - * Indicates that a lease operation has failed because a dependency of the leasing system has failed. This will happen - * if DynamoDB throws an InternalServerException or a generic AmazonClientException (the specific subclasses of - * AmazonClientException are all handled more gracefully). - */ -public class DependencyException extends LeasingException { - - private static final long serialVersionUID = 1L; - - public DependencyException(Throwable e) { - super(e); - } - - public DependencyException(String message, Throwable e) { - super(message, e); - } - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/InvalidStateException.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/InvalidStateException.java deleted file mode 100644 index 2cf44d20..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/InvalidStateException.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.leases.exceptions; - -/** - * Indicates that a lease operation has failed because DynamoDB is an invalid state. The most common example is failing - * to create the DynamoDB table before doing any lease operations. - */ -public class InvalidStateException extends LeasingException { - - private static final long serialVersionUID = 1L; - - public InvalidStateException(Throwable e) { - super(e); - } - - public InvalidStateException(String message, Throwable e) { - super(message, e); - } - - public InvalidStateException(String message) { - super(message); - } - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/LeasingException.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/LeasingException.java deleted file mode 100644 index 00b3ea02..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/LeasingException.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.leases.exceptions; - -/** - * Top-level exception type for all exceptions thrown by the leasing code. - */ -public class LeasingException extends Exception { - - public LeasingException(Throwable e) { - super(e); - } - - public LeasingException(String message, Throwable e) { - super(message, e); - } - - public LeasingException(String message) { - super(message); - } - - private static final long serialVersionUID = 1L; - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/ProvisionedThroughputException.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/ProvisionedThroughputException.java deleted file mode 100644 index 167cb6aa..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/ProvisionedThroughputException.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.leases.exceptions; - -/** - * Indicates that a lease operation has failed due to lack of provisioned throughput for a DynamoDB table. - */ -public class ProvisionedThroughputException extends LeasingException { - - private static final long serialVersionUID = 1L; - - public ProvisionedThroughputException(Throwable e) { - super(e); - } - - public ProvisionedThroughputException(String message, Throwable e) { - super(message, e); - } - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/IKinesisClientLeaseManager.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/IKinesisClientLeaseManager.java deleted file mode 100644 index 2e3daeca..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/IKinesisClientLeaseManager.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.leases.interfaces; - -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; - -/** - * A decoration of ILeaseManager that adds methods to get/update checkpoints. - */ -public interface IKinesisClientLeaseManager extends ILeaseManager { - - /** - * Gets the current checkpoint of the shard. This is useful in the resharding use case - * where we will wait for the parent shard to complete before starting on the records from a child shard. - * - * @param shardId Checkpoint of this shard will be returned - * @return Checkpoint of this shard, or null if the shard record doesn't exist. - * - * @throws ProvisionedThroughputException if DynamoDB update fails due to lack of capacity - * @throws InvalidStateException if lease table does not exist - * @throws DependencyException if DynamoDB update fails in an unexpected way - */ - public abstract ExtendedSequenceNumber getCheckpoint(String shardId) - throws ProvisionedThroughputException, InvalidStateException, DependencyException; - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/AccumulateByNameMetricsScope.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/AccumulateByNameMetricsScope.java deleted file mode 100644 index 959f889d..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/AccumulateByNameMetricsScope.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2012-2015 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 com.amazonaws.services.kinesis.metrics.impl; - -/** - * This is a MetricScope with a KeyType of String. It provides the implementation of - * getting the key based off of the String KeyType. - */ - -public abstract class AccumulateByNameMetricsScope extends AccumulatingMetricsScope { - - @Override - protected String getKey(String name) { - return name; - } - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/LogMetricsFactory.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/LogMetricsFactory.java deleted file mode 100644 index 07986d05..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/LogMetricsFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.metrics.impl; - -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; - -/** - * An IMetricsFactory that creates IMetricsScopes that output themselves via log4j. - */ -public class LogMetricsFactory implements IMetricsFactory { - - @Override - public LogMetricsScope createMetrics() { - return new LogMetricsScope(); - } - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsFactory.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsFactory.java deleted file mode 100644 index 4169d076..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.metrics.impl; - -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; - -public class NullMetricsFactory implements IMetricsFactory { - - private static final NullMetricsScope SCOPE = new NullMetricsScope(); - - @Override - public IMetricsScope createMetrics() { - return SCOPE; - } - -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsScope.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsScope.java deleted file mode 100644 index 7d66dffc..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsScope.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012-2015 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 com.amazonaws.services.kinesis.metrics.impl; - -import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; - -public class NullMetricsScope implements IMetricsScope { - - @Override - public void addData(String name, double value, StandardUnit unit) { - - } - - @Override - public void addData(String name, double value, StandardUnit unit, MetricsLevel level) { - - } - - @Override - public void addDimension(String name, String value) { - - } - - @Override - public void end() { - - } -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingFactory.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingFactory.java deleted file mode 100644 index ede5b9c5..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2016 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 com.amazonaws.services.kinesis.metrics.impl; - -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; - -/** - * Metrics scope factory that delegates metrics scope creation to another factory, but - * returns metrics scope that is thread safe. - */ -public class ThreadSafeMetricsDelegatingFactory implements IMetricsFactory { - - /** Metrics factory to delegate to. */ - private final IMetricsFactory delegate; - - /** - * Creates an instance of the metrics factory. - * @param delegate metrics factory to delegate to - */ - public ThreadSafeMetricsDelegatingFactory(IMetricsFactory delegate) { - this.delegate = delegate; - } - - /** - * {@inheritDoc} - */ - @Override - public IMetricsScope createMetrics() { - return new ThreadSafeMetricsDelegatingScope(delegate.createMetrics()); - } -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/IMetricsFactory.java b/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/IMetricsFactory.java deleted file mode 100644 index 03beda07..00000000 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/IMetricsFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2012-2013 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 com.amazonaws.services.kinesis.metrics.interfaces; - -/** - * Factory for MetricsScope objects. - */ -public interface IMetricsFactory { - /** - * @return a new IMetricsScope object of the type constructed by this factory. - */ - public IMetricsScope createMetrics(); -} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/InvalidStateException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/InvalidStateException.java similarity index 54% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/InvalidStateException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/InvalidStateException.java index a9bb5bdf..6756621e 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/InvalidStateException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/InvalidStateException.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.exceptions; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions; /** * This is thrown when the Amazon Kinesis Client Library encounters issues with its internal state (e.g. DynamoDB table diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibDependencyException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibDependencyException.java similarity index 57% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibDependencyException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibDependencyException.java index fef3c1b1..c2b01fe8 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibDependencyException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibDependencyException.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.exceptions; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions; /** * This is thrown when the Amazon Kinesis Client Library encounters issues talking to its dependencies diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibException.java similarity index 55% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibException.java index 5e77649f..987326e8 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibException.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.exceptions; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions; /** * Abstract class for exceptions of the Amazon Kinesis Client Library. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibNonRetryableException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibNonRetryableException.java similarity index 51% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibNonRetryableException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibNonRetryableException.java index c32409d5..a5bf0dc1 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibNonRetryableException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibNonRetryableException.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.exceptions; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions; /** * Non-retryable exceptions. Simply retrying the same request/operation is not expected to succeed. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibRetryableException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibRetryableException.java similarity index 53% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibRetryableException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibRetryableException.java index 537278d1..770fdb19 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/KinesisClientLibRetryableException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/KinesisClientLibRetryableException.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.exceptions; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions; /** * Retryable exceptions (e.g. transient errors). The request/operation is expected to succeed upon (back off and) retry. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/ShutdownException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/ShutdownException.java similarity index 51% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/ShutdownException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/ShutdownException.java index 1f5b38e1..b33e6676 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/ShutdownException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/ShutdownException.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.exceptions; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions; /** * The RecordProcessor instance has been shutdown (e.g. and attempts a checkpoint). diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/ThrottlingException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/ThrottlingException.java similarity index 52% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/ThrottlingException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/ThrottlingException.java index 7e483ba5..8fdb4e8c 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/ThrottlingException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/ThrottlingException.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.exceptions; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions; /** * Thrown when requests are throttled by a service (e.g. DynamoDB when storing a checkpoint). diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/internal/BlockedOnParentShardException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/internal/BlockedOnParentShardException.java similarity index 50% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/internal/BlockedOnParentShardException.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/internal/BlockedOnParentShardException.java index 88cca44e..2ddce625 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/exceptions/internal/BlockedOnParentShardException.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/internal/BlockedOnParentShardException.java @@ -1,21 +1,21 @@ /* - * Copyright 2012-2013 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.exceptions.internal; +package software.amazon.aws.services.kinesis.clientlibrary.exceptions.internal; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibRetryableException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibRetryableException; /** * Used internally in the Amazon Kinesis Client Library. Indicates that we cannot start processing data for a shard diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/internal/KinesisClientLibIOException.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/internal/KinesisClientLibIOException.java new file mode 100644 index 00000000..51a1292a --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/exceptions/internal/KinesisClientLibIOException.java @@ -0,0 +1,44 @@ +/* + * 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.aws.services.kinesis.clientlibrary.exceptions.internal; + +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibRetryableException; + +/** + * Thrown when we encounter issues when reading/writing information (e.g. shard information from Kinesis may not be + * current/complete). + */ +public class KinesisClientLibIOException extends KinesisClientLibRetryableException { + private static final long serialVersionUID = 1L; + + /** + * Constructor. + * + * @param message Error message. + */ + public KinesisClientLibIOException(String message) { + super(message); + } + + /** + * Constructor. + * + * @param message Error message. + * @param e Cause. + */ + public KinesisClientLibIOException(String message, Exception e) { + super(message, e); + } +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/ICheckpoint.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/ICheckpoint.java similarity index 76% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/ICheckpoint.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/ICheckpoint.java index 83c29b44..77a703dc 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/ICheckpoint.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/ICheckpoint.java @@ -1,22 +1,22 @@ /* - * Copyright 2012-2013 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.interfaces; +package software.amazon.aws.services.kinesis.clientlibrary.interfaces; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; /** * Interface for checkpoint trackers. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IPreparedCheckpointer.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IPreparedCheckpointer.java similarity index 61% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IPreparedCheckpointer.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IPreparedCheckpointer.java index 04827a63..dff3156d 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IPreparedCheckpointer.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IPreparedCheckpointer.java @@ -1,10 +1,25 @@ -package com.amazonaws.services.kinesis.clientlibrary.interfaces; +/* + * 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. + */ -import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +package software.amazon.aws.services.kinesis.clientlibrary.interfaces; + +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingException; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; /** * Objects of this class are prepared to checkpoint at a specific sequence number. They use an diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessor.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessor.java similarity index 74% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessor.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessor.java index 89cf092a..279184ef 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessor.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessor.java @@ -1,23 +1,23 @@ /* - * Copyright 2012-2013 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.interfaces; +package software.amazon.aws.services.kinesis.clientlibrary.interfaces; import java.util.List; import com.amazonaws.services.kinesis.model.Record; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; /** * The Amazon Kinesis Client Library will instantiate record processors to process data records fetched from Amazon diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessorCheckpointer.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessorCheckpointer.java similarity index 93% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessorCheckpointer.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessorCheckpointer.java index df4acc36..33805e1c 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessorCheckpointer.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessorCheckpointer.java @@ -1,23 +1,23 @@ /* - * Copyright 2012-2014 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.interfaces; +package software.amazon.aws.services.kinesis.clientlibrary.interfaces; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; import com.amazonaws.services.kinesis.model.Record; /** diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessorFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessorFactory.java new file mode 100644 index 00000000..5e2262c4 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/IRecordProcessorFactory.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.aws.services.kinesis.clientlibrary.interfaces; + +/** + * The Amazon Kinesis Client Library will use this to instantiate a record processor per shard. + * Clients may choose to create separate instantiations, or re-use instantiations. + */ +public interface IRecordProcessorFactory { + + /** + * Returns a record processor to be used for processing data records for a (assigned) shard. + * + * @return Returns a processor object. + */ + IRecordProcessor createProcessor(); + +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessor.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessor.java similarity index 61% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessor.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessor.java index bd445ac9..e19af544 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessor.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessor.java @@ -1,22 +1,23 @@ /* - * Copyright 2015 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.interfaces.v2; +package software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; /** * The Amazon Kinesis Client Library will instantiate record processors to process data records fetched from Amazon @@ -50,7 +51,7 @@ public interface IRecordProcessor { *

Warning

* * When the value of {@link ShutdownInput#getShutdownReason()} is - * {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason#TERMINATE} it is required that you + * {@link ShutdownReason#TERMINATE} it is required that you * checkpoint. Failure to do so will result in an IllegalArgumentException, and the KCL no longer making progress. * * @param shutdownInput diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessorFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessorFactory.java new file mode 100644 index 00000000..0bf8d67a --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessorFactory.java @@ -0,0 +1,31 @@ +/* + * 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.aws.services.kinesis.clientlibrary.interfaces.v2; + + +/** + * The Amazon Kinesis Client Library will use this to instantiate a record processor per shard. + * Clients may choose to create separate instantiations, or re-use instantiations. + */ +public interface IRecordProcessorFactory { + + /** + * Returns a record processor to be used for processing data records for a (assigned) shard. + * + * @return Returns a processor object. + */ + IRecordProcessor createProcessor(); + +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IShutdownNotificationAware.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IShutdownNotificationAware.java similarity index 86% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IShutdownNotificationAware.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IShutdownNotificationAware.java index b4d4629c..f29c6bb4 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IShutdownNotificationAware.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/interfaces/v2/IShutdownNotificationAware.java @@ -12,9 +12,9 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.interfaces.v2; +package software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; /** * Allows a record processor to indicate it's aware of requested shutdowns, and handle the request. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/Checkpoint.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/Checkpoint.java similarity index 52% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/Checkpoint.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/Checkpoint.java index d81c632f..d9389ae7 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/Checkpoint.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/Checkpoint.java @@ -1,6 +1,21 @@ -package com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint; +/* + * 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. + */ -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +package software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint; + +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import lombok.Data; /** diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/SentinelCheckpoint.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/SentinelCheckpoint.java similarity index 50% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/SentinelCheckpoint.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/SentinelCheckpoint.java index d4442b82..165cd449 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/SentinelCheckpoint.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/SentinelCheckpoint.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.checkpoint; +package software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint; /** * Enumeration of the sentinel values of checkpoints. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategy.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategy.java similarity index 96% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategy.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategy.java index d4d00558..fd78bf63 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategy.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategy.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.aws.services.kinesis.clientlibrary.lib.worker; import java.util.HashSet; import java.util.Set; @@ -28,8 +28,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper; -import com.amazonaws.services.kinesis.metrics.impl.ThreadSafeMetricsDelegatingScope; +import software.amazon.aws.services.kinesis.metrics.impl.MetricsHelper; +import software.amazon.aws.services.kinesis.metrics.impl.ThreadSafeMetricsDelegatingScope; import com.amazonaws.services.kinesis.model.ExpiredIteratorException; import com.amazonaws.services.kinesis.model.GetRecordsResult; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTask.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTask.java similarity index 75% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTask.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTask.java index b5c05e5f..fd207894 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTask.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTask.java @@ -1,23 +1,23 @@ /* - * Copyright 2012-2013 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.aws.services.kinesis.clientlibrary.lib.worker; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.BlockedOnParentShardException; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.internal.BlockedOnParentShardException; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; import lombok.extern.slf4j.Slf4j; @@ -52,7 +52,7 @@ class BlockOnParentShardTask implements ITask { } /* (non-Javadoc) - * @see com.amazonaws.services.kinesis.clientlibrary.lib.worker.ITask#call() + * @see software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask#call() */ @Override public TaskResult call() { @@ -96,7 +96,7 @@ class BlockOnParentShardTask implements ITask { } /* (non-Javadoc) - * @see com.amazonaws.services.kinesis.clientlibrary.lib.worker.ITask#getTaskType() + * @see software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask#getTaskType() */ @Override public TaskType getTaskType() { diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCache.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCache.java similarity index 92% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCache.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCache.java index 67d786da..f0bd28f9 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCache.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCache.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import com.amazonaws.services.kinesis.model.GetRecordsResult; /** diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparator.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparator.java similarity index 85% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparator.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparator.java index 0d3dd001..8a66aa9d 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparator.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparator.java @@ -1,24 +1,24 @@ /* - * Copyright 2014 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.aws.services.kinesis.clientlibrary.lib.worker; import java.io.Serializable; import java.math.BigInteger; import java.util.Comparator; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; /** * diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStates.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ConsumerStates.java similarity index 99% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStates.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ConsumerStates.java index c0bdc060..a8d407a2 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStates.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ConsumerStates.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.aws.services.kinesis.clientlibrary.lib.worker; /** * Top level container for all the possible states a {@link ShardConsumer} can be in. The logic for creation of tasks, diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DataFetcherResult.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DataFetcherResult.java similarity index 95% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DataFetcherResult.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DataFetcherResult.java index a7121ff2..bf446a66 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DataFetcherResult.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DataFetcherResult.java @@ -5,7 +5,7 @@ * 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.aws.services.kinesis.clientlibrary.lib.worker; import com.amazonaws.services.kinesis.model.GetRecordsResult; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DataFetchingStrategy.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DataFetchingStrategy.java new file mode 100644 index 00000000..d346c4eb --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DataFetchingStrategy.java @@ -0,0 +1,23 @@ +/* + * 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.aws.services.kinesis.clientlibrary.lib.worker; + +/** + * + */ +public enum DataFetchingStrategy { + DEFAULT, PREFETCH_CACHED; +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DoesNothingPreparedCheckpointer.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DoesNothingPreparedCheckpointer.java similarity index 76% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DoesNothingPreparedCheckpointer.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DoesNothingPreparedCheckpointer.java index d40f51d3..9495e3fd 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DoesNothingPreparedCheckpointer.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/DoesNothingPreparedCheckpointer.java @@ -12,14 +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.aws.services.kinesis.clientlibrary.lib.worker; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; /** * A special IPreparedCheckpointer that does nothing, which can be used when preparing a checkpoint at the current diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsCache.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsCache.java similarity index 88% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsCache.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsCache.java index dba24f8d..bd2758d4 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsCache.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsCache.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; /** * This class is used as a cache for Prefetching data from Kinesis. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetrievalStrategy.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetrievalStrategy.java similarity index 96% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetrievalStrategy.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetrievalStrategy.java index 4f474887..0c514c42 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetrievalStrategy.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetrievalStrategy.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.aws.services.kinesis.clientlibrary.lib.worker; import com.amazonaws.services.kinesis.model.GetRecordsResult; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetriever.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetriever.java new file mode 100644 index 00000000..35fc4090 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetriever.java @@ -0,0 +1,27 @@ +/* + * 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.aws.services.kinesis.clientlibrary.lib.worker; + +import com.amazonaws.services.kinesis.model.GetRecordsResult; + +import java.util.concurrent.Callable; + +/** + * This class uses the GetRecordsRetrievalStrategy class to retrieve the next set of records and update the cache. + */ +public interface GetRecordsRetriever { + GetRecordsResult getNextRecords(int maxRecords); +} 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/aws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownContext.java similarity index 93% 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/aws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownContext.java index 22a4d92b..847b4f29 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/aws/services/kinesis/clientlibrary/lib/worker/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.aws.services.kinesis.clientlibrary.lib.worker; 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/aws/services/kinesis/clientlibrary/lib/worker/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/aws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinator.java index d61e2910..4c20d27d 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/aws/services/kinesis/clientlibrary/lib/worker/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.aws.services.kinesis.clientlibrary.lib.worker; import java.util.concurrent.Callable; import java.util.concurrent.Future; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ITask.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ITask.java new file mode 100644 index 00000000..d57adf86 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ITask.java @@ -0,0 +1,38 @@ +/* + * 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.aws.services.kinesis.clientlibrary.lib.worker; + +import java.util.concurrent.Callable; + +/** + * Interface for shard processing tasks. + * A task may execute an application callback (e.g. initialize, process, shutdown). + */ +interface ITask extends Callable { + + /** + * Perform task logic. + * E.g. perform set up (e.g. fetch records) and invoke a callback (e.g. processRecords() API). + * + * @return TaskResult (captures any exceptions encountered during execution of the task) + */ + TaskResult call(); + + /** + * @return TaskType + */ + TaskType getTaskType(); + +} diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStream.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStream.java new file mode 100644 index 00000000..b7e48669 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStream.java @@ -0,0 +1,36 @@ +/* + * 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.aws.services.kinesis.clientlibrary.lib.worker; + +/** + * Used to specify the position in the stream where a new application should start from. + * This is used during initial application bootstrap (when a checkpoint doesn't exist for a shard or its parents). + */ +public enum InitialPositionInStream { + /** + * Start after the most recent data record (fetch new data). + */ + LATEST, + + /** + * Start from the oldest available data record. + */ + TRIM_HORIZON, + + /** + * Start from the record at or after the specified server-side timestamp. + */ + AT_TIMESTAMP +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStreamExtended.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStreamExtended.java similarity index 80% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStreamExtended.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStreamExtended.java index 6a9948c7..c60174fa 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStreamExtended.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitialPositionInStreamExtended.java @@ -1,18 +1,18 @@ /* - * Copyright 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.aws.services.kinesis.clientlibrary.lib.worker; import java.util.Date; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitializeTask.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitializeTask.java similarity index 85% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitializeTask.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitializeTask.java index e85b67a9..0a7f4f03 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitializeTask.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/InitializeTask.java @@ -12,15 +12,15 @@ * 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.aws.services.kinesis.clientlibrary.lib.worker; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.metrics.impl.MetricsHelper; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import lombok.extern.slf4j.Slf4j; @@ -67,7 +67,7 @@ class InitializeTask implements ITask { * Initializes the data fetcher (position in shard) and invokes the RecordProcessor initialize() API. * (non-Javadoc) * - * @see com.amazonaws.services.kinesis.clientlibrary.lib.worker.ITask#call() + * @see software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask#call() */ @Override public TaskResult call() { @@ -123,7 +123,7 @@ class InitializeTask implements ITask { /* * (non-Javadoc) * - * @see com.amazonaws.services.kinesis.clientlibrary.lib.worker.ITask#getTaskType() + * @see software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask#getTaskType() */ @Override public TaskType getTaskType() { 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/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java similarity index 98% 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/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java index 5a822f88..c44a7311 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/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.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.aws.services.kinesis.clientlibrary.lib.worker; import java.util.Date; import java.util.Optional; @@ -23,12 +23,15 @@ import org.apache.commons.lang.Validate; import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.regions.RegionUtils; -import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.impl.MetricsHelper; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import com.google.common.collect.ImmutableSet; import lombok.Getter; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; /** * Configuration for the Amazon Kinesis Client Library. @@ -992,13 +995,13 @@ public class KinesisClientLibConfiguration { * Controls how long the KCL will sleep if no records are returned from Kinesis * *

- * This value is only used when no records are returned; if records are returned, the {@link com.amazonaws.services.kinesis.clientlibrary.lib.worker.ProcessTask} will + * This value is only used when no records are returned; if records are returned, the {@link ProcessTask} will * immediately retrieve the next set of records after the call to - * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor#processRecords(ProcessRecordsInput)} + * {@link IRecordProcessor#processRecords(ProcessRecordsInput)} * has returned. Setting this value to high may result in the KCL being unable to catch up. If you are changing this * value it's recommended that you enable {@link #withCallProcessRecordsEvenForEmptyRecordList(boolean)}, and * monitor how far behind the records retrieved are by inspecting - * {@link com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput#getMillisBehindLatest()}, and the + * {@link ProcessRecordsInput#getMillisBehindLatest()}, and the * CloudWatch * Metric: GetRecords.MillisBehindLatest @@ -1407,7 +1410,7 @@ public class KinesisClientLibConfiguration { /** * @param listShardsBackoffTimeInMillis Max sleep between two listShards call when throttled - * in {@link com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisProxy}. + * in {@link KinesisProxy}. * @return */ public KinesisClientLibConfiguration withListShardsBackoffTimeInMillis(long listShardsBackoffTimeInMillis) { @@ -1418,7 +1421,7 @@ public class KinesisClientLibConfiguration { /** * @param maxListShardsRetryAttempts Max number of retries for listShards when throttled - * in {@link com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisProxy}. + * in {@link KinesisProxy}. * @return */ public KinesisClientLibConfiguration withMaxListShardsRetryAttempts(int maxListShardsRetryAttempts) { diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinator.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinator.java similarity index 85% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinator.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinator.java index e56b0942..b2f9c719 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinator.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinator.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.aws.services.kinesis.clientlibrary.lib.worker; import java.util.ArrayList; import java.util.Collection; @@ -22,21 +22,21 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.impl.LeaseCoordinator; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.LeaseCoordinator; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; import lombok.extern.slf4j.Slf4j; @@ -176,7 +176,7 @@ class KinesisClientLibLeaseCoordinator extends LeaseCoordinator { + + /** + * Gets the current checkpoint of the shard. This is useful in the resharding use case + * where we will wait for the parent shard to complete before starting on the records from a child shard. + * + * @param shardId Checkpoint of this shard will be returned + * @return Checkpoint of this shard, or null if the shard record doesn't exist. + * + * @throws ProvisionedThroughputException if DynamoDB update fails due to lack of capacity + * @throws InvalidStateException if lease table does not exist + * @throws DependencyException if DynamoDB update fails in an unexpected way + */ + public abstract ExtendedSequenceNumber getCheckpoint(String shardId) + throws ProvisionedThroughputException, InvalidStateException, DependencyException; + +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseManager.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseManager.java similarity index 89% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseManager.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseManager.java index ab296cc1..0f291f84 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseManager.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseManager.java @@ -1,25 +1,25 @@ /* - * Copyright 2012-2015 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.leases.interfaces; +package software.amazon.aws.services.kinesis.leases.interfaces; import java.util.List; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.Lease; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.Lease; /** * Supports basic CRUD operations for Leases. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseRenewer.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseRenewer.java similarity index 77% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseRenewer.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseRenewer.java index 87e9182a..387a08a3 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseRenewer.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseRenewer.java @@ -1,27 +1,27 @@ /* - * Copyright 2012-2013 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.leases.interfaces; +package software.amazon.aws.services.kinesis.leases.interfaces; import java.util.Collection; import java.util.Map; import java.util.UUID; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.Lease; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.Lease; /** * ILeaseRenewer objects are used by LeaseCoordinator to renew leases held by the LeaseCoordinator. Each diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseSerializer.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseSerializer.java similarity index 83% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseSerializer.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseSerializer.java index 2edb8d56..97cfcdf1 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseSerializer.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseSerializer.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.leases.interfaces; +package software.amazon.aws.services.kinesis.leases.interfaces; import java.util.Collection; import java.util.Map; @@ -22,7 +22,7 @@ import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; -import com.amazonaws.services.kinesis.leases.impl.Lease; +import software.amazon.aws.services.kinesis.leases.impl.Lease; /** * Utility class that manages the mapping of Lease objects/operations to records in DynamoDB. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseTaker.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseTaker.java similarity index 60% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseTaker.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseTaker.java index 2f8b5caa..92f9b520 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/ILeaseTaker.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/interfaces/ILeaseTaker.java @@ -1,24 +1,24 @@ /* - * Copyright 2012-2013 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.leases.interfaces; +package software.amazon.aws.services.kinesis.leases.interfaces; import java.util.Map; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.impl.Lease; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.impl.Lease; /** * ILeaseTaker is used by LeaseCoordinator to take new leases, or leases that other workers fail to renew. Each diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/util/DynamoUtils.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/util/DynamoUtils.java similarity index 76% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/util/DynamoUtils.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/util/DynamoUtils.java index 9c40394b..98b0137c 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/util/DynamoUtils.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/leases/util/DynamoUtils.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.leases.util; +package software.amazon.aws.services.kinesis.leases.util; import java.util.ArrayList; import java.util.Collection; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulateByNameMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulateByNameMetricsScope.java new file mode 100644 index 00000000..48344294 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulateByNameMetricsScope.java @@ -0,0 +1,29 @@ +/* + * 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.aws.services.kinesis.metrics.impl; + +/** + * This is a MetricScope with a KeyType of String. It provides the implementation of + * getting the key based off of the String KeyType. + */ + +public abstract class AccumulateByNameMetricsScope extends AccumulatingMetricsScope { + + @Override + protected String getKey(String name) { + return name; + } + +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulatingMetricsScope.java similarity index 81% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulatingMetricsScope.java index 1e12744f..61b3e23e 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulatingMetricsScope.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2015 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.HashMap; import java.util.Map; @@ -20,7 +20,7 @@ import java.util.Map; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; import com.amazonaws.services.cloudwatch.model.StatisticSet; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; /** * An IMetricsScope that accumulates data from multiple calls to addData with diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricKey.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricKey.java similarity index 66% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricKey.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricKey.java index 26cb151f..29a2c305 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricKey.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricKey.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.List; import java.util.Objects; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricsFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricsFactory.java similarity index 86% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricsFactory.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricsFactory.java index 66a977c5..ab0730dd 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricsFactory.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricsFactory.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2015 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.Set; @@ -21,9 +21,9 @@ import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.cloudwatch.AmazonCloudWatch; import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import com.google.common.collect.ImmutableSet; /** diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricsScope.java similarity index 69% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricsScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricsScope.java index c301850e..afe93855 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWMetricsScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWMetricsScope.java @@ -1,26 +1,26 @@ /* - * Copyright 2012-2015 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.ArrayList; import java.util.List; import java.util.Set; import com.amazonaws.services.cloudwatch.model.MetricDatum; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; /** * Metrics scope for CloudWatch metrics. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnable.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWPublisherRunnable.java similarity index 90% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnable.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWPublisherRunnable.java index c6e668ac..493c33c1 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnable.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/CWPublisherRunnable.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2015 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.Collection; import java.util.List; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisher.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/DefaultCWMetricsPublisher.java similarity index 75% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisher.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/DefaultCWMetricsPublisher.java index 1022d27e..2023538c 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisher.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/DefaultCWMetricsPublisher.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.ArrayList; import java.util.List; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/DimensionTrackingMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/DimensionTrackingMetricsScope.java similarity index 59% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/DimensionTrackingMetricsScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/DimensionTrackingMetricsScope.java index d9780977..699832ac 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/DimensionTrackingMetricsScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/DimensionTrackingMetricsScope.java @@ -1,24 +1,24 @@ /* - * Copyright 2012-2013 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.HashSet; import java.util.Set; import com.amazonaws.services.cloudwatch.model.Dimension; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; /** * DimensionTrackingMetricsScope is where we provide functionality for dimensions. diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/EndingMetricsScope.java similarity index 62% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/EndingMetricsScope.java index 964b3539..52c35092 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/EndingMetricsScope.java @@ -1,21 +1,21 @@ /* - * Copyright 2012-2015 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; public abstract class EndingMetricsScope extends DimensionTrackingMetricsScope { diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/FilteringMetricsScope.java similarity index 82% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/FilteringMetricsScope.java index f10142f4..7629a679 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/FilteringMetricsScope.java @@ -1,23 +1,23 @@ /* - * Copyright 2015 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.Set; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import com.google.common.collect.ImmutableSet; /** diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ICWMetricsPublisher.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ICWMetricsPublisher.java similarity index 52% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ICWMetricsPublisher.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ICWMetricsPublisher.java index 6c6afe17..dc045403 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ICWMetricsPublisher.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ICWMetricsPublisher.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.List; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/InterceptingMetricsFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/InterceptingMetricsFactory.java similarity index 70% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/InterceptingMetricsFactory.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/InterceptingMetricsFactory.java index f89f9550..9eafb75d 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/InterceptingMetricsFactory.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/InterceptingMetricsFactory.java @@ -1,23 +1,23 @@ /* - * Copyright 2012-2015 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; public abstract class InterceptingMetricsFactory implements IMetricsFactory { diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/LogMetricsFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/LogMetricsFactory.java new file mode 100644 index 00000000..f3346789 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/LogMetricsFactory.java @@ -0,0 +1,29 @@ +/* + * 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.aws.services.kinesis.metrics.impl; + +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; + +/** + * An IMetricsFactory that creates IMetricsScopes that output themselves via log4j. + */ +public class LogMetricsFactory implements IMetricsFactory { + + @Override + public LogMetricsScope createMetrics() { + return new LogMetricsScope(); + } + +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/LogMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/LogMetricsScope.java similarity index 69% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/LogMetricsScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/LogMetricsScope.java index 483f1723..b61e2b8c 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/LogMetricsScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/LogMetricsScope.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import com.amazonaws.services.cloudwatch.model.Dimension; import com.amazonaws.services.cloudwatch.model.MetricDatum; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueue.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricAccumulatingQueue.java similarity index 85% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueue.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricAccumulatingQueue.java index cfd01322..a18de3f3 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueue.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricAccumulatingQueue.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.ArrayList; import java.util.HashMap; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricDatumWithKey.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricDatumWithKey.java similarity index 73% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricDatumWithKey.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricDatumWithKey.java index c7066bc6..f7df0d26 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricDatumWithKey.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricDatumWithKey.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2013 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.Objects; import com.amazonaws.services.cloudwatch.model.MetricDatum; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricsHelper.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricsHelper.java similarity index 86% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricsHelper.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricsHelper.java index becec3cc..df373aa9 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/MetricsHelper.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/MetricsHelper.java @@ -1,23 +1,23 @@ /* - * 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import lombok.extern.slf4j.Slf4j; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/NullMetricsFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/NullMetricsFactory.java new file mode 100644 index 00000000..4404e94f --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/NullMetricsFactory.java @@ -0,0 +1,29 @@ +/* + * 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.aws.services.kinesis.metrics.impl; + +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; + +public class NullMetricsFactory implements IMetricsFactory { + + private static final NullMetricsScope SCOPE = new NullMetricsScope(); + + @Override + public IMetricsScope createMetrics() { + return SCOPE; + } + +} diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/NullMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/NullMetricsScope.java new file mode 100644 index 00000000..c68a2df3 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/NullMetricsScope.java @@ -0,0 +1,42 @@ +/* + * 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.aws.services.kinesis.metrics.impl; + +import com.amazonaws.services.cloudwatch.model.StandardUnit; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; + +public class NullMetricsScope implements IMetricsScope { + + @Override + public void addData(String name, double value, StandardUnit unit) { + + } + + @Override + public void addData(String name, double value, StandardUnit unit, MetricsLevel level) { + + } + + @Override + public void addDimension(String name, String value) { + + } + + @Override + public void end() { + + } +} diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingFactory.java new file mode 100644 index 00000000..2f7ead20 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingFactory.java @@ -0,0 +1,44 @@ +/* + * 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.aws.services.kinesis.metrics.impl; + +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; + +/** + * Metrics scope factory that delegates metrics scope creation to another factory, but + * returns metrics scope that is thread safe. + */ +public class ThreadSafeMetricsDelegatingFactory implements IMetricsFactory { + + /** Metrics factory to delegate to. */ + private final IMetricsFactory delegate; + + /** + * Creates an instance of the metrics factory. + * @param delegate metrics factory to delegate to + */ + public ThreadSafeMetricsDelegatingFactory(IMetricsFactory delegate) { + this.delegate = delegate; + } + + /** + * {@inheritDoc} + */ + @Override + public IMetricsScope createMetrics() { + return new ThreadSafeMetricsDelegatingScope(delegate.createMetrics()); + } +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingScope.java similarity index 62% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingScope.java index 5af4fab8..7b0bf752 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingScope.java @@ -1,22 +1,22 @@ /* - * Copyright 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.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; /** * Metrics scope that delegates to another metrics scope and is thread safe to be shared diff --git a/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/IMetricsFactory.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/IMetricsFactory.java new file mode 100644 index 00000000..f0b409f7 --- /dev/null +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/IMetricsFactory.java @@ -0,0 +1,25 @@ +/* + * 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.aws.services.kinesis.metrics.interfaces; + +/** + * Factory for MetricsScope objects. + */ +public interface IMetricsFactory { + /** + * @return a new IMetricsScope object of the type constructed by this factory. + */ + public IMetricsScope createMetrics(); +} diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/IMetricsScope.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/IMetricsScope.java similarity index 72% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/IMetricsScope.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/IMetricsScope.java index 5683b345..50dd111a 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/IMetricsScope.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/IMetricsScope.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2015 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.metrics.interfaces; +package software.amazon.aws.services.kinesis.metrics.interfaces; import com.amazonaws.services.cloudwatch.model.StandardUnit; diff --git a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/MetricsLevel.java b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/MetricsLevel.java similarity index 76% rename from amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/MetricsLevel.java rename to amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/MetricsLevel.java index 5ad9ed48..54a8ccaf 100644 --- a/amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/MetricsLevel.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/aws/services/kinesis/metrics/interfaces/MetricsLevel.java @@ -1,18 +1,18 @@ /* - * Copyright 2015 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.metrics.interfaces; +package software.amazon.aws.services.kinesis.metrics.interfaces; /** * This class defines a set of standard metrics levels that can be used to control which metrics get emitted. diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java index 075a89bd..939f4580 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java @@ -21,10 +21,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.metrics.impl.MetricsHelper; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsFactory; /** * Base class for unit testing checkpoint implementations. diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java index 35551de1..19345970 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java @@ -17,11 +17,12 @@ package com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint; import java.util.HashMap; import java.util.Map; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import lombok.extern.slf4j.Slf4j; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; /** * Everything is stored in memory and there is no fault-tolerance. diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java index 37f58c1c..76e873a3 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java @@ -40,7 +40,6 @@ import java.util.function.Supplier; import com.amazonaws.services.kinesis.model.ExpiredIteratorException; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -49,7 +48,11 @@ import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.AsynchronousGetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DataFetcherResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; import com.amazonaws.services.kinesis.model.GetRecordsResult; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.mockito.stubbing.Answer; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java index 151300de..fce7f81c 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java @@ -35,15 +35,16 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import com.amazonaws.services.kinesis.model.ExpiredIteratorException; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import com.amazonaws.services.kinesis.model.GetRecordsResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.AsynchronousGetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DataFetcherResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; /** * diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java index 7d003f3f..9b4acc7d 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java @@ -27,12 +27,16 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockOnParentShardTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskType; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; /** * diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java index 0636baea..3e14ea0a 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java @@ -30,7 +30,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockingGetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import com.amazonaws.services.kinesis.model.GetRecordsResult; import com.amazonaws.services.kinesis.model.Record; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java index 7abe7c52..639eb18c 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java @@ -18,7 +18,8 @@ import junit.framework.Assert; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.CheckpointValueComparator; public class CheckpointValueComparatorTest { @Test diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java index fa163ad2..28822bc8 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java @@ -14,8 +14,8 @@ */ package com.amazonaws.services.kinesis.clientlibrary.lib.worker; -import static com.amazonaws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ConsumerState; -import static com.amazonaws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ShardConsumerState; +import static software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ConsumerState; +import static software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ShardConsumerState; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -38,12 +38,31 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockOnParentShardTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ConsumerStates; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitializeTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ProcessTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardConsumer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownNotification; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownNotificationTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.StreamConfig; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskType; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; @RunWith(MockitoJUnitRunner.class) public class ConsumerStatesTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java index ff14a592..f8d72234 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java @@ -17,11 +17,11 @@ package com.amazonaws.services.kinesis.clientlibrary.lib.worker; import java.util.Arrays; import java.util.List; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; import lombok.extern.slf4j.Slf4j; 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/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java index c032bf0c..856e3147 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java @@ -36,6 +36,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.verification.VerificationMode; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GracefulShutdownContext; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GracefulShutdownCoordinator; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardConsumer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker; @RunWith(MockitoJUnitRunner.class) public class GracefulShutdownCoordinatorTest { 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/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java index cccbcb30..33e97e83 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java @@ -32,8 +32,11 @@ import com.amazonaws.regions.RegionUtils; import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; import com.amazonaws.services.kinesis.AmazonKinesisClient; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import com.google.common.collect.ImmutableSet; import junit.framework.Assert; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java index 00c1310d..c16a775b 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java @@ -23,7 +23,6 @@ import java.util.UUID; import java.util.concurrent.Callable; import com.amazonaws.auth.DefaultAWSCredentialsProviderChain; -import com.amazonaws.auth.SystemPropertiesCredentialsProvider; import junit.framework.Assert; import org.junit.Before; @@ -31,15 +30,16 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.LeasingException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager; -import com.amazonaws.services.kinesis.leases.impl.Lease; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseRenewer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibLeaseCoordinator; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.impl.Lease; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseRenewer; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java index 11962d8f..43faa12f 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java @@ -26,13 +26,14 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibLeaseCoordinator; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; public class KinesisClientLibLeaseCoordinatorTest { private static final String SHARD_ID = "shardId-test"; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java index fbe720ae..ea65244e 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java @@ -43,14 +43,21 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DataFetcherResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SynchronousGetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.metrics.impl.MetricsHelper; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsFactory; import com.amazonaws.services.kinesis.model.GetRecordsResult; import com.amazonaws.services.kinesis.model.Record; import com.amazonaws.services.kinesis.model.ResourceNotFoundException; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java index 42fd82de..7458e070 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java @@ -25,7 +25,9 @@ import java.util.Random; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ParentsFirstShardPrioritization; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; public class ParentsFirstShardPrioritizationUnitTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java index e24d5bb0..e511dc11 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java @@ -42,9 +42,17 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.AsynchronousGetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DataFetcherResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.PrefetchGetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SynchronousGetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsFactory; import com.amazonaws.services.kinesis.model.ExpiredIteratorException; import com.amazonaws.services.kinesis.model.GetRecordsResult; import com.amazonaws.services.kinesis.model.Record; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java index 2b650866..a42e6337 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java @@ -44,8 +44,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.PrefetchGetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsFactory; import com.amazonaws.services.kinesis.model.ExpiredIteratorException; import com.amazonaws.services.kinesis.model.GetRecordsResult; import com.amazonaws.services.kinesis.model.Record; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java index bfcd7723..60c973be 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java @@ -1,8 +1,10 @@ package com.amazonaws.services.kinesis.clientlibrary.lib.worker; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DoesNothingPreparedCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.PreparedCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java index 94d0918e..498c4b75 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java @@ -43,11 +43,23 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.clientlibrary.types.Messages.AggregatedRecord; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.clientlibrary.types.UserRecord; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ProcessTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.StreamConfig; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ThrottlingReporter; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.types.Messages; +import software.amazon.aws.services.kinesis.clientlibrary.types.Messages.AggregatedRecord; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.UserRecord; import com.amazonaws.services.kinesis.model.ProvisionedThroughputExceededException; import com.amazonaws.services.kinesis.model.Record; import com.google.protobuf.ByteString; @@ -69,9 +81,11 @@ public class ProcessTaskTest { private static final InitialPositionInStreamExtended INITIAL_POSITION_LATEST = InitialPositionInStreamExtended.newInitialPosition(InitialPositionInStream.LATEST); - private @Mock KinesisDataFetcher mockDataFetcher; + private @Mock + KinesisDataFetcher mockDataFetcher; private @Mock IRecordProcessor mockRecordProcessor; - private @Mock RecordProcessorCheckpointer mockCheckpointer; + private @Mock + RecordProcessorCheckpointer mockCheckpointer; @Mock private ThrottlingReporter throttlingReporter; @Mock @@ -339,8 +353,8 @@ public class ProcessTaskTest { ByteBuffer bb = ByteBuffer.allocate(1024); bb.put(new byte[] {-13, -119, -102, -62 }); - com.amazonaws.services.kinesis.clientlibrary.types.Messages.Record r = - com.amazonaws.services.kinesis.clientlibrary.types.Messages.Record.newBuilder() + Messages.Record r = + Messages.Record.newBuilder() .setData(ByteString.copyFrom(TEST_DATA)) .setPartitionKeyIndex(0) .build(); diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java index 67c36d20..1fefc7aa 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java @@ -26,7 +26,11 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map.Entry; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DoesNothingPreparedCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SequenceNumberValidator; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -36,15 +40,15 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.InMemoryCheckpointImpl; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.clientlibrary.types.UserRecord; -import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.types.UserRecord; +import software.amazon.aws.services.kinesis.metrics.impl.MetricsHelper; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; import com.amazonaws.services.kinesis.model.Record; /** @@ -86,7 +90,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 { @@ -107,7 +111,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 { @@ -123,7 +127,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 { @@ -140,7 +144,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 { @@ -155,7 +159,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 { @@ -185,7 +189,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 { @@ -217,7 +221,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 { @@ -242,7 +246,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 { @@ -268,7 +272,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 { @@ -292,7 +296,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/RecordsFetcherFactoryTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java index d686c914..9607a71e 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java @@ -8,7 +8,14 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockingGetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DataFetchingStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.PrefetchGetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordsFetcherFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SimpleRecordsFetcherFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; public class RecordsFetcherFactoryTest { private String shardId = "TestShard"; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java index 51d1376d..18945f15 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java @@ -21,8 +21,9 @@ import org.mockito.Mockito; import static org.junit.Assert.fail; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SequenceNumberValidator; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; import com.amazonaws.services.kinesis.model.InvalidArgumentException; import com.amazonaws.services.kinesis.model.ShardIteratorType; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java index 9d13b720..4d5e70be 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java @@ -59,21 +59,43 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.InMemoryCheckpointImpl; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.AsynchronousGetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockingGetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ConsumerStates; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitializeTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordsFetcherFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SequenceNumberValidator; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardConsumer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownNotification; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SimpleRecordsFetcherFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.StreamConfig; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SynchronousGetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput; -import com.amazonaws.services.kinesis.clientlibrary.types.UserRecord; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.UserRecord; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; import com.amazonaws.services.kinesis.model.Record; import com.amazonaws.services.kinesis.model.Shard; import com.amazonaws.services.kinesis.model.ShardIteratorType; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java index 511b5a1b..f049a41d 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java @@ -28,7 +28,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; public class ShardInfoTest { private static final String CONCURRENCY_TOKEN = UUID.randomUUID().toString(); diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java index 7e24aff0..b928b416 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java @@ -25,6 +25,7 @@ import com.amazonaws.services.kinesis.model.Shard; import junit.framework.Assert; import lombok.extern.slf4j.Slf4j; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; /** * Helper class to verify shard lineage in unit tests that use TestStreamlet. diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java index 619f3eaf..00f43d05 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java @@ -31,14 +31,17 @@ import com.amazonaws.auth.DefaultAWSCredentialsProviderChain; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; import com.amazonaws.services.kinesis.AmazonKinesis; import com.amazonaws.services.kinesis.AmazonKinesisClient; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisProxy; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager; -import com.amazonaws.services.kinesis.leases.interfaces.IKinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardSyncTask; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisProxy; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.interfaces.IKinesisClientLeaseManager; import com.amazonaws.services.kinesis.model.StreamStatus; /** diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java index 257e569f..0a9614d0 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java @@ -33,19 +33,22 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.local.embedded.DynamoDBEmbedded; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ExceptionThrowingLeaseManager.ExceptionThrowingLeaseManagerMethods; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardSyncer; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.LeasingException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager; -import com.amazonaws.services.kinesis.leases.impl.LeaseManager; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.impl.LeaseManager; import com.amazonaws.services.kinesis.model.HashKeyRange; import com.amazonaws.services.kinesis.model.SequenceNumberRange; import com.amazonaws.services.kinesis.model.Shard; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java index ddf07e10..4c03514d 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java @@ -29,13 +29,22 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskType; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; 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/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java index b751d0d5..20e6e7cd 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java @@ -21,17 +21,18 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibNonRetryableException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibNonRetryableException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ShutdownException; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; import com.amazonaws.services.kinesis.model.Record; import lombok.extern.slf4j.Slf4j; 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/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java index 3446f52d..2971c211 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java @@ -18,8 +18,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Semaphore; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; /** * Factory for TestStreamlet record processors. 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/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java index 8178d481..e950dd55 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java @@ -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.aws.services.kinesis.clientlibrary.lib.worker.ThrottlingReporter; @RunWith(MockitoJUnitRunner.class) public class ThrottlingReporterTest { 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/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java index 29989d7e..d7a885e7 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java @@ -81,30 +81,58 @@ import org.mockito.stubbing.Answer; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.local.embedded.DynamoDBEmbedded; -import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibNonRetryableException; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import com.amazonaws.services.kinesis.clientlibrary.interfaces.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 com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibNonRetryableException; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; +import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockOnParentShardTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GracefulShutdownCoordinator; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitializeTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibLeaseCoordinator; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.MetricsCollectingTaskDecorator; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.NoOpShardPrioritization; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.NoOpWorkerStateChangeListener; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordsFetcherFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardConsumer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardPrioritization; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardSyncer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownNotificationTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownTask; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SimpleRecordsFetcherFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.StreamConfig; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskType; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.V1ToV2RecordProcessorFactoryAdapter; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker.WorkerCWMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker.WorkerThreadPoolExecutor; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.WorkerStateChangeListener; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.WorkerStateChangeListener.WorkerState; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisProxy; import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput; -import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; +import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseBuilder; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager; -import com.amazonaws.services.kinesis.leases.impl.LeaseManager; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; -import com.amazonaws.services.kinesis.metrics.impl.CWMetricsFactory; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.impl.LeaseManager; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.metrics.impl.CWMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsFactory; import com.amazonaws.services.kinesis.model.HashKeyRange; import com.amazonaws.services.kinesis.model.Record; import com.amazonaws.services.kinesis.model.SequenceNumberRange; @@ -150,7 +178,7 @@ public class WorkerTest { @Mock private ILeaseManager leaseManager; @Mock - private com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory v1RecordProcessorFactory; + private software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory v1RecordProcessorFactory; @Mock private IKinesisProxy proxy; @Mock @@ -180,12 +208,12 @@ public class WorkerTest { } // CHECKSTYLE:IGNORE AnonInnerLengthCheck FOR NEXT 50 LINES - private static final com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory SAMPLE_RECORD_PROCESSOR_FACTORY = - new com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory() { + private static final software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory SAMPLE_RECORD_PROCESSOR_FACTORY = + new software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory() { @Override - public com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor createProcessor() { - return new com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor() { + public software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessor createProcessor() { + return new software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessor() { @Override public void shutdown(IRecordProcessorCheckpointer checkpointer, ShutdownReason reason) { @@ -447,7 +475,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 { @@ -458,7 +486,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 { @@ -469,7 +497,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 { @@ -1629,13 +1657,13 @@ public class WorkerTest { private abstract class InjectableWorker extends Worker { InjectableWorker(String applicationName, IRecordProcessorFactory recordProcessorFactory, - KinesisClientLibConfiguration config, StreamConfig streamConfig, - InitialPositionInStreamExtended initialPositionInStream, - long parentShardPollIntervalMillis, long shardSyncIdleTimeMillis, - boolean cleanupLeasesUponShardCompletion, ICheckpoint checkpoint, - KinesisClientLibLeaseCoordinator leaseCoordinator, ExecutorService execService, - IMetricsFactory metricsFactory, long taskBackoffTimeMillis, long failoverTimeMillis, - boolean skipShardSyncAtWorkerInitializationIfLeasesExist, ShardPrioritization shardPrioritization) { + KinesisClientLibConfiguration config, StreamConfig streamConfig, + InitialPositionInStreamExtended initialPositionInStream, + long parentShardPollIntervalMillis, long shardSyncIdleTimeMillis, + boolean cleanupLeasesUponShardCompletion, ICheckpoint checkpoint, + KinesisClientLibLeaseCoordinator leaseCoordinator, ExecutorService execService, + IMetricsFactory metricsFactory, long taskBackoffTimeMillis, long failoverTimeMillis, + boolean skipShardSyncAtWorkerInitializationIfLeasesExist, ShardPrioritization shardPrioritization) { super(applicationName, recordProcessorFactory, config, diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java index 25a2e474..1088fdc1 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java @@ -46,6 +46,7 @@ import com.amazonaws.services.kinesis.model.ShardIteratorType; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; /** * This is a (temporary) test utility class, to mimic Kinesis without having to integrate with Alpha. @@ -174,7 +175,7 @@ public class KinesisLocalFileProxy implements IKinesisProxy { /* * (non-Javadoc) * - * @see com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy#getStreamInfo() + * @see software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy#getStreamInfo() */ @Override public DescribeStreamResult getStreamInfo(String startShardId) throws ResourceNotFoundException { @@ -337,7 +338,7 @@ public class KinesisLocalFileProxy implements IKinesisProxy { /* * (non-Javadoc) * - * @see com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy#get(java.nio.ByteBuffer, int) + * @see software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy#get(java.nio.ByteBuffer, int) */ @Override public GetRecordsResult get(String serializedKinesisIterator, int maxRecords) diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java index f14ec63b..4d02d6be 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java @@ -19,6 +19,8 @@ import java.io.IOException; import java.math.BigInteger; import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxyFactory; /** Factory for KinesisProxy objects that use a local file for data. Useful for testing purposes. * @@ -53,7 +55,7 @@ public class KinesisLocalFileProxyFactory implements IKinesisProxyFactory { } /* (non-Javadoc) - * @see com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxyFactory#getProxy(java.lang.String) + * @see software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxyFactory#getProxy(java.lang.String) */ @Override public IKinesisProxy getProxy(String streamARN) { 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 e9cd5458..64999e38 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.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; import com.amazonaws.services.kinesis.model.ListShardsRequest; import com.amazonaws.services.kinesis.model.ListShardsResult; import com.amazonaws.services.kinesis.model.ResourceInUseException; @@ -68,6 +68,7 @@ import com.amazonaws.services.kinesis.model.Shard; import com.amazonaws.services.kinesis.model.ShardIteratorType; import com.amazonaws.services.kinesis.model.StreamDescription; import com.amazonaws.services.kinesis.model.StreamStatus; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisProxy; @RunWith(MockitoJUnitRunner.class) public class KinesisProxyTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java index 0b9a72f1..3a7f6739 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java @@ -17,7 +17,7 @@ package com.amazonaws.services.kinesis.clientlibrary.types; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; import org.junit.Test; /** diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java index 2e8879fe..881a2d18 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java @@ -18,7 +18,8 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; public class KinesisClientLeaseBuilder { private String leaseKey; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java index f6b10d64..ddcd4dcc 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java @@ -30,13 +30,16 @@ import javax.swing.*; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.DefaultAWSCredentialsProviderChain; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.LeasingException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; -import com.amazonaws.services.kinesis.metrics.impl.CWMetricsFactory; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.impl.LeaseCoordinator; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.metrics.impl.CWMetricsFactory; import lombok.extern.slf4j.Slf4j; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java index ee19a073..a71f76b4 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java @@ -21,10 +21,12 @@ import org.junit.runner.Description; import com.amazonaws.auth.DefaultAWSCredentialsProviderChain; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; -import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper; -import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory; +import software.amazon.aws.services.kinesis.metrics.impl.MetricsHelper; +import software.amazon.aws.services.kinesis.metrics.impl.NullMetricsFactory; import lombok.extern.slf4j.Slf4j; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; @Ignore @Slf4j diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java index dcaedc38..a341dee5 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java @@ -22,7 +22,10 @@ import junit.framework.Assert; import org.junit.Test; -import com.amazonaws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.impl.Lease; public class LeaseManagerIntegrationTest extends LeaseIntegrationTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java index 8ad19d34..11a493f9 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java @@ -14,9 +14,11 @@ */ package com.amazonaws.services.kinesis.leases.impl; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.LeasingException; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseRenewer; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.LeaseRenewer; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseRenewer; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerTest.java index 7c8b3fd1..24edf1bf 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerTest.java @@ -27,10 +27,12 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.ProvisionedThroughputException; +import software.amazon.aws.services.kinesis.leases.impl.Lease; +import software.amazon.aws.services.kinesis.leases.impl.LeaseRenewer; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; public class LeaseRenewerTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java index 6fb5caf6..dca2694b 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java @@ -20,7 +20,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.amazonaws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.LeaseTaker; public class LeaseTakerIntegrationTest extends LeaseIntegrationTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerTest.java index 34dfedfa..6865be46 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerTest.java @@ -24,6 +24,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import software.amazon.aws.services.kinesis.leases.impl.LeaseTaker; /** * @@ -59,7 +60,7 @@ public class LeaseTakerTest { } /** - * Test method for {@link com.amazonaws.services.kinesis.leases.impl.LeaseTaker#stringJoin(java.util.Collection, java.lang.String)}. + * Test method for {@link LeaseTaker#stringJoin(java.util.Collection, java.lang.String)}. */ @Test public final void testStringJoin() { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/TestHarnessBuilder.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/TestHarnessBuilder.java index 0dfbb568..d39188c9 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/TestHarnessBuilder.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/TestHarnessBuilder.java @@ -23,11 +23,14 @@ import java.util.concurrent.Callable; import org.junit.Assert; -import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import com.amazonaws.services.kinesis.leases.exceptions.DependencyException; -import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException; -import com.amazonaws.services.kinesis.leases.exceptions.LeasingException; -import com.amazonaws.services.kinesis.leases.interfaces.ILeaseRenewer; +import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; +import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; +import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; +import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; +import software.amazon.aws.services.kinesis.leases.impl.LeaseTaker; +import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseRenewer; public class TestHarnessBuilder { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java index a7b179a0..22fe2bf5 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.impl.AccumulateByNameMetricsScope; +import software.amazon.aws.services.kinesis.metrics.impl.AccumulateByNameMetricsScope; public class AccumulatingMetricsScopeTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java index e0b30c66..6f580a61 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java @@ -24,6 +24,10 @@ import org.mockito.Mockito; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; +import software.amazon.aws.services.kinesis.metrics.impl.CWMetricKey; +import software.amazon.aws.services.kinesis.metrics.impl.CWPublisherRunnable; +import software.amazon.aws.services.kinesis.metrics.impl.ICWMetricsPublisher; +import software.amazon.aws.services.kinesis.metrics.impl.MetricDatumWithKey; public class CWPublisherRunnableTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java index a547e038..fc0bd136 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java @@ -28,6 +28,9 @@ import com.amazonaws.services.cloudwatch.AmazonCloudWatch; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.PutMetricDataRequest; import com.amazonaws.services.cloudwatch.model.StandardUnit; +import software.amazon.aws.services.kinesis.metrics.impl.CWMetricKey; +import software.amazon.aws.services.kinesis.metrics.impl.DefaultCWMetricsPublisher; +import software.amazon.aws.services.kinesis.metrics.impl.MetricDatumWithKey; public class DefaultCWMetricsPublisherTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java index 7d44f43f..1bcfb845 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java @@ -17,7 +17,7 @@ package com.amazonaws.services.kinesis.metrics.impl; import org.junit.Test; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.impl.EndingMetricsScope; +import software.amazon.aws.services.kinesis.metrics.impl.EndingMetricsScope; public class EndingMetricsScopeTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java index deb03caf..54646c70 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java @@ -22,9 +22,10 @@ import org.junit.Test; import com.amazonaws.services.cloudwatch.model.Dimension; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope; -import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel; +import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; +import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import com.google.common.collect.ImmutableSet; +import software.amazon.aws.services.kinesis.metrics.impl.FilteringMetricsScope; public class FilteringMetricsScopeTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java index 1ca90076..d005eab2 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java +++ b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java @@ -25,6 +25,9 @@ import org.junit.Test; import com.amazonaws.services.cloudwatch.model.Dimension; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; +import software.amazon.aws.services.kinesis.metrics.impl.CWMetricKey; +import software.amazon.aws.services.kinesis.metrics.impl.MetricAccumulatingQueue; +import software.amazon.aws.services.kinesis.metrics.impl.MetricDatumWithKey; public class MetricAccumulatingQueueTest {