Initial move of some of the classes

Will fix failure with temp public

amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MessageWriter.java

@@ -23,8 +23,8 @@ 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 software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.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;

amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemon.java

@@ -23,7 +23,7 @@ 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 software.amazon.kinesis.processor.v2.IRecordProcessorFactory;
 import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration;
 import com.amazonaws.services.kinesis.clientlibrary.lib.worker.Worker;
 

amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocol.java

@@ -21,11 +21,11 @@ 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 software.amazon.kinesis.processor.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 software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.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;

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 software.amazon.kinesis.processor.IRecordProcessorCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware;
+import software.amazon.kinesis.processor.v2.IShutdownNotificationAware;
 import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration;
-import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput;
+import software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.ProcessRecordsInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput;
+import software.amazon.kinesis.lifecycle.ShutdownInput;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import lombok.extern.slf4j.Slf4j;

amazon-kinesis-client-multilang/src/main/java/com/amazonaws/services/kinesis/multilang/MultiLangRecordProcessorFactory.java

@@ -16,8 +16,8 @@ package com.amazonaws.services.kinesis.multilang;
 
 import java.util.concurrent.ExecutorService;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory;
+import software.amazon.kinesis.processor.v2.IRecordProcessorFactory;
 import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

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.kinesis.lifecycle.InitializationInput;
 import lombok.Getter;
 import lombok.Setter;
 

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.kinesis.retrieval.kpl.UserRecord;
 import com.amazonaws.services.kinesis.model.Record;
 import com.fasterxml.jackson.annotation.JsonProperty;
 

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.kinesis.lifecycle.ProcessRecordsInput;
 import com.amazonaws.services.kinesis.model.Record;
 import lombok.Getter;
 import lombok.Setter;

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 software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput;
+import software.amazon.kinesis.lifecycle.InitializationInput;
 
 public class Matchers {
 

amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java

@@ -23,8 +23,8 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput;
+import software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.ProcessRecordsInput;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java

@@ -18,11 +18,11 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateExcep
 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 software.amazon.kinesis.processor.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 software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.ProcessRecordsInput;
 import com.amazonaws.services.kinesis.model.Record;
 import com.amazonaws.services.kinesis.multilang.messages.CheckpointMessage;
 import com.amazonaws.services.kinesis.multilang.messages.Message;

amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java

@@ -18,7 +18,7 @@ import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibC
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;

amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java

@@ -18,13 +18,13 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateExcep
 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 software.amazon.kinesis.processor.IPreparedCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
+import software.amazon.kinesis.processor.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 software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.ProcessRecordsInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput;
+import software.amazon.kinesis.lifecycle.ShutdownInput;
 import com.amazonaws.services.kinesis.model.Record;
 import com.amazonaws.services.kinesis.multilang.messages.InitializeMessage;
 import com.amazonaws.services.kinesis.multilang.messages.Message;

amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java

@@ -32,7 +32,7 @@ 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.kinesis.metrics.MetricsLevel;
 import com.google.common.collect.ImmutableSet;
 
 public class KinesisClientLibConfiguratorTest {

amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java

@@ -17,8 +17,8 @@ package com.amazonaws.services.kinesis.multilang.messages;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
-import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput;
+import software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.ProcessRecordsInput;
 import org.junit.Assert;
 import org.junit.Test;
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/IRecordProcessorFactory.java

@@ -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();
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/interfaces/v2/IRecordProcessorFactory.java

@@ -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();
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTask.java

@@ -15,9 +15,9 @@
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.BlockedOnParentShardException;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.ILeaseManager;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparator.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Comparator;
 
-import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint;
+import software.amazon.kinesis.checkpoint.SentinelCheckpoint;
 
 /**
  * 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DataFetchingStrategy.java

@@ -1,8 +0,0 @@
-package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
-
-/**
- *
- */
-public enum DataFetchingStrategy {
-    DEFAULT, PREFETCH_CACHED;
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/DoesNothingPreparedCheckpointer.java

@@ -18,8 +18,8 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateExcep
 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 software.amazon.kinesis.processor.IPreparedCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
 
 /**
  * A special IPreparedCheckpointer that does nothing, which can be used when preparing a checkpoint at the current

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GetRecordsRetriever.java

@@ -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);
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/InitializeTask.java

@@ -14,13 +14,15 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint;
+import software.amazon.kinesis.processor.ICheckpoint;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint;
+import software.amazon.kinesis.checkpoint.Checkpoint;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.GetRecordsCache;
-import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput;
+import software.amazon.kinesis.retrieval.KinesisDataFetcher;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
+import software.amazon.kinesis.lifecycle.InitializationInput;
+import software.amazon.kinesis.metrics.MetricsHelper;
+import software.amazon.kinesis.metrics.MetricsLevel;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java

@@ -23,12 +23,18 @@ 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 software.amazon.kinesis.lifecycle.ProcessRecordsInput;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope;
+import software.amazon.kinesis.metrics.MetricsHelper;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
+import software.amazon.kinesis.metrics.IMetricsScope;
+import software.amazon.kinesis.metrics.MetricsLevel;
 import com.google.common.collect.ImmutableSet;
 
 import lombok.Getter;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
+import software.amazon.kinesis.retrieval.DataFetchingStrategy;
+import software.amazon.kinesis.retrieval.KinesisProxy;
+import software.amazon.kinesis.retrieval.RecordsFetcherFactory;
+import software.amazon.kinesis.retrieval.SimpleRecordsFetcherFactory;
 
 /**
  * Configuration for the Amazon Kinesis Client Library.
@@ -994,11 +1000,11 @@ public class KinesisClientLibConfiguration {
      * <p>
      * 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
      * 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
      * <a href=
      * "http://docs.aws.amazon.com/streams/latest/dev/monitoring-with-cloudwatch.html#kinesis-metrics-stream">CloudWatch
      * Metric: GetRecords.MillisBehindLatest</a>
@@ -1407,7 +1413,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 +1424,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) {

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinator.java

@@ -27,16 +27,16 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibE
 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 software.amazon.kinesis.processor.ICheckpoint;
-import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint;
+import software.amazon.kinesis.checkpoint.Checkpoint;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.impl.LeaseCoordinator;
+import software.amazon.kinesis.leases.LeaseCoordinator;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.ILeaseManager;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory;
+import software.amazon.kinesis.metrics.IMetricsFactory;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/MetricsCollectingTaskDecorator.java

@@ -14,9 +14,9 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.metrics.MetricsHelper;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory;
+import software.amazon.kinesis.metrics.IMetricsFactory;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
+import software.amazon.kinesis.metrics.MetricsLevel;
 
 /**
  * Decorates an ITask and reports metrics about its timing and success/failure.

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointer.java

@@ -18,9 +18,9 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.InvalidStateExcep
 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 software.amazon.kinesis.processor.IPreparedCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
+import software.amazon.kinesis.processor.IRecordProcessorCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
 
 /**
  * Objects of this class are prepared to checkpoint at a specific sequence number. They use an

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTask.java

@@ -19,15 +19,17 @@ import java.util.List;
 import java.util.ListIterator;
 
 import com.amazonaws.services.cloudwatch.model.StandardUnit;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.GetRecordsCache;
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxyExtended;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.IKinesisProxyExtended;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.retrieval.KinesisDataFetcher;
-import com.amazonaws.services.kinesis.clientlibrary.types.UserRecord;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.lifecycle.ProcessRecordsInput;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope;
+import software.amazon.kinesis.retrieval.kpl.UserRecord;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
+import software.amazon.kinesis.metrics.MetricsHelper;
+import software.amazon.kinesis.metrics.IMetricsScope;
+import software.amazon.kinesis.metrics.MetricsLevel;
 import com.amazonaws.services.kinesis.model.ExpiredIteratorException;
 import com.amazonaws.services.kinesis.model.ProvisionedThroughputExceededException;
 import com.amazonaws.services.kinesis.model.Record;

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointer.java

@@ -19,14 +19,14 @@ import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibD
 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.interfaces.ICheckpoint;
+import software.amazon.kinesis.processor.ICheckpoint;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer;
+import software.amazon.kinesis.processor.IPreparedCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
+import software.amazon.kinesis.processor.IRecordProcessorCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.clientlibrary.types.UserRecord;
+import software.amazon.kinesis.retrieval.kpl.UserRecord;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.metrics.MetricsHelper;
-import com.amazonaws.services.kinesis.metrics.impl.ThreadSafeMetricsDelegatingScope;
+import software.amazon.kinesis.metrics.ThreadSafeMetricsDelegatingScope;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory;
+import software.amazon.kinesis.metrics.IMetricsFactory;
 import com.amazonaws.services.kinesis.model.Record;
 
 import lombok.extern.slf4j.Slf4j;

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidator.java

@@ -17,8 +17,8 @@ package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException;
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException;
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
 import com.amazonaws.services.kinesis.model.InvalidArgumentException;
 import com.amazonaws.services.kinesis.model.ProvisionedThroughputExceededException;
 import com.amazonaws.services.kinesis.model.ShardIteratorType;

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumer.java

@@ -21,15 +21,20 @@ import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.BlockedOnParentShardException;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint;
+import software.amazon.kinesis.processor.ICheckpoint;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.ILeaseManager;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory;
+import software.amazon.kinesis.metrics.IMetricsFactory;
 import com.google.common.annotations.VisibleForTesting;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import software.amazon.kinesis.retrieval.AsynchronousGetRecordsRetrievalStrategy;
+import software.amazon.kinesis.retrieval.GetRecordsCache;
+import software.amazon.kinesis.retrieval.GetRecordsRetrievalStrategy;
+import software.amazon.kinesis.retrieval.KinesisDataFetcher;
+import software.amazon.kinesis.retrieval.SynchronousGetRecordsRetrievalStrategy;
 
 /**
  * Responsible for consuming data records of a (specified) shard.

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerShutdownNotification.java

@@ -16,9 +16,9 @@ package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
 import java.util.concurrent.CountDownLatch;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware;
+import software.amazon.kinesis.processor.v2.IShutdownNotificationAware;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.impl.LeaseCoordinator;
+import software.amazon.kinesis.leases.LeaseCoordinator;
 
 /**
  * Contains callbacks for completion of stages in a requested record processor shutdown.

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfo.java

@@ -22,7 +22,7 @@ import java.util.List;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
 
 /**
  * Used to pass shard related info among different classes and as a key to the map of shard consumers.

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTask.java

@@ -14,9 +14,9 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.ILeaseManager;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskManager.java

@@ -19,10 +19,10 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.ILeaseManager;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory;
+import software.amazon.kinesis.metrics.IMetricsFactory;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncer.java

@@ -29,15 +29,15 @@ import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException;
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.ILeaseManager;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.metrics.MetricsHelper;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
+import software.amazon.kinesis.metrics.MetricsLevel;
 import com.amazonaws.services.kinesis.model.Shard;
 
 import lombok.extern.slf4j.Slf4j;

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownNotification.java

@@ -14,7 +14,8 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput;
+import software.amazon.kinesis.lifecycle.ShutdownInput;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
 
 /**
  * A shutdown request to the ShardConsumer
@@ -29,7 +30,7 @@ public interface ShutdownNotification {
 
     /**
      * Used to indicate that the record processor has completed the call to
-     * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor#shutdown(ShutdownInput)} has
+     * {@link IRecordProcessor#shutdown(ShutdownInput)} has
      * completed.
      */
     void shutdownComplete();

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownNotificationTask.java

@@ -14,9 +14,9 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
+import software.amazon.kinesis.processor.IRecordProcessorCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware;
+import software.amazon.kinesis.processor.v2.IShutdownNotificationAware;
 
 /**
  * Notifies record processor of incoming shutdown request, and gives them a chance to checkpoint.

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownReason.java

@@ -14,7 +14,9 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput;
+import software.amazon.kinesis.lifecycle.ShutdownInput;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
+
 import static com.amazonaws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ConsumerState;
 import static com.amazonaws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ShardConsumerState;
 
@@ -46,7 +48,7 @@ public enum ShutdownReason {
     /**
      * Indicates that the entire application is being shutdown, and if desired the record processor will be given a
      * final chance to checkpoint. This state will not trigger a direct call to
-     * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor#shutdown(ShutdownInput)}, but
+     * {@link IRecordProcessor#shutdown(ShutdownInput)}, but
      * instead depend on a different interface for backward compatibility.
      */
     REQUESTED(1, ShardConsumerState.SHUTDOWN_REQUESTED.getConsumerState());

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTask.java

@@ -14,14 +14,15 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.GetRecordsCache;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.lifecycle.ShutdownInput;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.leases.ILeaseManager;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
+import software.amazon.kinesis.metrics.MetricsHelper;
+import software.amazon.kinesis.metrics.MetricsLevel;
 import com.google.common.annotations.VisibleForTesting;
 
 import lombok.extern.slf4j.Slf4j;

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/StreamConfig.java

@@ -14,7 +14,7 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
 
 /**
  * Used to capture stream configuration and pass it along.

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/V1ToV2RecordProcessorAdapter.java

@@ -14,21 +14,21 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.types.InitializationInput;
+import software.amazon.kinesis.lifecycle.InitializationInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ProcessRecordsInput;
+import software.amazon.kinesis.lifecycle.ProcessRecordsInput;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownInput;
+import software.amazon.kinesis.lifecycle.ShutdownInput;
 
 /**
- * Adapts a V1 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor IRecordProcessor}
+ * Adapts a V1 {@link software.amazon.kinesis.processor.IRecordProcessor IRecordProcessor}
- * to V2 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor IRecordProcessor}.
+ * to V2 {@link IRecordProcessor IRecordProcessor}.
  */
 class V1ToV2RecordProcessorAdapter implements IRecordProcessor {
 
-    private com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor recordProcessor;
+    private software.amazon.kinesis.processor.IRecordProcessor recordProcessor;
     
     V1ToV2RecordProcessorAdapter(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor recordProcessor) {
+            software.amazon.kinesis.processor.IRecordProcessor recordProcessor) {
         this.recordProcessor = recordProcessor;
     }
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/V1ToV2RecordProcessorFactoryAdapter.java

@@ -14,20 +14,20 @@
  */
 package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory;
+import software.amazon.kinesis.processor.v2.IRecordProcessorFactory;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
 
 /**
- * Adapts a V1 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory
+ * Adapts a V1 {@link software.amazon.kinesis.processor.IRecordProcessorFactory
  * IRecordProcessorFactory} to V2
- * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory IRecordProcessorFactory}.
+ * {@link IRecordProcessorFactory IRecordProcessorFactory}.
  */
 class V1ToV2RecordProcessorFactoryAdapter implements IRecordProcessorFactory {
 
-    private com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory factory;
+    private software.amazon.kinesis.processor.IRecordProcessorFactory factory;
 
     V1ToV2RecordProcessorFactoryAdapter(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory factory) {
+            software.amazon.kinesis.processor.IRecordProcessorFactory factory) {
         this.factory = factory;
     }
 

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java

@@ -40,20 +40,20 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClient;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.ICheckpoint;
+import software.amazon.kinesis.processor.ICheckpoint;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory;
+import software.amazon.kinesis.processor.v2.IRecordProcessorFactory;
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware;
+import software.amazon.kinesis.processor.v2.IShutdownNotificationAware;
-import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
+import software.amazon.kinesis.retrieval.IKinesisProxy;
-import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisProxy;
+import software.amazon.kinesis.retrieval.KinesisProxy;
-import com.amazonaws.services.kinesis.leases.exceptions.LeasingException;
+import software.amazon.kinesis.leases.exceptions.LeasingException;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
+import software.amazon.kinesis.leases.KinesisClientLease;
-import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager;
+import software.amazon.kinesis.leases.KinesisClientLeaseManager;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.leases.ILeaseManager;
-import com.amazonaws.services.kinesis.metrics.impl.CWMetricsFactory;
+import software.amazon.kinesis.metrics.CWMetricsFactory;
-import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory;
+import software.amazon.kinesis.metrics.NullMetricsFactory;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory;
+import software.amazon.kinesis.metrics.IMetricsFactory;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
+import software.amazon.kinesis.metrics.MetricsLevel;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
@@ -132,7 +132,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config) {
         this(recordProcessorFactory, config, getExecutorService());
     }
@@ -152,7 +152,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, ExecutorService execService) {
         this(recordProcessorFactory, config,
                 new AmazonKinesisClient(config.getKinesisCredentialsProvider(), config.getKinesisClientConfiguration()),
@@ -176,7 +176,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, IMetricsFactory metricsFactory) {
         this(recordProcessorFactory, config, metricsFactory, getExecutorService());
     }
@@ -196,7 +196,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, IMetricsFactory metricsFactory, ExecutorService execService) {
         this(recordProcessorFactory, config,
                 new AmazonKinesisClient(config.getKinesisCredentialsProvider(), config.getKinesisClientConfiguration()),
@@ -222,7 +222,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, AmazonKinesis kinesisClient, AmazonDynamoDB dynamoDBClient,
             AmazonCloudWatch cloudWatchClient) {
         this(recordProcessorFactory, config, kinesisClient, dynamoDBClient, cloudWatchClient, getExecutorService());
@@ -247,7 +247,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, AmazonKinesis kinesisClient, AmazonDynamoDB dynamoDBClient,
             AmazonCloudWatch cloudWatchClient, ExecutorService execService) {
         this(recordProcessorFactory, config, kinesisClient, dynamoDBClient, getMetricsFactory(cloudWatchClient, config),
@@ -275,7 +275,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, AmazonKinesisClient kinesisClient,
             AmazonDynamoDBClient dynamoDBClient, AmazonCloudWatchClient cloudWatchClient) {
         this(recordProcessorFactory, config, (AmazonKinesis) kinesisClient, (AmazonDynamoDB) dynamoDBClient,
@@ -304,7 +304,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, AmazonKinesisClient kinesisClient,
             AmazonDynamoDBClient dynamoDBClient, AmazonCloudWatchClient cloudWatchClient, ExecutorService execService) {
         this(recordProcessorFactory, config, (AmazonKinesis) kinesisClient, (AmazonDynamoDB) dynamoDBClient,
@@ -333,7 +333,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, AmazonKinesisClient kinesisClient,
             AmazonDynamoDBClient dynamoDBClient, IMetricsFactory metricsFactory, ExecutorService execService) {
         this(recordProcessorFactory, config, (AmazonKinesis) kinesisClient, (AmazonDynamoDB) dynamoDBClient,
@@ -359,7 +359,7 @@ public class Worker implements Runnable {
      */
     @Deprecated
     public Worker(
-            com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory,
+            software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory,
             KinesisClientLibConfiguration config, AmazonKinesis kinesisClient, AmazonDynamoDB dynamoDBClient,
             IMetricsFactory metricsFactory, ExecutorService execService) {
         this(config.getApplicationName(), new V1ToV2RecordProcessorFactoryAdapter(recordProcessorFactory),
@@ -1151,7 +1151,7 @@ public class Worker implements Runnable {
         private WorkerStateChangeListener workerStateChangeListener;
 
         /**
-         * Provide a V1 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor
+         * Provide a V1 {@link software.amazon.kinesis.processor.IRecordProcessor
          * IRecordProcessor}.
          *
          * @param recordProcessorFactory
@@ -1159,13 +1159,13 @@ public class Worker implements Runnable {
          * @return A reference to this updated object so that method calls can be chained together.
          */
         public Builder recordProcessorFactory(
-                com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory recordProcessorFactory) {
+                software.amazon.kinesis.processor.IRecordProcessorFactory recordProcessorFactory) {
             this.recordProcessorFactory = new V1ToV2RecordProcessorFactoryAdapter(recordProcessorFactory);
             return this;
         }
 
         /**
-         * Provide a V2 {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor
+         * Provide a V2 {@link IRecordProcessor
          * IRecordProcessor}.
          *
          * @param recordProcessorFactory

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyExtended.java

@@ -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);
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/IKinesisProxyFactory.java

@@ -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);
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/DependencyException.java

@@ -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);
-    }
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/InvalidStateException.java

@@ -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);
-    }
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/LeasingException.java

@@ -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;
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/exceptions/ProvisionedThroughputException.java

@@ -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);
-    }
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/leases/interfaces/IKinesisClientLeaseManager.java

@@ -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<KinesisClientLease> {
-
-    /**
-     * 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;
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/AccumulateByNameMetricsScope.java

@@ -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<String> {
-
-    @Override
-    protected String getKey(String name) {
-        return name;
-    }
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/LogMetricsFactory.java

@@ -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();
-    }
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsFactory.java

@@ -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;
-    }
-
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/NullMetricsScope.java

@@ -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() {
-
-    }
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/impl/ThreadSafeMetricsDelegatingFactory.java

@@ -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());
-    }
-}

amazon-kinesis-client/src/main/java/com/amazonaws/services/kinesis/metrics/interfaces/IMetricsFactory.java

@@ -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();
-}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/checkpoint/Checkpoint.java

@@ -1,6 +1,20 @@
-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.
+ */
+package software.amazon.kinesis.checkpoint;
 
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
 import lombok.Data;
 
 /**

amazon-kinesis-client/src/main/java/software/amazon/kinesis/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint;
+package software.amazon.kinesis.checkpoint;
 
 /**
  * Enumeration of the sentinel values of checkpoints.

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.util;
+package software.amazon.kinesis.leases;
 
 import java.util.ArrayList;
 import java.util.Collection;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/IKinesisClientLeaseManager.java

@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Amazon Software License (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ *  or in the "license" file accompanying this file. This file is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+package software.amazon.kinesis.leases;
+
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
+
+/**
+ * A decoration of ILeaseManager that adds methods to get/update checkpoints.
+ */
+public interface IKinesisClientLeaseManager extends ILeaseManager<KinesisClientLease> {
+
+    /**
+     * 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;
+
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.interfaces;
+package software.amazon.kinesis.leases;
 
 import java.util.List;
 
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.impl.Lease;
+import software.amazon.kinesis.leases.Lease;
 
 /**
  * Supports basic CRUD operations for Leases.

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.interfaces;
+package software.amazon.kinesis.leases;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
 
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.impl.Lease;
+import software.amazon.kinesis.leases.Lease;
 
 /**
  * ILeaseRenewer objects are used by LeaseCoordinator to renew leases held by the LeaseCoordinator. Each

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.interfaces;
+package software.amazon.kinesis.leases;
 
 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.kinesis.leases.Lease;
 
 /**
  * Utility class that manages the mapping of Lease objects/operations to records in DynamoDB.

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.interfaces;
+package software.amazon.kinesis.leases;
 
 import java.util.Map;
 
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.impl.Lease;
+import software.amazon.kinesis.leases.Lease;
 
 /**
  * ILeaseTaker is used by LeaseCoordinator to take new leases, or leases that other workers fail to renew. Each

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/KinesisClientLease.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.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
 
 /**
  * A Lease subclass containing KinesisClientLibrary related fields for checkpoints.

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/KinesisClientLeaseManager.java

@@ -1,25 +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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.impl;
+package software.amazon.kinesis.leases;
 
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.interfaces.IKinesisClientLeaseManager;
 
 /**
  * An implementation of LeaseManager for the KinesisClientLibrary - takeLease updates the ownerSwitchesSinceCheckpoint field.

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/KinesisClientLeaseSerializer.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.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.Collection;
 import java.util.Map;
@@ -23,9 +23,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.clientlibrary.types.ExtendedSequenceNumber;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseSerializer;
-import com.amazonaws.services.kinesis.leases.util.DynamoUtils;
 import com.google.common.base.Strings;
 
 /**

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/Lease.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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCoordinator.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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.Collection;
 import java.util.Map;
@@ -27,18 +27,15 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration;
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.LeasingException;
+import software.amazon.kinesis.leases.exceptions.LeasingException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.metrics.LogMetricsFactory;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseRenewer;
+import software.amazon.kinesis.metrics.MetricsHelper;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseTaker;
+import software.amazon.kinesis.metrics.IMetricsFactory;
-import com.amazonaws.services.kinesis.metrics.impl.LogMetricsFactory;
+import software.amazon.kinesis.metrics.IMetricsScope;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.metrics.MetricsLevel;
-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 com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import lombok.extern.slf4j.Slf4j;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseManager.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.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,11 +40,9 @@ import com.amazonaws.services.dynamodbv2.model.ScanRequest;
 import com.amazonaws.services.dynamodbv2.model.ScanResult;
 import com.amazonaws.services.dynamodbv2.model.TableStatus;
 import com.amazonaws.services.dynamodbv2.model.UpdateItemRequest;
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseSerializer;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseRenewer.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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,15 +30,13 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import com.amazonaws.services.cloudwatch.model.StandardUnit;
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.metrics.MetricsHelper;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseRenewer;
+import software.amazon.kinesis.metrics.ThreadSafeMetricsDelegatingScope;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.metrics.IMetricsScope;
-import com.amazonaws.services.kinesis.metrics.impl.ThreadSafeMetricsDelegatingScope;
+import software.amazon.kinesis.metrics.MetricsLevel;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseSerializer.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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,8 +28,6 @@ import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
 import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
 import com.amazonaws.services.dynamodbv2.model.KeyType;
 import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseSerializer;
-import com.amazonaws.services.kinesis.leases.util.DynamoUtils;
 
 /**
  * An implementation of ILeaseSerializer for basic Lease objects. Can also instantiate subclasses of Lease so that

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseTaker.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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.leases.impl;
+package software.amazon.kinesis.leases;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,14 +27,12 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 import com.amazonaws.services.cloudwatch.model.StandardUnit;
-import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
+import software.amazon.kinesis.leases.exceptions.DependencyException;
-import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
+import software.amazon.kinesis.leases.exceptions.InvalidStateException;
-import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
+import software.amazon.kinesis.leases.exceptions.ProvisionedThroughputException;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
+import software.amazon.kinesis.metrics.MetricsHelper;
-import com.amazonaws.services.kinesis.leases.interfaces.ILeaseTaker;
+import software.amazon.kinesis.metrics.IMetricsScope;
-import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
+import software.amazon.kinesis.metrics.MetricsLevel;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
 
 import lombok.extern.slf4j.Slf4j;
 

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/exceptions/DependencyException.java

@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Amazon Software License (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ *  or in the "license" file accompanying this file. This file is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+package software.amazon.kinesis.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);
+    }
+
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/exceptions/InvalidStateException.java

@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Amazon Software License (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ *  or in the "license" file accompanying this file. This file is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+package software.amazon.kinesis.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);
+    }
+
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/exceptions/LeasingException.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.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;
+
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/exceptions/ProvisionedThroughputException.java

@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Amazon Software License (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ *  or in the "license" file accompanying this file. This file is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+package software.amazon.kinesis.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);
+    }
+
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/InitializationInput.java

@@ -12,11 +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.types;
+package software.amazon.kinesis.lifecycle;
+
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
+import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber;
 
 /**
  * Container for the parameters to the IRecordProcessor's
- * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor#initialize(InitializationInput
+ * {@link IRecordProcessor#initialize(InitializationInput
  * initializationInput) initialize} method.
  */
 public class InitializationInput {

amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ProcessRecordsInput.java

@@ -12,20 +12,21 @@
  *  express or implied. See the License for the specific language governing
  *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.clientlibrary.types;
+package software.amazon.kinesis.lifecycle;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
+import software.amazon.kinesis.processor.IRecordProcessorCheckpointer;
 import com.amazonaws.services.kinesis.model.Record;
 
 import lombok.Getter;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
 
 /**
  * Container for the parameters to the IRecordProcessor's
- * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor#processRecords(
+ * {@link IRecordProcessor#processRecords(
  * ProcessRecordsInput processRecordsInput) processRecords} method.
  */
 public class ProcessRecordsInput {

amazon-kinesis-client/src/main/java/software/amazon/kinesis/lifecycle/ShutdownInput.java

@@ -12,14 +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.types;
+package software.amazon.kinesis.lifecycle;
 
-import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
+import software.amazon.kinesis.processor.IRecordProcessorCheckpointer;
 import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason;
+import software.amazon.kinesis.processor.v2.IRecordProcessor;
 
 /**
  * Container for the parameters to the IRecordProcessor's
- * {@link com.amazonaws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor#shutdown(ShutdownInput
+ * {@link IRecordProcessor#shutdown(ShutdownInput
  * shutdownInput) shutdown} method.
  */
 public class ShutdownInput {

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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.kinesis.metrics;
+
+/**
+ * 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<String> {
+
+    @Override
+    protected String getKey(String name) {
+        return name;
+    }
+
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +20,6 @@ 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;
 
 /**
  * An IMetricsScope that accumulates data from multiple calls to addData with

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.List;
 import java.util.Objects;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.Set;
 
@@ -21,9 +21,6 @@ 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 com.google.common.collect.ImmutableSet;
 
 /**

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/CWMetricsScope.java

@@ -1,26 +1,24 @@
 /*
- * 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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 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;
 
 /**
  * Metrics scope for CloudWatch metrics.

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.Collection;
 import java.util.List;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.ArrayList;
 import java.util.List;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/DimensionTrackingMetricsScope.java

@@ -1,24 +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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import com.amazonaws.services.cloudwatch.model.Dimension;
-import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsScope;
 
 /**
  * DimensionTrackingMetricsScope is where we provide functionality for dimensions.

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/EndingMetricsScope.java

@@ -1,21 +1,20 @@
 /*
- * 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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import com.amazonaws.services.cloudwatch.model.StandardUnit;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
 
 public abstract class EndingMetricsScope extends DimensionTrackingMetricsScope {
 

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/FilteringMetricsScope.java

@@ -1,23 +1,22 @@
 /*
- * 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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.Set;
 
 import com.amazonaws.services.cloudwatch.model.StandardUnit;
-import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel;
 import com.google.common.collect.ImmutableSet;
 
 /**

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.List;
 

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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.kinesis.metrics;
+
+/**
+ * Factory for MetricsScope objects.
+ */
+public interface IMetricsFactory {
+    /**
+     * @return a new IMetricsScope object of the type constructed by this factory.
+     */
+    public IMetricsScope createMetrics();
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.interfaces;
+package software.amazon.kinesis.metrics;
 
 import com.amazonaws.services.cloudwatch.model.StandardUnit;
 

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/InterceptingMetricsFactory.java

@@ -1,23 +1,20 @@
 /*
- * 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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 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;
 
 public abstract class InterceptingMetricsFactory implements IMetricsFactory {
 

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/LogMetricsFactory.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.kinesis.metrics;
+
+/**
+ * An IMetricsFactory that creates IMetricsScopes that output themselves via log4j.
+ */
+public class LogMetricsFactory implements IMetricsFactory {
+
+    @Override
+    public LogMetricsScope createMetrics() {
+        return new LogMetricsScope();
+    }
+
+}

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import com.amazonaws.services.cloudwatch.model.Dimension;
 import com.amazonaws.services.cloudwatch.model.MetricDatum;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.ArrayList;
 import java.util.HashMap;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/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").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 import java.util.Objects;
 import com.amazonaws.services.cloudwatch.model.MetricDatum;

amazon-kinesis-client/src/main/java/software/amazon/kinesis/metrics/MetricsHelper.java

@@ -1,23 +1,20 @@
 /*
- * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
- * Licensed under the Amazon Software License (the "License").
+ *  Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the License.
+ *  You may not use this file except in compliance with the License.
- * A copy of the License is located at
+ *  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
+ *  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
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
+ *  express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ *  permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.metrics.impl;
+package software.amazon.kinesis.metrics;
 
 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 lombok.extern.slf4j.Slf4j;