From 48d8bc379f337b7ecab06cea4c25d8240eb00fb4 Mon Sep 17 00:00:00 2001 From: David Venable Date: Mon, 19 Sep 2022 10:37:16 -0500 Subject: [PATCH] Updated the OpenSearch sink to use the org.opensearch.dataprepper package name. Contributes to #344. (#1780) Signed-off-by: David Venable --- ...arch-sink-opendistro-integration-tests.yml | 2 +- ...arch-sink-opensearch-integration-tests.yml | 2 +- data-prepper-plugins/opensearch/build.gradle | 4 ++-- .../plugins/sink/opensearch/OpenSearchIT.java | 2 +- .../OpenSearchIntegrationHelper.java | 2 +- .../OpenSearchSecurityAccessor.java | 2 +- .../sink/opensearch/OpenSearchSinkIT.java | 24 +++++++++---------- .../AwsRequestSigningApacheInterceptor.java | 2 +- .../plugins/sink/opensearch/BackOffUtils.java | 2 +- .../sink/opensearch/BulkRetryStrategy.java | 6 ++--- .../opensearch/ConnectionConfiguration.java | 2 +- .../opensearch/ErrorCauseStringCreator.java | 2 +- .../sink/opensearch/OpenSearchSink.java | 20 ++++++++-------- .../OpenSearchSinkConfiguration.java | 4 ++-- .../sink/opensearch/RequestFunction.java | 2 +- .../sink/opensearch/RetryConfiguration.java | 2 +- .../bulk/AccumulatingBulkRequest.java | 2 +- .../sink/opensearch/bulk/BulkAction.java | 2 +- .../opensearch/bulk/BulkOperationWriter.java | 2 +- .../JavaClientAccumulatingBulkRequest.java | 2 +- .../bulk/PreSerializedJsonpMapper.java | 2 +- .../sink/opensearch/bulk/SerializedJson.java | 2 +- .../opensearch/bulk/SerializedJsonImpl.java | 2 +- .../sink/opensearch/bulk/SizedDocument.java | 2 +- .../opensearch/index/IndexConfiguration.java | 4 ++-- .../sink/opensearch/index/IndexConstants.java | 2 +- .../sink/opensearch/index/IndexManager.java | 4 ++-- .../opensearch/index/IndexManagerFactory.java | 4 ++-- .../sink/opensearch/index/IndexType.java | 2 +- .../opensearch/index/IsmPolicyManagement.java | 2 +- .../index/IsmPolicyManagementStrategy.java | 2 +- .../index/NoIsmPolicyManagement.java | 2 +- .../sink/opensearch/BackOffUtilsTests.java | 4 ++-- .../opensearch/BulkRetryStrategyTests.java | 8 +++---- .../ConnectionConfigurationTests.java | 4 ++-- .../ErrorCauseStringCreatorTest.java | 2 +- .../OpenSearchSinkConfigurationTests.java | 8 +++---- .../opensearch/RetryConfigurationTests.java | 2 +- .../sink/opensearch/bulk/BulkActionTest.java | 2 +- ...JavaClientAccumulatingBulkRequestTest.java | 2 +- .../bulk/PreSerializedJsonpMapperTest.java | 2 +- .../bulk/SerializedJsonImplTest.java | 2 +- .../opensearch/bulk/SerializedJsonTest.java | 2 +- .../index/DefaultIndexManagerTests.java | 4 ++-- .../index/IndexConfigurationTests.java | 8 +++---- .../index/IndexManagerFactoryTests.java | 4 ++-- .../sink/opensearch/index/IndexTypeTests.java | 2 +- .../index/IsmPolicyManagementTests.java | 2 +- .../ManagementDisabledIndexManagerTest.java | 4 ++-- .../index/NoIsmPolicyManagementTests.java | 2 +- .../TraceAnalyticsRawIndexManagerTests.java | 4 ++-- ...eAnalyticsServiceMapIndexManagerTests.java | 4 ++-- .../OTelTraceGroupProcessorConfig.java | 6 ++--- .../OTelTraceGroupProcessorConfigTests.java | 2 +- .../OTelTraceGroupProcessorTests.java | 2 +- .../integration/log/EndToEndBasicLogTest.java | 2 +- .../trace/EndToEndRawSpanTest.java | 2 +- .../trace/EndToEndServiceMapTest.java | 2 +- 58 files changed, 103 insertions(+), 103 deletions(-) rename data-prepper-plugins/opensearch/src/integrationTest/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/OpenSearchIT.java (96%) rename data-prepper-plugins/opensearch/src/integrationTest/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/OpenSearchIntegrationHelper.java (99%) rename data-prepper-plugins/opensearch/src/integrationTest/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java (97%) rename data-prepper-plugins/opensearch/src/integrationTest/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java (97%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/AwsRequestSigningApacheInterceptor.java (99%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/BackOffUtils.java (93%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java (96%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java (99%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreator.java (92%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/OpenSearchSink.java (91%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java (93%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/RequestFunction.java (86%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/RetryConfiguration.java (95%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/AccumulatingBulkRequest.java (88%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/BulkAction.java (92%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/BulkOperationWriter.java (97%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequest.java (97%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapper.java (97%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/SerializedJson.java (92%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImpl.java (87%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/SizedDocument.java (83%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java (98%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexConstants.java (95%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexManager.java (98%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java (96%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexType.java (96%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagement.java (99%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementStrategy.java (89%) rename data-prepper-plugins/opensearch/src/main/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagement.java (96%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/BackOffUtilsTests.java (95%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java (98%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java (99%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreatorTest.java (98%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java (91%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java (96%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/BulkActionTest.java (90%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequestTest.java (99%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapperTest.java (98%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImplTest.java (94%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonTest.java (90%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java (99%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java (96%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexManagerFactoryTests.java (94%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java (96%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementTests.java (99%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/ManagementDisabledIndexManagerTest.java (97%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagementTests.java (97%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java (98%) rename data-prepper-plugins/opensearch/src/test/java/{com/amazon => org/opensearch}/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsServiceMapIndexManagerTests.java (98%) diff --git a/.github/workflows/opensearch-sink-opendistro-integration-tests.yml b/.github/workflows/opensearch-sink-opendistro-integration-tests.yml index ea33033f7f..073b36cbf1 100644 --- a/.github/workflows/opensearch-sink-opendistro-integration-tests.yml +++ b/.github/workflows/opensearch-sink-opendistro-integration-tests.yml @@ -38,7 +38,7 @@ jobs: sleep 90 - name: Run Open Distro tests run: | - ./gradlew :data-prepper-plugins:opensearch:integrationTest --tests "com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIT" -Dtests.opensearch.host=localhost:9200 -Dtests.opensearch.user=admin -Dtests.opensearch.password=admin + ./gradlew :data-prepper-plugins:opensearch:integrationTest --tests "org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIT" -Dtests.opensearch.host=localhost:9200 -Dtests.opensearch.user=admin -Dtests.opensearch.password=admin ./gradlew :data-prepper-plugins:opensearch:integrationTest -Dtests.opensearch.host=localhost:9200 -Dtests.opensearch.user=admin -Dtests.opensearch.password=admin -Dtests.opensearch.bundle=true - name: Upload Unit Test Results if: always() diff --git a/.github/workflows/opensearch-sink-opensearch-integration-tests.yml b/.github/workflows/opensearch-sink-opensearch-integration-tests.yml index e5378b4be9..f1996077b9 100644 --- a/.github/workflows/opensearch-sink-opensearch-integration-tests.yml +++ b/.github/workflows/opensearch-sink-opensearch-integration-tests.yml @@ -38,7 +38,7 @@ jobs: sleep 90 - name: Run OpenSearch tests run: | - ./gradlew :data-prepper-plugins:opensearch:integrationTest --tests "com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIT" -Dtests.opensearch.host=localhost:9200 -Dtests.opensearch.user=admin -Dtests.opensearch.password=admin + ./gradlew :data-prepper-plugins:opensearch:integrationTest --tests "org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIT" -Dtests.opensearch.host=localhost:9200 -Dtests.opensearch.user=admin -Dtests.opensearch.password=admin ./gradlew :data-prepper-plugins:opensearch:integrationTest -Dtests.opensearch.host=localhost:9200 -Dtests.opensearch.user=admin -Dtests.opensearch.password=admin -Dtests.opensearch.bundle=true - name: Upload Unit Test Results if: always() diff --git a/data-prepper-plugins/opensearch/build.gradle b/data-prepper-plugins/opensearch/build.gradle index c5b0ecea6c..2a794feecd 100644 --- a/data-prepper-plugins/opensearch/build.gradle +++ b/data-prepper-plugins/opensearch/build.gradle @@ -117,8 +117,8 @@ jacocoTestCoverageVerification { element = 'CLASS' excludes = [ // TODO: find a way to include the classes covered by OpenSearch test framework - 'com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSink', - 'com.amazon.dataprepper.plugins.sink.opensearch.IndexStateManagement' + 'org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSink', + 'org.opensearch.dataprepper.plugins.sink.opensearch.IndexStateManagement' ] limit { minimum = 0.90 diff --git a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchIT.java b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchIT.java similarity index 96% rename from data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchIT.java rename to data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchIT.java index a617819a16..122fe9da8e 100644 --- a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchIT.java +++ b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchIT.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import org.junit.Test; import org.opensearch.client.Request; diff --git a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchIntegrationHelper.java b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchIntegrationHelper.java similarity index 99% rename from data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchIntegrationHelper.java rename to data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchIntegrationHelper.java index 9086507426..43103636c5 100644 --- a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchIntegrationHelper.java +++ b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchIntegrationHelper.java @@ -28,7 +28,7 @@ * under the License. */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import org.apache.http.Header; import org.apache.http.HttpHost; diff --git a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java similarity index 97% rename from data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java rename to data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java index 83149d39a5..0e93d94d09 100644 --- a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java +++ b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSecurityAccessor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import org.opensearch.client.Request; import org.opensearch.client.Response; diff --git a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java similarity index 97% rename from data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java rename to data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java index b3602bc072..09b5a88004 100644 --- a/data-prepper-plugins/opensearch/src/integrationTest/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java +++ b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.metrics.MetricNames; import com.amazon.dataprepper.metrics.MetricsTestUtil; @@ -12,11 +12,6 @@ import com.amazon.dataprepper.model.event.EventType; import com.amazon.dataprepper.model.event.JacksonEvent; import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.BulkAction; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConstants; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexManager; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexType; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -35,6 +30,11 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.BulkAction; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConstants; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexManager; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexType; import javax.ws.rs.HttpMethod; import java.io.BufferedReader; @@ -57,12 +57,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.createContentParser; -import static com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.createOpenSearchClient; -import static com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.getHosts; -import static com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.isOSBundle; -import static com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.waitForClusterStateUpdatesToFinish; -import static com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.wipeAllTemplates; import static org.apache.http.HttpStatus.SC_OK; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.containsString; @@ -71,6 +65,12 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.closeTo; +import static org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.createContentParser; +import static org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.createOpenSearchClient; +import static org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.getHosts; +import static org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.isOSBundle; +import static org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.waitForClusterStateUpdatesToFinish; +import static org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchIntegrationHelper.wipeAllTemplates; public class OpenSearchSinkIT { private static final String PLUGIN_NAME = "opensearch"; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/AwsRequestSigningApacheInterceptor.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/AwsRequestSigningApacheInterceptor.java similarity index 99% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/AwsRequestSigningApacheInterceptor.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/AwsRequestSigningApacheInterceptor.java index 67637701ba..ba2b04a521 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/AwsRequestSigningApacheInterceptor.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/AwsRequestSigningApacheInterceptor.java @@ -10,7 +10,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import org.apache.http.Header; import org.apache.http.HttpEntityEnclosingRequest; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/BackOffUtils.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BackOffUtils.java similarity index 93% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/BackOffUtils.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BackOffUtils.java index 17dfd954da..a83cc9e922 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/BackOffUtils.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BackOffUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import org.opensearch.common.unit.TimeValue; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java similarity index 96% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java index fa87db7a0a..dd6739e3b8 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java @@ -3,10 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.AccumulatingBulkRequest; import io.micrometer.core.instrument.Counter; import org.opensearch.OpenSearchException; import org.opensearch.action.bulk.BackoffPolicy; @@ -16,6 +15,7 @@ import org.opensearch.client.opensearch.core.bulk.BulkOperation; import org.opensearch.client.opensearch.core.bulk.BulkResponseItem; import org.opensearch.common.unit.TimeValue; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.AccumulatingBulkRequest; import org.opensearch.rest.RestStatus; import java.io.IOException; @@ -26,7 +26,7 @@ import java.util.function.BiConsumer; import java.util.function.Supplier; -import static com.amazon.dataprepper.plugins.sink.opensearch.ErrorCauseStringCreator.toSingleLineDisplayString; +import static org.opensearch.dataprepper.plugins.sink.opensearch.ErrorCauseStringCreator.toSingleLineDisplayString; public final class BulkRetryStrategy { public static final String DOCUMENTS_SUCCESS = "documentsSuccess"; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java similarity index 99% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java index 99ab5493cb..922293b8eb 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.model.configuration.PluginSetting; import org.apache.http.HttpHost; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreator.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreator.java similarity index 92% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreator.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreator.java index fd5bf7f429..5027b5f5c5 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreator.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import org.opensearch.client.opensearch._types.ErrorCause; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSink.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java similarity index 91% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSink.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java index 7400c62798..23926b4c22 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSink.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; import com.amazon.dataprepper.model.configuration.PluginSetting; @@ -11,15 +11,6 @@ import com.amazon.dataprepper.model.record.Record; import com.amazon.dataprepper.model.sink.AbstractSink; import com.amazon.dataprepper.model.sink.Sink; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.AccumulatingBulkRequest; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.BulkAction; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.BulkOperationWriter; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.JavaClientAccumulatingBulkRequest; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.PreSerializedJsonpMapper; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.SerializedJson; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexManager; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexManagerFactory; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexType; import com.fasterxml.jackson.databind.ObjectMapper; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; @@ -34,6 +25,15 @@ import org.opensearch.client.transport.OpenSearchTransport; import org.opensearch.client.transport.rest_client.RestClientTransport; import org.opensearch.common.unit.ByteSizeUnit; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.AccumulatingBulkRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.BulkAction; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.BulkOperationWriter; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.JavaClientAccumulatingBulkRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.PreSerializedJsonpMapper; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.SerializedJson; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexManager; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexManagerFactory; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java similarity index 93% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java index 31963b0f43..fe07b1923f 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/RequestFunction.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RequestFunction.java similarity index 86% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/RequestFunction.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RequestFunction.java index 199567d409..46bd6e90ea 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/RequestFunction.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RequestFunction.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; /** * Represents a function that accepts one argument and produces a result or throws Exception. diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/RetryConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfiguration.java similarity index 95% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/RetryConfiguration.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfiguration.java index 9c780d2802..66bd714cbe 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/RetryConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.model.configuration.PluginSetting; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/AccumulatingBulkRequest.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/AccumulatingBulkRequest.java similarity index 88% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/AccumulatingBulkRequest.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/AccumulatingBulkRequest.java index 815e576b54..34f0d489e0 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/AccumulatingBulkRequest.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/AccumulatingBulkRequest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import java.util.List; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkAction.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkAction.java similarity index 92% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkAction.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkAction.java index 9090f6d5cf..bdebc3c18e 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkAction.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkAction.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkOperationWriter.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkOperationWriter.java similarity index 97% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkOperationWriter.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkOperationWriter.java index 66f26b6ac9..3b8414a79f 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkOperationWriter.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkOperationWriter.java @@ -30,7 +30,7 @@ * GitHub history for details. */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import org.opensearch.client.opensearch.core.bulk.BulkOperation; import org.opensearch.common.unit.ByteSizeValue; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequest.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequest.java similarity index 97% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequest.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequest.java index 70ebf94f5c..68596021b7 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequest.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import org.opensearch.client.opensearch.core.BulkRequest; import org.opensearch.client.opensearch.core.bulk.BulkOperation; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapper.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapper.java similarity index 97% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapper.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapper.java index 11ed9f3bef..fa7681cd2c 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapper.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import jakarta.json.spi.JsonProvider; import jakarta.json.stream.JsonGenerator; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJson.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJson.java similarity index 92% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJson.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJson.java index 669f31e382..7a83287460 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJson.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJson.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import java.nio.charset.StandardCharsets; import java.util.Objects; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImpl.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImpl.java similarity index 87% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImpl.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImpl.java index 6de815fb88..7c93cfda94 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImpl.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; class SerializedJsonImpl implements SerializedJson { private byte[] document; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SizedDocument.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SizedDocument.java similarity index 83% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SizedDocument.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SizedDocument.java index c011bee310..57dc9de13a 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SizedDocument.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SizedDocument.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; /** * Represents an OpenSearch document with a serialized document size. diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java similarity index 98% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java index 04dee01646..504756d8a5 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.BulkAction; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.EnumUtils; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.BulkAction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConstants.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java similarity index 95% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConstants.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java index 0d27d47e00..d20003e222 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConstants.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConstants.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import java.util.HashMap; import java.util.HashSet; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManager.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManager.java similarity index 98% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManager.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManager.java index c44b01e5ae..56c8f6bbf7 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManager.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManager.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import com.google.common.collect.ImmutableSet; import org.opensearch.OpenSearchException; import org.opensearch.action.admin.cluster.settings.ClusterGetSettingsRequest; @@ -18,6 +17,7 @@ import org.opensearch.client.indices.IndexTemplateMetadata; import org.opensearch.client.indices.IndexTemplatesExistRequest; import org.opensearch.client.indices.PutIndexTemplateRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java similarity index 96% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java index b7fd9cae2a..1a8c5eb84b 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactory.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import org.opensearch.client.RestHighLevelClient; +import org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import java.util.Optional; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexType.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java similarity index 96% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexType.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java index c1849a3eeb..1636dd3163 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexType.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import java.util.Arrays; import java.util.HashMap; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagement.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagement.java similarity index 99% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagement.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagement.java index 2c08b8b33f..a20d8b0337 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagement.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagement.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementStrategy.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementStrategy.java similarity index 89% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementStrategy.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementStrategy.java index ba7d05e22e..980cf5d5db 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementStrategy.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementStrategy.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import org.opensearch.client.indices.CreateIndexRequest; diff --git a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagement.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagement.java similarity index 96% rename from data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagement.java rename to data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagement.java index 669256ec38..eb135ad695 100644 --- a/data-prepper-plugins/opensearch/src/main/java/com/amazon/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagement.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagement.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import io.micrometer.core.instrument.util.StringUtils; import org.opensearch.client.RequestOptions; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/BackOffUtilsTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BackOffUtilsTests.java similarity index 95% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/BackOffUtilsTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BackOffUtilsTests.java index 431c28f167..8145240db8 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/BackOffUtilsTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BackOffUtilsTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; +import org.junit.Test; import org.opensearch.action.bulk.BackoffPolicy; import org.opensearch.common.unit.TimeValue; -import org.junit.Test; import java.util.Iterator; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java similarity index 98% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java index 60d8500950..10e6932e25 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java @@ -3,15 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.metrics.MetricNames; import com.amazon.dataprepper.metrics.MetricsTestUtil; import com.amazon.dataprepper.metrics.PluginMetrics; import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.AccumulatingBulkRequest; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.JavaClientAccumulatingBulkRequest; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.SerializedJson; import io.micrometer.core.instrument.Measurement; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.BeforeEach; @@ -25,6 +22,9 @@ import org.opensearch.client.opensearch.core.bulk.BulkResponseItem; import org.opensearch.client.opensearch.core.bulk.IndexOperation; import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.AccumulatingBulkRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.JavaClientAccumulatingBulkRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.SerializedJson; import org.opensearch.rest.RestStatus; import java.io.IOException; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java similarity index 99% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java index c6e51a83c2..40c03d0aff 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.model.configuration.PluginSetting; -import org.opensearch.client.RestHighLevelClient; import org.junit.Test; +import org.opensearch.client.RestHighLevelClient; import java.io.IOException; import java.util.Collections; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreatorTest.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreatorTest.java similarity index 98% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreatorTest.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreatorTest.java index 7f6ac82072..932972eee7 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreatorTest.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ErrorCauseStringCreatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import org.junit.jupiter.api.Test; import org.opensearch.client.opensearch._types.ErrorCause; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java similarity index 91% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java index 726f75f5e3..dd225e3daa 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.plugins.sink.opensearch.bulk.BulkAction; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexType; import org.junit.Test; +import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.BulkAction; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexType; import java.util.Collections; import java.util.HashMap; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java similarity index 96% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java index 7aceb50b01..79fa028dbd 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch; +package org.opensearch.dataprepper.plugins.sink.opensearch; import com.amazon.dataprepper.model.configuration.PluginSetting; import org.junit.Test; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkActionTest.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkActionTest.java similarity index 90% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkActionTest.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkActionTest.java index c4f68c081a..412e47bb1f 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/BulkActionTest.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/BulkActionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequestTest.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequestTest.java similarity index 99% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequestTest.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequestTest.java index a46ac2ebda..bd011cc957 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequestTest.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/JavaClientAccumulatingBulkRequestTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapperTest.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapperTest.java similarity index 98% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapperTest.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapperTest.java index aafe37e9a6..26bae2a1a0 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapperTest.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/PreSerializedJsonpMapperTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImplTest.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImplTest.java similarity index 94% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImplTest.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImplTest.java index cbbfe10aee..0d03aa59fb 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImplTest.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonImplTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonTest.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonTest.java similarity index 90% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonTest.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonTest.java index fd84581e64..518db05ad4 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonTest.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/bulk/SerializedJsonTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.bulk; +package org.opensearch.dataprepper.plugins.sink.opensearch.bulk; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java similarity index 99% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java index f440a9fb7c..96e83b053d 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/DefaultIndexManagerTests.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -25,6 +24,7 @@ import org.opensearch.client.indices.GetIndexTemplatesRequest; import org.opensearch.client.indices.GetIndexTemplatesResponse; import org.opensearch.client.indices.PutIndexTemplateRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import java.io.IOException; import java.util.Arrays; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java similarity index 96% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java index bfcf27cfb4..5447390a7a 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import com.amazon.dataprepper.model.configuration.PluginSetting; import org.junit.Test; @@ -14,13 +14,13 @@ import java.util.Map; import java.util.Objects; -import static com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConstants.RAW_DEFAULT_TEMPLATE_FILE; -import static com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConstants.SERVICE_MAP_DEFAULT_TEMPLATE_FILE; -import static com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConstants.TYPE_TO_DEFAULT_ALIAS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import static org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConstants.RAW_DEFAULT_TEMPLATE_FILE; +import static org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConstants.SERVICE_MAP_DEFAULT_TEMPLATE_FILE; +import static org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConstants.TYPE_TO_DEFAULT_ALIAS; @SuppressWarnings("unchecked") public class IndexConfigurationTests { diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManagerFactoryTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactoryTests.java similarity index 94% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManagerFactoryTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactoryTests.java index b1caff3e9d..f062a0b00e 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexManagerFactoryTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexManagerFactoryTests.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.client.RestHighLevelClient; +import org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java similarity index 96% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java index bb0fd95a09..591e3d1311 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexTypeTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementTests.java similarity index 99% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementTests.java index ec3bf1ff16..67765bc9c5 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IsmPolicyManagementTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import org.junit.Before; import org.junit.Test; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/ManagementDisabledIndexManagerTest.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/ManagementDisabledIndexManagerTest.java similarity index 97% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/ManagementDisabledIndexManagerTest.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/ManagementDisabledIndexManagerTest.java index 255786ab10..8f24997cb8 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/ManagementDisabledIndexManagerTest.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/ManagementDisabledIndexManagerTest.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,6 +20,7 @@ import org.opensearch.client.RestClient; import org.opensearch.client.RestHighLevelClient; import org.opensearch.client.indices.GetIndexTemplatesResponse; +import org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import java.io.IOException; import java.util.UUID; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagementTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagementTests.java similarity index 97% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagementTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagementTests.java index 208978d2d5..e95886b119 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagementTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/NoIsmPolicyManagementTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; import org.junit.Before; import org.junit.Test; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java similarity index 98% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java index 75e3cf4dac..68d04af17c 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsRawIndexManagerTests.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -25,6 +24,7 @@ import org.opensearch.client.indices.GetIndexTemplatesRequest; import org.opensearch.client.indices.GetIndexTemplatesResponse; import org.opensearch.client.indices.PutIndexTemplateRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import java.io.IOException; import java.util.HashMap; diff --git a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsServiceMapIndexManagerTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsServiceMapIndexManagerTests.java similarity index 98% rename from data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsServiceMapIndexManagerTests.java rename to data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsServiceMapIndexManagerTests.java index 6076441bce..122572a10a 100644 --- a/data-prepper-plugins/opensearch/src/test/java/com/amazon/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsServiceMapIndexManagerTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/TraceAnalyticsServiceMapIndexManagerTests.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.plugins.sink.opensearch.index; +package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -22,6 +21,7 @@ import org.opensearch.client.indices.GetIndexTemplatesRequest; import org.opensearch.client.indices.GetIndexTemplatesResponse; import org.opensearch.client.indices.PutIndexTemplateRequest; +import org.opensearch.dataprepper.plugins.sink.opensearch.OpenSearchSinkConfiguration; import java.io.IOException; import java.util.HashMap; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/main/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java b/data-prepper-plugins/otel-trace-group-processor/src/main/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java index 596579b939..479d1d60ec 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/main/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/main/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java @@ -6,9 +6,9 @@ package com.amazon.dataprepper.plugins.processor.oteltracegroup; import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexConstants; -import com.amazon.dataprepper.plugins.sink.opensearch.index.IndexType; +import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConstants; +import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexType; public class OTelTraceGroupProcessorConfig { protected static final String TRACE_ID_FIELD = "traceId"; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java b/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java index 1532064d36..d75ed32649 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java @@ -6,7 +6,7 @@ package com.amazon.dataprepper.plugins.processor.oteltracegroup; import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java b/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java index e401f74d9a..e955c1541a 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/test/java/com/amazon/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java @@ -13,7 +13,7 @@ import com.amazon.dataprepper.model.trace.JacksonSpan; import com.amazon.dataprepper.model.trace.Span; import com.amazon.dataprepper.plugins.processor.oteltracegroup.model.TraceGroup; -import com.amazon.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.micrometer.core.instrument.Measurement; diff --git a/e2e-test/log/src/integrationTest/java/org/opensearch/dataprepper/integration/log/EndToEndBasicLogTest.java b/e2e-test/log/src/integrationTest/java/org/opensearch/dataprepper/integration/log/EndToEndBasicLogTest.java index e3f97e03b9..857f6f312c 100644 --- a/e2e-test/log/src/integrationTest/java/org/opensearch/dataprepper/integration/log/EndToEndBasicLogTest.java +++ b/e2e-test/log/src/integrationTest/java/org/opensearch/dataprepper/integration/log/EndToEndBasicLogTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.integration.log; -import com.amazon.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; import com.amazon.dataprepper.plugins.source.loggenerator.ApacheLogFaker; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java b/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java index 96e285c2f7..879317b620 100644 --- a/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java +++ b/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java @@ -8,7 +8,7 @@ import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; import com.amazon.dataprepper.plugins.processor.oteltracegroup.model.TraceGroup; -import com.amazon.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; import com.google.protobuf.ByteString; import com.linecorp.armeria.client.Clients; import com.linecorp.armeria.client.retry.RetryRule; diff --git a/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndServiceMapTest.java b/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndServiceMapTest.java index 992c5842b8..680cb8b77a 100644 --- a/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndServiceMapTest.java +++ b/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndServiceMapTest.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.integration.trace; -import com.amazon.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; +import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; import com.google.protobuf.ByteString; import com.linecorp.armeria.client.Clients; import com.linecorp.armeria.client.retry.RetryRule;