From 1d400ad8536f8d2b9798acc850660a0d758562f4 Mon Sep 17 00:00:00 2001 From: Sahil Palvia Date: Tue, 13 Mar 2018 15:45:59 -0700 Subject: [PATCH] Updating the java packages for src/test/java for multilang from com.amazonaws.services.kinesis to software.amazon.aws.services.kinesis. --- .../services/kinesis/multilang/Matchers.java | 2 +- .../kinesis/multilang/MessageReaderTest.java | 20 +++++++++---------- .../kinesis/multilang/MessageWriterTest.java | 2 +- .../multilang/MultiLangDaemonConfigTest.java | 2 +- .../multilang/MultiLangDaemonTest.java | 20 +++++++++---------- .../multilang/MultiLangProtocolTest.java | 5 +---- .../kinesis/multilang/ReadSTDERRTaskTest.java | 20 +++++++++---------- .../StreamingRecordProcessorFactoryTest.java | 2 +- .../StreamingRecordProcessorTest.java | 6 +----- ...tialsProviderPropertyValueDecoderTest.java | 6 +++--- .../KinesisClientLibConfiguratorTest.java | 12 +++++------ .../multilang/messages/MessageTest.java | 2 +- 12 files changed, 46 insertions(+), 53 deletions(-) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/Matchers.java (98%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/MessageReaderTest.java (92%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/MessageWriterTest.java (99%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/MultiLangDaemonConfigTest.java (98%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/MultiLangDaemonTest.java (72%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/MultiLangProtocolTest.java (97%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/ReadSTDERRTaskTest.java (82%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java (96%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/StreamingRecordProcessorTest.java (97%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/config/AWSCredentialsProviderPropertyValueDecoderTest.java (91%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java (96%) rename amazon-kinesis-client-multilang/src/test/java/{com/amazonaws => software/amazon/aws}/services/kinesis/multilang/messages/MessageTest.java (98%) diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/Matchers.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/Matchers.java similarity index 98% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/Matchers.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/Matchers.java index 6454b8b2..0f30fe1b 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/Matchers.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/Matchers.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageReaderTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MessageReaderTest.java similarity index 92% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageReaderTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MessageReaderTest.java index ddea7203..95441ed9 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageReaderTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MessageReaderTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MessageWriterTest.java similarity index 99% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MessageWriterTest.java index 5e369771..ca54ae80 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MessageWriterTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MessageWriterTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import java.io.IOException; import java.io.OutputStream; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfigTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangDaemonConfigTest.java similarity index 98% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfigTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangDaemonConfigTest.java index e434e025..aff424a0 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonConfigTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangDaemonConfigTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import static org.junit.Assert.assertNotNull; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangDaemonTest.java similarity index 72% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangDaemonTest.java index d18b8b36..ab6e7d26 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangDaemonTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangDaemonTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import java.io.PrintStream; import java.util.concurrent.Executors; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangProtocolTest.java similarity index 97% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangProtocolTest.java index 53ff651d..e2db42ef 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/MultiLangProtocolTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/MultiLangProtocolTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; @@ -37,9 +37,6 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import software.amazon.aws.services.kinesis.multilang.MessageReader; -import software.amazon.aws.services.kinesis.multilang.MessageWriter; -import software.amazon.aws.services.kinesis.multilang.MultiLangProtocol; import java.util.ArrayList; import java.util.Collections; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/ReadSTDERRTaskTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/ReadSTDERRTaskTest.java similarity index 82% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/ReadSTDERRTaskTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/ReadSTDERRTaskTest.java index bbe53acf..7b86b2dd 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/ReadSTDERRTaskTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/ReadSTDERRTaskTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java similarity index 96% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java index e731cd70..150882b8 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/StreamingRecordProcessorFactoryTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import software.amazon.aws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration; import org.junit.Assert; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/StreamingRecordProcessorTest.java similarity index 97% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/StreamingRecordProcessorTest.java index 43244b8b..c5d98e52 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/StreamingRecordProcessorTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/StreamingRecordProcessorTest.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.multilang; +package software.amazon.aws.services.kinesis.multilang; import software.amazon.aws.services.kinesis.clientlibrary.exceptions.InvalidStateException; import software.amazon.aws.services.kinesis.clientlibrary.exceptions.KinesisClientLibDependencyException; @@ -41,10 +41,6 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import software.amazon.aws.services.kinesis.multilang.DrainChildSTDERRTask; -import software.amazon.aws.services.kinesis.multilang.MessageReader; -import software.amazon.aws.services.kinesis.multilang.MessageWriter; -import software.amazon.aws.services.kinesis.multilang.MultiLangRecordProcessor; import java.io.IOException; import java.io.InputStream; diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/AWSCredentialsProviderPropertyValueDecoderTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/config/AWSCredentialsProviderPropertyValueDecoderTest.java similarity index 91% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/AWSCredentialsProviderPropertyValueDecoderTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/config/AWSCredentialsProviderPropertyValueDecoderTest.java index 16029a84..923e36a3 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/AWSCredentialsProviderPropertyValueDecoderTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/config/AWSCredentialsProviderPropertyValueDecoderTest.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.multilang.config; +package software.amazon.aws.services.kinesis.multilang.config; import static org.junit.Assert.assertEquals; @@ -30,9 +30,9 @@ public class AWSCredentialsProviderPropertyValueDecoderTest { private static final String TEST_SECRET_KEY = "456"; private String credentialName1 = - "com.amazonaws.services.kinesis.multilang.config.AWSCredentialsProviderPropertyValueDecoderTest$AlwaysSucceedCredentialsProvider"; + "software.amazon.aws.services.kinesis.multilang.config.AWSCredentialsProviderPropertyValueDecoderTest$AlwaysSucceedCredentialsProvider"; private String credentialName2 = - "com.amazonaws.services.kinesis.multilang.config.AWSCredentialsProviderPropertyValueDecoderTest$ConstructorCredentialsProvider"; + "software.amazon.aws.services.kinesis.multilang.config.AWSCredentialsProviderPropertyValueDecoderTest$ConstructorCredentialsProvider"; private AWSCredentialsProviderPropertyValueDecoder decoder = new AWSCredentialsProviderPropertyValueDecoder(); @Test diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java similarity index 96% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java index e2a2fe1e..4915bf03 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/config/KinesisClientLibConfiguratorTest.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.multilang.config; +package software.amazon.aws.services.kinesis.multilang.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,15 +39,15 @@ import software.amazon.aws.services.kinesis.multilang.config.KinesisClientLibCon public class KinesisClientLibConfiguratorTest { private String credentialName1 = - "com.amazonaws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProvider"; + "software.amazon.aws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProvider"; private String credentialName2 = - "com.amazonaws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysFailCredentialsProvider"; + "software.amazon.aws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysFailCredentialsProvider"; private String credentialNameKinesis = - "com.amazonaws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProviderKinesis"; + "software.amazon.aws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProviderKinesis"; private String credentialNameDynamoDB = - "com.amazonaws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProviderDynamoDB"; + "software.amazon.aws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProviderDynamoDB"; private String credentialNameCloudWatch = - "com.amazonaws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProviderCloudWatch"; + "software.amazon.aws.services.kinesis.multilang.config.KinesisClientLibConfiguratorTest$AlwaysSucceedCredentialsProviderCloudWatch"; private KinesisClientLibConfigurator configurator = new KinesisClientLibConfigurator(); @Test diff --git a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/messages/MessageTest.java similarity index 98% rename from amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java rename to amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/messages/MessageTest.java index 1f77e734..435227b6 100644 --- a/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/messages/MessageTest.java +++ b/amazon-kinesis-client-multilang/src/test/java/software/amazon/aws/services/kinesis/multilang/messages/MessageTest.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.multilang.messages; +package software.amazon.aws.services.kinesis.multilang.messages; import java.nio.ByteBuffer; import java.util.ArrayList;