From 6648d9fea792cfca889c69f62ce50af6ee12392a Mon Sep 17 00:00:00 2001 From: David Venable Date: Tue, 27 Sep 2022 09:45:27 -0500 Subject: [PATCH] Updated the package for data-prepper-test-common to org.opensearch.dataprepper. (#1809) Signed-off-by: David Venable --- .../dataprepper/plugins/processor/csv/CsvProcessorIT.java | 5 ++--- .../processor/parsejson/ParseJsonProcessorConfigTest.java | 3 +-- .../dataprepper/plugins/source/CsvRecordsGenerator.java | 2 +- .../dataprepper/test/helper/ReflectivelySetField.java | 2 +- .../dataprepper/test/helper/ReflectivelySetFieldTest.java | 4 ++-- .../test/helper/ReflectivelySetFieldTestHelper.java | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) rename data-prepper-test-common/src/main/java/{com/amazon => org/opensearch}/dataprepper/test/helper/ReflectivelySetField.java (96%) rename data-prepper-test-common/src/test/java/{com/amazon => org/opensearch}/dataprepper/test/helper/ReflectivelySetFieldTest.java (91%) rename data-prepper-test-common/src/test/java/{com/amazon => org/opensearch}/dataprepper/test/helper/ReflectivelySetFieldTestHelper.java (84%) diff --git a/data-prepper-plugins/csv-processor/src/test/java/com/amazon/dataprepper/plugins/processor/csv/CsvProcessorIT.java b/data-prepper-plugins/csv-processor/src/test/java/com/amazon/dataprepper/plugins/processor/csv/CsvProcessorIT.java index 910d9e9ecf..02a5857dc2 100644 --- a/data-prepper-plugins/csv-processor/src/test/java/com/amazon/dataprepper/plugins/processor/csv/CsvProcessorIT.java +++ b/data-prepper-plugins/csv-processor/src/test/java/com/amazon/dataprepper/plugins/processor/csv/CsvProcessorIT.java @@ -8,18 +8,17 @@ import com.amazon.dataprepper.metrics.PluginMetrics; import com.amazon.dataprepper.model.event.Event; import com.amazon.dataprepper.model.record.Record; -import org.opensearch.dataprepper.plugins.source.loggenerator.logtypes.VpcFlowLogTypeGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opensearch.dataprepper.plugins.source.loggenerator.logtypes.VpcFlowLogTypeGenerator; import java.util.ArrayList; import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; - -import static com.amazon.dataprepper.test.helper.ReflectivelySetField.setField; +import static org.opensearch.dataprepper.test.helper.ReflectivelySetField.setField; public class CsvProcessorIT { private static final String PLUGIN_NAME = "csv"; diff --git a/data-prepper-plugins/parse-json-processor/src/test/java/com/amazon/dataprepper/plugins/processor/parsejson/ParseJsonProcessorConfigTest.java b/data-prepper-plugins/parse-json-processor/src/test/java/com/amazon/dataprepper/plugins/processor/parsejson/ParseJsonProcessorConfigTest.java index 63a9d37a90..694fa7e5a5 100644 --- a/data-prepper-plugins/parse-json-processor/src/test/java/com/amazon/dataprepper/plugins/processor/parsejson/ParseJsonProcessorConfigTest.java +++ b/data-prepper-plugins/parse-json-processor/src/test/java/com/amazon/dataprepper/plugins/processor/parsejson/ParseJsonProcessorConfigTest.java @@ -11,8 +11,7 @@ import static com.amazon.dataprepper.plugins.processor.parsejson.ParseJsonProcessorConfig.DEFAULT_SOURCE; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; - -import static com.amazon.dataprepper.test.helper.ReflectivelySetField.setField; +import static org.opensearch.dataprepper.test.helper.ReflectivelySetField.setField; public class ParseJsonProcessorConfigTest { diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/com/amazon/dataprepper/plugins/source/CsvRecordsGenerator.java b/data-prepper-plugins/s3-source/src/integrationTest/java/com/amazon/dataprepper/plugins/source/CsvRecordsGenerator.java index 09c839abfa..65e6294ea6 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/com/amazon/dataprepper/plugins/source/CsvRecordsGenerator.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/com/amazon/dataprepper/plugins/source/CsvRecordsGenerator.java @@ -14,9 +14,9 @@ import java.io.PrintWriter; import java.util.Random; -import static com.amazon.dataprepper.test.helper.ReflectivelySetField.setField; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import static org.opensearch.dataprepper.test.helper.ReflectivelySetField.setField; /** * Generates comma-separated CSV records where each record is on a single line. diff --git a/data-prepper-test-common/src/main/java/com/amazon/dataprepper/test/helper/ReflectivelySetField.java b/data-prepper-test-common/src/main/java/org/opensearch/dataprepper/test/helper/ReflectivelySetField.java similarity index 96% rename from data-prepper-test-common/src/main/java/com/amazon/dataprepper/test/helper/ReflectivelySetField.java rename to data-prepper-test-common/src/main/java/org/opensearch/dataprepper/test/helper/ReflectivelySetField.java index f2a1d35ac8..799274ca7a 100644 --- a/data-prepper-test-common/src/main/java/com/amazon/dataprepper/test/helper/ReflectivelySetField.java +++ b/data-prepper-test-common/src/main/java/org/opensearch/dataprepper/test/helper/ReflectivelySetField.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.test.helper; +package org.opensearch.dataprepper.test.helper; import java.lang.reflect.Field; diff --git a/data-prepper-test-common/src/test/java/com/amazon/dataprepper/test/helper/ReflectivelySetFieldTest.java b/data-prepper-test-common/src/test/java/org/opensearch/dataprepper/test/helper/ReflectivelySetFieldTest.java similarity index 91% rename from data-prepper-test-common/src/test/java/com/amazon/dataprepper/test/helper/ReflectivelySetFieldTest.java rename to data-prepper-test-common/src/test/java/org/opensearch/dataprepper/test/helper/ReflectivelySetFieldTest.java index 0fec9b0cd9..be2c46455e 100644 --- a/data-prepper-test-common/src/test/java/com/amazon/dataprepper/test/helper/ReflectivelySetFieldTest.java +++ b/data-prepper-test-common/src/test/java/org/opensearch/dataprepper/test/helper/ReflectivelySetFieldTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.test.helper; +package org.opensearch.dataprepper.test.helper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.amazon.dataprepper.test.helper.ReflectivelySetField.setField; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.opensearch.dataprepper.test.helper.ReflectivelySetField.setField; class ReflectivelySetFieldTest { private ReflectivelySetFieldTestHelper configuration; diff --git a/data-prepper-test-common/src/test/java/com/amazon/dataprepper/test/helper/ReflectivelySetFieldTestHelper.java b/data-prepper-test-common/src/test/java/org/opensearch/dataprepper/test/helper/ReflectivelySetFieldTestHelper.java similarity index 84% rename from data-prepper-test-common/src/test/java/com/amazon/dataprepper/test/helper/ReflectivelySetFieldTestHelper.java rename to data-prepper-test-common/src/test/java/org/opensearch/dataprepper/test/helper/ReflectivelySetFieldTestHelper.java index b4c724a446..fd17321638 100644 --- a/data-prepper-test-common/src/test/java/com/amazon/dataprepper/test/helper/ReflectivelySetFieldTestHelper.java +++ b/data-prepper-test-common/src/test/java/org/opensearch/dataprepper/test/helper/ReflectivelySetFieldTestHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.test.helper; +package org.opensearch.dataprepper.test.helper; public class ReflectivelySetFieldTestHelper { private String internalField = "first value";