diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImplTest.java b/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImplTest.java deleted file mode 100644 index 04408b36..00000000 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImplTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/asl/ - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint; - -import org.junit.Before; - - -/** - * Test the InMemoryCheckpointImplTest class. - */ -public class InMemoryCheckpointImplTest extends CheckpointImplTestBase { - /** - * Constructor. - */ - public InMemoryCheckpointImplTest() { - super(); - } - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - checkpoint = new InMemoryCheckpointImpl(startingSequenceNumber); - } - -} diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java similarity index 92% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java index 939f4580..f3d225c0 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/CheckpointImplTestBase.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint; +package software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint; import org.junit.After; import org.junit.AfterClass; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java similarity index 88% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java index 19345970..8518f9e0 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImpl.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint; +package software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint; import java.util.HashMap; import java.util.Map; diff --git a/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImplTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImplTest.java new file mode 100644 index 00000000..3aee6227 --- /dev/null +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/checkpoint/InMemoryCheckpointImplTest.java @@ -0,0 +1,38 @@ +/* + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/asl/ + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint; + +import org.junit.Before; + + +/** + * Test the InMemoryCheckpointImplTest class. + */ +public class InMemoryCheckpointImplTest extends CheckpointImplTestBase { + /** + * Constructor. + */ + public InMemoryCheckpointImplTest() { + super(); + } + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + checkpoint = new InMemoryCheckpointImpl(startingSequenceNumber); + } + +} diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java index 76e873a3..33cdcfc2 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyIntegrationTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java index fce7f81c..bc655c55 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/AsynchronousGetRecordsRetrievalStrategyTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java similarity index 93% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java index 9b4acc7d..e3a4f3cb 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockOnParentShardTaskTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java similarity index 97% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java index 3e14ea0a..2a6f89f2 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/BlockingGetRecordsCacheTest.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java similarity index 83% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java index 639eb18c..5dc6561c 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/CheckpointValueComparatorTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import junit.framework.Assert; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java index 28822bc8..7155fd4e 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ConsumerStatesTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ConsumerState; import static software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ConsumerStates.ShardConsumerState; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java similarity index 92% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java index f8d72234..f94fda20 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ExceptionThrowingLeaseManager.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.util.Arrays; import java.util.List; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java index 856e3147..bbf22a03 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/GracefulShutdownCoordinatorTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java index 33e97e83..179da801 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java similarity index 92% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java index c16a775b..845124a1 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorIntegrationTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.util.ArrayList; import java.util.Collections; @@ -30,7 +30,6 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibLeaseCoordinator; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java similarity index 81% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java index 43faa12f..3a68e86c 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibLeaseCoordinatorTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.doReturn; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java index ea65244e..77aa6974 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/KinesisDataFetcherTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java index 7458e070..e0a375c9 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ParentsFirstShardPrioritizationUnitTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java index e511dc11..2feae459 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheIntegrationTest.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java index a42e6337..77e42655 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PrefetchGetRecordsCacheTest.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java similarity index 77% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java index 60c973be..a8dedc25 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/PreparedCheckpointerTest.java @@ -1,4 +1,19 @@ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +/* + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/asl/ + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java index 498c4b75..eeb238ed 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ProcessTaskTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java similarity index 97% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java index 1fefc7aa..739a1e7f 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/RecordProcessorCheckpointerTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -26,10 +26,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map.Entry; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.DoesNothingPreparedCheckpointer; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SequenceNumberValidator; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; import org.junit.After; import org.junit.Assert; @@ -42,7 +38,7 @@ import org.mockito.runners.MockitoJUnitRunner; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IPreparedCheckpointer; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.InMemoryCheckpointImpl; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.InMemoryCheckpointImpl; import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.SentinelCheckpoint; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import software.amazon.aws.services.kinesis.clientlibrary.types.UserRecord; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java similarity index 76% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java index 9607a71e..cf9ae7fd 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/RecordsFetcherFactoryTest.java @@ -1,4 +1,19 @@ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +/* + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/asl/ + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java similarity index 89% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java index 18945f15..ce029ac8 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/SequenceNumberValidatorTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import junit.framework.Assert; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java similarity index 94% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java index 4d5e70be..6ec0fe48 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardConsumerTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; @@ -62,32 +62,10 @@ import org.mockito.runners.MockitoJUnitRunner; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.Checkpoint; -import com.amazonaws.services.kinesis.clientlibrary.lib.checkpoint.InMemoryCheckpointImpl; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.AsynchronousGetRecordsRetrievalStrategy; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockingGetRecordsCache; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ConsumerStates; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitializeTask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisDataFetcher; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordsFetcherFactory; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SequenceNumberValidator; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardConsumer; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownNotification; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SimpleRecordsFetcherFactory; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.StreamConfig; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SynchronousGetRecordsRetrievalStrategy; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; +import software.amazon.aws.services.kinesis.clientlibrary.lib.checkpoint.InMemoryCheckpointImpl; import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java similarity index 89% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java index f049a41d..288fc994 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardInfoTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardObjectHelper.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardObjectHelper.java similarity index 85% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardObjectHelper.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardObjectHelper.java index f154119a..73e67fec 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardObjectHelper.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardObjectHelper.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.math.BigInteger; import java.util.ArrayList; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java similarity index 75% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java index b928b416..354dae75 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSequenceVerifier.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.util.ArrayList; import java.util.Collections; @@ -25,7 +25,6 @@ import com.amazonaws.services.kinesis.model.Shard; import junit.framework.Assert; import lombok.extern.slf4j.Slf4j; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; /** * Helper class to verify shard lineage in unit tests that use TestStreamlet. diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java similarity index 88% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java index 00f43d05..2bb5ea13 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSyncTaskIntegrationTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.util.HashSet; import java.util.List; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java similarity index 98% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java index 0a9614d0..ad776419 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShardSyncerTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.io.File; import java.io.IOException; @@ -34,13 +34,10 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.local.embedded.DynamoDBEmbedded; import software.amazon.aws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; -import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ExceptionThrowingLeaseManager.ExceptionThrowingLeaseManagerMethods; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardSyncer; +import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ExceptionThrowingLeaseManager.ExceptionThrowingLeaseManagerMethods; import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java similarity index 87% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java index 4c03514d..a060ebfb 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ShutdownTaskTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; @@ -31,15 +31,6 @@ import org.junit.Test; import software.amazon.aws.services.kinesis.clientlibrary.exceptions.internal.KinesisClientLibIOException; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordProcessorCheckpointer; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownTask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskType; import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java similarity index 89% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java index 20e6e7cd..51148aaf 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/TestStreamlet.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.util.ArrayList; import java.util.HashSet; @@ -29,7 +29,6 @@ import software.amazon.aws.services.kinesis.clientlibrary.exceptions.ThrottlingE import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IShutdownNotificationAware; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java similarity index 69% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java index 2971c211..5c51f02d 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/TestStreamletFactory.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import java.util.ArrayList; import java.util.List; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java similarity index 97% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java index e950dd55..2d766423 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/ThrottlingReporterTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.never; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java similarity index 97% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java index d7a885e7..46cf7dee 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/lib/worker/WorkerTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.lib.worker; +package software.amazon.aws.services.kinesis.clientlibrary.lib.worker; import static org.hamcrest.CoreMatchers.both; import static org.hamcrest.CoreMatchers.equalTo; @@ -86,47 +86,19 @@ import software.amazon.aws.services.kinesis.clientlibrary.interfaces.ICheckpoint import software.amazon.aws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessor; import software.amazon.aws.services.kinesis.clientlibrary.interfaces.v2.IRecordProcessorFactory; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.BlockOnParentShardTask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsCache; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GetRecordsRetrievalStrategy; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.GracefulShutdownCoordinator; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ITask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStreamExtended; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.InitializeTask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibLeaseCoordinator; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.MetricsCollectingTaskDecorator; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.NoOpShardPrioritization; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.NoOpWorkerStateChangeListener; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.RecordsFetcherFactory; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardConsumer; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardInfo; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardPrioritization; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShardSyncer; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownNotificationTask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownReason; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.ShutdownTask; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.SimpleRecordsFetcherFactory; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.StreamConfig; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskResult; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.TaskType; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.V1ToV2RecordProcessorFactoryAdapter; import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker.WorkerCWMetricsFactory; import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker.WorkerThreadPoolExecutor; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.WorkerStateChangeListener; import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.WorkerStateChangeListener.WorkerState; -import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.Worker; import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisProxy; -import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import software.amazon.aws.services.kinesis.clientlibrary.types.InitializationInput; import software.amazon.aws.services.kinesis.clientlibrary.types.ProcessRecordsInput; import software.amazon.aws.services.kinesis.clientlibrary.types.ShutdownInput; import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; -import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseBuilder; +import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseBuilder; import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; import software.amazon.aws.services.kinesis.leases.impl.LeaseManager; import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseManager; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java similarity index 96% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java index 1088fdc1..f5d7681a 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxy.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.proxies; +package software.amazon.aws.services.kinesis.clientlibrary.proxies; import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java similarity index 69% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java index 4d02d6be..f552f3ae 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisLocalFileProxyFactory.java @@ -1,26 +1,24 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.proxies; +package software.amazon.aws.services.kinesis.clientlibrary.proxies; import java.io.File; import java.io.IOException; import java.math.BigInteger; -import com.amazonaws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; -import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxy; -import software.amazon.aws.services.kinesis.clientlibrary.proxies.IKinesisProxyFactory; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.util.KinesisLocalFileDataCreator; /** Factory for KinesisProxy objects that use a local file for data. Useful for testing purposes. * diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java similarity index 99% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java index 64999e38..c56f9fef 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/KinesisProxyTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.proxies; +package software.amazon.aws.services.kinesis.clientlibrary.proxies; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.equalTo; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/util/KinesisLocalFileDataCreator.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/util/KinesisLocalFileDataCreator.java similarity index 93% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/util/KinesisLocalFileDataCreator.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/util/KinesisLocalFileDataCreator.java index e5e4419a..4b93f34e 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/proxies/util/KinesisLocalFileDataCreator.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/proxies/util/KinesisLocalFileDataCreator.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.proxies.util; +package software.amazon.aws.services.kinesis.clientlibrary.proxies.util; import java.io.BufferedWriter; import java.io.File; @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.amazonaws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; +import software.amazon.aws.services.kinesis.clientlibrary.proxies.KinesisLocalFileProxy; import com.amazonaws.services.kinesis.model.HashKeyRange; import com.amazonaws.services.kinesis.model.SequenceNumberRange; import com.amazonaws.services.kinesis.model.Shard; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java similarity index 96% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java index 3a7f6739..562d1c24 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/clientlibrary/types/ShutdownReasonTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.clientlibrary.types; +package software.amazon.aws.services.kinesis.clientlibrary.types; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java similarity index 95% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java index 881a2d18..51d6d3ec 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/KinesisClientLeaseBuilder.java @@ -12,14 +12,13 @@ * 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.aws.services.kinesis.leases.impl; import java.util.HashSet; import java.util.Set; import java.util.UUID; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; -import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; public class KinesisClientLeaseBuilder { private String leaseKey; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java similarity index 93% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java index ddcd4dcc..d9f34dcc 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseCoordinatorExerciser.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.leases.impl; +package software.amazon.aws.services.kinesis.leases.impl; import java.awt.*; import java.awt.event.ActionEvent; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseIntegrationTest.java similarity index 97% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseIntegrationTest.java index a71f76b4..33ad32ff 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseIntegrationTest.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.aws.services.kinesis.leases.impl; import org.junit.Ignore; import org.junit.Rule; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java similarity index 97% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java index a341dee5..ab25c847 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseManagerIntegrationTest.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.aws.services.kinesis.leases.impl; import java.util.Collection; import java.util.List; @@ -23,9 +23,6 @@ import junit.framework.Assert; import org.junit.Test; import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; -import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; -import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; -import software.amazon.aws.services.kinesis.leases.impl.Lease; public class LeaseManagerIntegrationTest extends LeaseIntegrationTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java similarity index 98% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java index 11a493f9..670ce620 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java @@ -12,12 +12,10 @@ * 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.aws.services.kinesis.leases.impl; import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber; import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; -import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; -import software.amazon.aws.services.kinesis.leases.impl.LeaseRenewer; import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseRenewer; import org.junit.Assert; import org.junit.Before; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseRenewerTest.java similarity index 87% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseRenewerTest.java index 24edf1bf..08b8b466 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseRenewerTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.leases.impl; +package software.amazon.aws.services.kinesis.leases.impl; import java.util.ArrayList; import java.util.Arrays; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java similarity index 87% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java index dca2694b..6573c498 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseTakerIntegrationTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.leases.impl; +package software.amazon.aws.services.kinesis.leases.impl; import java.util.Map; @@ -21,8 +21,6 @@ import org.junit.Before; import org.junit.Test; import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; -import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; -import software.amazon.aws.services.kinesis.leases.impl.LeaseTaker; public class LeaseTakerIntegrationTest extends LeaseIntegrationTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseTakerTest.java similarity index 67% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseTakerTest.java index 6865be46..167251dc 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseTakerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/LeaseTakerTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.leases.impl; +package software.amazon.aws.services.kinesis.leases.impl; import java.util.ArrayList; import java.util.List; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/TestHarnessBuilder.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/TestHarnessBuilder.java similarity index 95% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/TestHarnessBuilder.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/TestHarnessBuilder.java index d39188c9..a240548c 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/leases/impl/TestHarnessBuilder.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/leases/impl/TestHarnessBuilder.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.aws.services.kinesis.leases.impl; import java.util.ArrayList; import java.util.Collections; @@ -27,9 +27,6 @@ import software.amazon.aws.services.kinesis.clientlibrary.types.ExtendedSequence import software.amazon.aws.services.kinesis.leases.exceptions.DependencyException; import software.amazon.aws.services.kinesis.leases.exceptions.InvalidStateException; import software.amazon.aws.services.kinesis.leases.exceptions.LeasingException; -import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLease; -import software.amazon.aws.services.kinesis.leases.impl.KinesisClientLeaseManager; -import software.amazon.aws.services.kinesis.leases.impl.LeaseTaker; import software.amazon.aws.services.kinesis.leases.interfaces.ILeaseRenewer; public class TestHarnessBuilder { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java similarity index 69% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java index 22fe2bf5..2dacc755 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/AccumulatingMetricsScopeTest.java @@ -1,25 +1,24 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import org.junit.Assert; import org.junit.Test; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import software.amazon.aws.services.kinesis.metrics.impl.AccumulateByNameMetricsScope; public class AccumulatingMetricsScopeTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java similarity index 86% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java index 6f580a61..a3200a85 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/CWPublisherRunnableTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.ArrayList; import java.util.List; @@ -24,10 +24,6 @@ import org.mockito.Mockito; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import software.amazon.aws.services.kinesis.metrics.impl.CWMetricKey; -import software.amazon.aws.services.kinesis.metrics.impl.CWPublisherRunnable; -import software.amazon.aws.services.kinesis.metrics.impl.ICWMetricsPublisher; -import software.amazon.aws.services.kinesis.metrics.impl.MetricDatumWithKey; public class CWPublisherRunnableTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java similarity index 81% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java index fc0bd136..c7d1bae9 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/DefaultCWMetricsPublisherTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.ArrayList; import java.util.HashMap; @@ -28,9 +28,6 @@ import com.amazonaws.services.cloudwatch.AmazonCloudWatch; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.PutMetricDataRequest; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import software.amazon.aws.services.kinesis.metrics.impl.CWMetricKey; -import software.amazon.aws.services.kinesis.metrics.impl.DefaultCWMetricsPublisher; -import software.amazon.aws.services.kinesis.metrics.impl.MetricDatumWithKey; public class DefaultCWMetricsPublisherTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java similarity index 65% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java index 1bcfb845..7b62a105 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/EndingMetricsScopeTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import org.junit.Test; diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java similarity index 87% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java index 54646c70..d4f2f875 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/FilteringMetricsScopeTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.Set; @@ -25,7 +25,6 @@ import com.amazonaws.services.cloudwatch.model.StandardUnit; import software.amazon.aws.services.kinesis.metrics.interfaces.IMetricsScope; import software.amazon.aws.services.kinesis.metrics.interfaces.MetricsLevel; import com.google.common.collect.ImmutableSet; -import software.amazon.aws.services.kinesis.metrics.impl.FilteringMetricsScope; public class FilteringMetricsScopeTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java similarity index 80% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java index d005eab2..a9cd3354 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/MetricAccumulatingQueueTest.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import java.util.Collection; import java.util.Collections; @@ -25,9 +25,6 @@ import org.junit.Test; import com.amazonaws.services.cloudwatch.model.Dimension; import com.amazonaws.services.cloudwatch.model.MetricDatum; import com.amazonaws.services.cloudwatch.model.StandardUnit; -import software.amazon.aws.services.kinesis.metrics.impl.CWMetricKey; -import software.amazon.aws.services.kinesis.metrics.impl.MetricAccumulatingQueue; -import software.amazon.aws.services.kinesis.metrics.impl.MetricDatumWithKey; public class MetricAccumulatingQueueTest { diff --git a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/TestHelper.java b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/TestHelper.java similarity index 59% rename from amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/TestHelper.java rename to amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/TestHelper.java index 195a7f94..f007a66d 100644 --- a/amazon-kinesis-client/src/test/java/com/amazonaws/services/kinesis/metrics/impl/TestHelper.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/aws/services/kinesis/metrics/impl/TestHelper.java @@ -1,18 +1,18 @@ /* - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at + * Licensed under the Amazon Software License (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at * - * http://aws.amazon.com/asl/ + * http://aws.amazon.com/asl/ * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. */ -package com.amazonaws.services.kinesis.metrics.impl; +package software.amazon.aws.services.kinesis.metrics.impl; import com.amazonaws.services.cloudwatch.model.Dimension; import com.amazonaws.services.cloudwatch.model.MetricDatum;