Updated the OpenSearch sink to use the org.opensearch.dataprepper pac…

…kage name. Contributes to opensearch-project#344. (opensearch-project#1780) Signed-off-by: David Venable <[email protected]>
asifsmohammed · Sep 19, 2022 · 48d8bc3 · 48d8bc3
1 parent 8a341f6
commit 48d8bc3
Show file tree

Hide file tree

Showing 58 changed files with 103 additions and 103 deletions.
diff --git 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
@@ -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
@@ -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/...plugins/sink/opensearch/OpenSearchIT.java → ...plugins/sink/opensearch/OpenSearchIT.java b/...plugins/sink/opensearch/OpenSearchIT.java → ...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/...ensearch/OpenSearchIntegrationHelper.java → ...ensearch/OpenSearchIntegrationHelper.java b/...ensearch/OpenSearchIntegrationHelper.java → ...ensearch/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/...pensearch/OpenSearchSecurityAccessor.java → ...pensearch/OpenSearchSecurityAccessor.java b/...pensearch/OpenSearchSecurityAccessor.java → ...pensearch/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/...ins/sink/opensearch/OpenSearchSinkIT.java → ...ins/sink/opensearch/OpenSearchSinkIT.java b/...ins/sink/opensearch/OpenSearchSinkIT.java → ...ins/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/...h/AwsRequestSigningApacheInterceptor.java → ...h/AwsRequestSigningApacheInterceptor.java b/...h/AwsRequestSigningApacheInterceptor.java → ...h/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/...plugins/sink/opensearch/BackOffUtils.java → ...plugins/sink/opensearch/BackOffUtils.java b/...plugins/sink/opensearch/BackOffUtils.java → ...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/...ns/sink/opensearch/BulkRetryStrategy.java → ...ns/sink/opensearch/BulkRetryStrategy.java b/...ns/sink/opensearch/BulkRetryStrategy.java → ...ns/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/...k/opensearch/ConnectionConfiguration.java → ...k/opensearch/ConnectionConfiguration.java b/...k/opensearch/ConnectionConfiguration.java → ...k/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/...k/opensearch/ErrorCauseStringCreator.java → ...k/opensearch/ErrorCauseStringCreator.java b/...k/opensearch/ErrorCauseStringCreator.java → ...k/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/...ugins/sink/opensearch/OpenSearchSink.java → ...ugins/sink/opensearch/OpenSearchSink.java b/...ugins/sink/opensearch/OpenSearchSink.java → ...ugins/sink/opensearch/OpenSearchSink.java
@@ -3,23 +3,14 @@
  * 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;
 import com.amazon.dataprepper.model.event.Event;
 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/...ensearch/OpenSearchSinkConfiguration.java → ...ensearch/OpenSearchSinkConfiguration.java b/...ensearch/OpenSearchSinkConfiguration.java → ...ensearch/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/...gins/sink/opensearch/RequestFunction.java → ...gins/sink/opensearch/RequestFunction.java b/...gins/sink/opensearch/RequestFunction.java → ...gins/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/...s/sink/opensearch/RetryConfiguration.java → ...s/sink/opensearch/RetryConfiguration.java b/...s/sink/opensearch/RetryConfiguration.java → ...s/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/...nsearch/bulk/AccumulatingBulkRequest.java → ...nsearch/bulk/AccumulatingBulkRequest.java b/...nsearch/bulk/AccumulatingBulkRequest.java → ...nsearch/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/...gins/sink/opensearch/bulk/BulkAction.java → ...gins/sink/opensearch/bulk/BulkAction.java b/...gins/sink/opensearch/bulk/BulkAction.java → ...gins/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/.../opensearch/bulk/BulkOperationWriter.java → .../opensearch/bulk/BulkOperationWriter.java b/.../opensearch/bulk/BulkOperationWriter.java → .../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/...lk/JavaClientAccumulatingBulkRequest.java → ...lk/JavaClientAccumulatingBulkRequest.java b/...lk/JavaClientAccumulatingBulkRequest.java → ...lk/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/...search/bulk/PreSerializedJsonpMapper.java → ...search/bulk/PreSerializedJsonpMapper.java b/...search/bulk/PreSerializedJsonpMapper.java → ...search/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/.../sink/opensearch/bulk/SerializedJson.java → .../sink/opensearch/bulk/SerializedJson.java b/.../sink/opensearch/bulk/SerializedJson.java → .../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/...k/opensearch/bulk/SerializedJsonImpl.java → ...k/opensearch/bulk/SerializedJsonImpl.java b/...k/opensearch/bulk/SerializedJsonImpl.java → ...k/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/...s/sink/opensearch/bulk/SizedDocument.java → ...s/sink/opensearch/bulk/SizedDocument.java b/...s/sink/opensearch/bulk/SizedDocument.java → ...s/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/.../opensearch/index/IndexConfiguration.java → .../opensearch/index/IndexConfiguration.java b/.../opensearch/index/IndexConfiguration.java → .../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/...sink/opensearch/index/IndexConstants.java → ...sink/opensearch/index/IndexConstants.java b/...sink/opensearch/index/IndexConstants.java → ...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/...s/sink/opensearch/index/IndexManager.java → ...s/sink/opensearch/index/IndexManager.java b/...s/sink/opensearch/index/IndexManager.java → ...s/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/...opensearch/index/IndexManagerFactory.java → ...opensearch/index/IndexManagerFactory.java b/...opensearch/index/IndexManagerFactory.java → ...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/...gins/sink/opensearch/index/IndexType.java → ...gins/sink/opensearch/index/IndexType.java b/...gins/sink/opensearch/index/IndexType.java → ...gins/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/...opensearch/index/IsmPolicyManagement.java → ...opensearch/index/IsmPolicyManagement.java b/...opensearch/index/IsmPolicyManagement.java → ...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;