diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/FailedHttpResponseInterceptor.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/FailedHttpResponseInterceptor.java similarity index 95% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/FailedHttpResponseInterceptor.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/FailedHttpResponseInterceptor.java index 64bbff5bc6..8a8d3b523c 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/FailedHttpResponseInterceptor.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/FailedHttpResponseInterceptor.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.http; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.HttpResponse; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/HTTPSink.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/HTTPSink.java similarity index 95% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/HTTPSink.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/HTTPSink.java index a736de6534..403e0d11db 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/HTTPSink.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/HTTPSink.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.http; import org.apache.hc.client5.http.HttpRequestRetryStrategy; import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy; @@ -24,8 +24,8 @@ import org.opensearch.dataprepper.plugins.accumulator.BufferTypeOptions; import org.opensearch.dataprepper.plugins.accumulator.InMemoryBufferFactory; import org.opensearch.dataprepper.plugins.accumulator.LocalFileBufferFactory; -import org.opensearch.dataprepper.plugins.sink.configuration.HttpSinkConfiguration; -import org.opensearch.dataprepper.plugins.sink.service.HttpSinkService; +import org.opensearch.dataprepper.plugins.sink.http.configuration.HttpSinkConfiguration; +import org.opensearch.dataprepper.plugins.sink.http.service.HttpSinkService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/HttpEndPointResponse.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/HttpEndPointResponse.java similarity index 95% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/HttpEndPointResponse.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/HttpEndPointResponse.java index 4c3b98a38a..1247a5b9e5 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/HttpEndPointResponse.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/HttpEndPointResponse.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.http; public class HttpEndPointResponse { private String url; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/certificate/CertificateProviderFactory.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/certificate/CertificateProviderFactory.java similarity index 96% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/certificate/CertificateProviderFactory.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/certificate/CertificateProviderFactory.java index 97fa71fb74..332382e03c 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/certificate/CertificateProviderFactory.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/certificate/CertificateProviderFactory.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.certificate; +package org.opensearch.dataprepper.plugins.sink.http.certificate; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; @@ -10,7 +10,7 @@ import org.opensearch.dataprepper.plugins.certificate.file.FileCertificateProvider; import org.opensearch.dataprepper.plugins.certificate.s3.S3CertificateProvider; import org.opensearch.dataprepper.plugins.metricpublisher.MicrometerMetricPublisher; -import org.opensearch.dataprepper.plugins.sink.configuration.HttpSinkConfiguration; +import org.opensearch.dataprepper.plugins.sink.http.configuration.HttpSinkConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/certificate/HttpClientSSLConnectionManager.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/certificate/HttpClientSSLConnectionManager.java similarity index 95% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/certificate/HttpClientSSLConnectionManager.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/certificate/HttpClientSSLConnectionManager.java index 4ea5e8d06e..6edefa0f11 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/certificate/HttpClientSSLConnectionManager.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/certificate/HttpClientSSLConnectionManager.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.certificate; +package org.opensearch.dataprepper.plugins.sink.http.certificate; import org.apache.hc.client5.http.config.TlsConfig; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; @@ -16,7 +16,7 @@ import org.apache.hc.core5.ssl.TrustStrategy; import org.apache.hc.core5.util.Timeout; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; -import org.opensearch.dataprepper.plugins.sink.configuration.HttpSinkConfiguration; +import org.opensearch.dataprepper.plugins.sink.http.configuration.HttpSinkConfiguration; import javax.net.ssl.SSLContext; import java.io.ByteArrayInputStream; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AuthTypeOptions.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AuthTypeOptions.java similarity index 92% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AuthTypeOptions.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AuthTypeOptions.java index 52ce8fce20..88d9b6cfe8 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AuthTypeOptions.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AuthTypeOptions.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptions.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AwsAuthenticationOptions.java similarity index 95% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptions.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AwsAuthenticationOptions.java index 734032444c..7a7be57d34 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptions.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AwsAuthenticationOptions.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.Size; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/CustomHeaderOptions.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/CustomHeaderOptions.java similarity index 94% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/CustomHeaderOptions.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/CustomHeaderOptions.java index 25ea688b5a..f6b9f7bbd8 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/CustomHeaderOptions.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/CustomHeaderOptions.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/HTTPMethodOptions.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HTTPMethodOptions.java similarity index 92% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/HTTPMethodOptions.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HTTPMethodOptions.java index 8d28aabd88..85749f9819 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/HTTPMethodOptions.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HTTPMethodOptions.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/HttpSinkConfiguration.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HttpSinkConfiguration.java similarity index 99% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/HttpSinkConfiguration.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HttpSinkConfiguration.java index 71bad98adf..6e03637476 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/HttpSinkConfiguration.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HttpSinkConfiguration.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.Valid; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptions.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/ThresholdOptions.java similarity index 95% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptions.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/ThresholdOptions.java index 36678a0204..dc8f904738 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptions.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/ThresholdOptions.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/UrlConfigurationOption.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/UrlConfigurationOption.java similarity index 94% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/UrlConfigurationOption.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/UrlConfigurationOption.java index 4aa45a082c..4ddd2dcf06 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/UrlConfigurationOption.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/configuration/UrlConfigurationOption.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/dlq/FailedDlqData.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/dlq/FailedDlqData.java similarity index 95% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/dlq/FailedDlqData.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/dlq/FailedDlqData.java index 62a85cb709..587a381002 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/dlq/FailedDlqData.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/dlq/FailedDlqData.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.dlq; +package org.opensearch.dataprepper.plugins.sink.http.dlq; import com.fasterxml.jackson.annotation.JsonIgnore; import org.opensearch.dataprepper.model.event.EventHandle; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/BasicAuthHttpSinkHandler.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/BasicAuthHttpSinkHandler.java similarity index 89% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/BasicAuthHttpSinkHandler.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/BasicAuthHttpSinkHandler.java index 0406ce09f8..1078551d4d 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/BasicAuthHttpSinkHandler.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/BasicAuthHttpSinkHandler.java @@ -2,14 +2,14 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.handler; +package org.opensearch.dataprepper.plugins.sink.http.handler; import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.opensearch.dataprepper.plugins.sink.FailedHttpResponseInterceptor; -import org.opensearch.dataprepper.plugins.sink.util.HttpSinkUtil; +import org.opensearch.dataprepper.plugins.sink.http.FailedHttpResponseInterceptor; +import org.opensearch.dataprepper.plugins.sink.http.util.HttpSinkUtil; /** * * This class handles Basic Authentication diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/BearerTokenAuthHttpSinkHandler.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/BearerTokenAuthHttpSinkHandler.java similarity index 90% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/BearerTokenAuthHttpSinkHandler.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/BearerTokenAuthHttpSinkHandler.java index 63d594e49d..0ed8567fbc 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/BearerTokenAuthHttpSinkHandler.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/BearerTokenAuthHttpSinkHandler.java @@ -2,10 +2,10 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.handler; +package org.opensearch.dataprepper.plugins.sink.http.handler; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.opensearch.dataprepper.plugins.sink.FailedHttpResponseInterceptor; +import org.opensearch.dataprepper.plugins.sink.http.FailedHttpResponseInterceptor; /** * * This class handles Bearer Token Authentication diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/HttpAuthOptions.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/HttpAuthOptions.java similarity index 98% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/HttpAuthOptions.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/HttpAuthOptions.java index 0e8632d25a..7270e60c48 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/HttpAuthOptions.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/HttpAuthOptions.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.handler; +package org.opensearch.dataprepper.plugins.sink.http.handler; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.io.HttpClientConnectionManager; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/MultiAuthHttpSinkHandler.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/MultiAuthHttpSinkHandler.java similarity index 88% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/MultiAuthHttpSinkHandler.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/MultiAuthHttpSinkHandler.java index 2002610fc7..ac295043b0 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/handler/MultiAuthHttpSinkHandler.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/handler/MultiAuthHttpSinkHandler.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.handler; +package org.opensearch.dataprepper.plugins.sink.http.handler; /** * An interface to handle multiple authentications diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/service/HttpSinkService.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/service/HttpSinkService.java similarity index 90% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/service/HttpSinkService.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/service/HttpSinkService.java index c7a887c650..d9f211bd90 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/service/HttpSinkService.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/service/HttpSinkService.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.service; +package org.opensearch.dataprepper.plugins.sink.http.service; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.io.HttpClientConnectionManager; @@ -16,19 +16,19 @@ import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.accumulator.Buffer; import org.opensearch.dataprepper.plugins.accumulator.BufferFactory; -import org.opensearch.dataprepper.plugins.sink.FailedHttpResponseInterceptor; -import org.opensearch.dataprepper.plugins.sink.HttpEndPointResponse; -import org.opensearch.dataprepper.plugins.sink.certificate.CertificateProviderFactory; -import org.opensearch.dataprepper.plugins.sink.certificate.HttpClientSSLConnectionManager; -import org.opensearch.dataprepper.plugins.sink.configuration.AuthTypeOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.HTTPMethodOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.HttpSinkConfiguration; -import org.opensearch.dataprepper.plugins.sink.configuration.UrlConfigurationOption; -import org.opensearch.dataprepper.plugins.sink.handler.BasicAuthHttpSinkHandler; -import org.opensearch.dataprepper.plugins.sink.handler.BearerTokenAuthHttpSinkHandler; -import org.opensearch.dataprepper.plugins.sink.handler.HttpAuthOptions; -import org.opensearch.dataprepper.plugins.sink.handler.MultiAuthHttpSinkHandler; -import org.opensearch.dataprepper.plugins.sink.util.HttpSinkUtil; +import org.opensearch.dataprepper.plugins.sink.http.FailedHttpResponseInterceptor; +import org.opensearch.dataprepper.plugins.sink.http.HttpEndPointResponse; +import org.opensearch.dataprepper.plugins.sink.http.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.plugins.sink.http.certificate.HttpClientSSLConnectionManager; +import org.opensearch.dataprepper.plugins.sink.http.configuration.AuthTypeOptions; +import org.opensearch.dataprepper.plugins.sink.http.configuration.HTTPMethodOptions; +import org.opensearch.dataprepper.plugins.sink.http.configuration.HttpSinkConfiguration; +import org.opensearch.dataprepper.plugins.sink.http.configuration.UrlConfigurationOption; +import org.opensearch.dataprepper.plugins.sink.http.handler.BasicAuthHttpSinkHandler; +import org.opensearch.dataprepper.plugins.sink.http.handler.BearerTokenAuthHttpSinkHandler; +import org.opensearch.dataprepper.plugins.sink.http.handler.HttpAuthOptions; +import org.opensearch.dataprepper.plugins.sink.http.handler.MultiAuthHttpSinkHandler; +import org.opensearch.dataprepper.plugins.sink.http.util.HttpSinkUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/util/HttpSinkUtil.java b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/util/HttpSinkUtil.java similarity index 93% rename from data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/util/HttpSinkUtil.java rename to data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/util/HttpSinkUtil.java index 14bf21122a..13fbaff663 100644 --- a/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/util/HttpSinkUtil.java +++ b/data-prepper-plugins/http-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/http/util/HttpSinkUtil.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.util; +package org.opensearch.dataprepper.plugins.sink.http.util; import org.apache.hc.core5.http.HttpHost; diff --git a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptionsTest.java b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AwsAuthenticationOptionsTest.java similarity index 98% rename from data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptionsTest.java rename to data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AwsAuthenticationOptionsTest.java index c509fd8ad5..f65b42ad9c 100644 --- a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptionsTest.java +++ b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/AwsAuthenticationOptionsTest.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/CustomHeaderOptionsTest.java b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/CustomHeaderOptionsTest.java similarity index 93% rename from data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/CustomHeaderOptionsTest.java rename to data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/CustomHeaderOptionsTest.java index 7ea96d54b0..1812c0abfe 100644 --- a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/CustomHeaderOptionsTest.java +++ b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/CustomHeaderOptionsTest.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/HttpSinkConfigurationTest.java b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HttpSinkConfigurationTest.java similarity index 96% rename from data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/HttpSinkConfigurationTest.java rename to data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HttpSinkConfigurationTest.java index e023cf4d50..119653e68d 100644 --- a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/HttpSinkConfigurationTest.java +++ b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/HttpSinkConfigurationTest.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -18,8 +18,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.opensearch.dataprepper.plugins.sink.configuration.AuthTypeOptions.HTTP_BASIC; -import static org.opensearch.dataprepper.plugins.sink.configuration.AuthTypeOptions.UNAUTHENTICATED; +import static org.opensearch.dataprepper.plugins.sink.http.configuration.AuthTypeOptions.HTTP_BASIC; +import static org.opensearch.dataprepper.plugins.sink.http.configuration.AuthTypeOptions.UNAUTHENTICATED; public class HttpSinkConfigurationTest { diff --git a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptionsTest.java b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/ThresholdOptionsTest.java similarity index 93% rename from data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptionsTest.java rename to data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/ThresholdOptionsTest.java index 101241710c..6bcfdd5a14 100644 --- a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptionsTest.java +++ b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/ThresholdOptionsTest.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.model.types.ByteCount; diff --git a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/UrlConfigurationOptionTest.java b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/UrlConfigurationOptionTest.java similarity index 93% rename from data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/UrlConfigurationOptionTest.java rename to data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/UrlConfigurationOptionTest.java index aa27474572..249216412d 100644 --- a/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/UrlConfigurationOptionTest.java +++ b/data-prepper-plugins/http-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/http/configuration/UrlConfigurationOptionTest.java @@ -2,7 +2,7 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.http.configuration; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/s3-sink/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/S3SinkServiceIT.java b/data-prepper-plugins/s3-sink/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkServiceIT.java similarity index 96% rename from data-prepper-plugins/s3-sink/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/S3SinkServiceIT.java rename to data-prepper-plugins/s3-sink/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkServiceIT.java index a0e1c1f359..0c94a8a121 100644 --- a/data-prepper-plugins/s3-sink/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/S3SinkServiceIT.java +++ b/data-prepper-plugins/s3-sink/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkServiceIT.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; @@ -46,12 +46,12 @@ import org.opensearch.dataprepper.plugins.codec.parquet.ParquetOutputCodecConfig; import org.opensearch.dataprepper.plugins.codec.json.NdjsonOutputCodec; import org.opensearch.dataprepper.plugins.codec.json.NdjsonOutputConfig; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferFactory; -import org.opensearch.dataprepper.plugins.sink.accumulator.InMemoryBufferFactory; -import org.opensearch.dataprepper.plugins.sink.accumulator.ObjectKey; -import org.opensearch.dataprepper.plugins.sink.configuration.AwsAuthenticationOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ObjectKeyOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ThresholdOptions; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.InMemoryBufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.ObjectKey; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.AwsAuthenticationOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ObjectKeyOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ThresholdOptions; import software.amazon.awssdk.core.ResponseBytes; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/ClientFactory.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/ClientFactory.java similarity index 93% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/ClientFactory.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/ClientFactory.java index c6dfc235e9..3d6b8fc12b 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/ClientFactory.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/ClientFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import org.opensearch.dataprepper.aws.api.AwsCredentialsOptions; import org.opensearch.dataprepper.aws.api.AwsCredentialsSupplier; -import org.opensearch.dataprepper.plugins.sink.configuration.AwsAuthenticationOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.AwsAuthenticationOptions; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; import software.amazon.awssdk.core.retry.RetryPolicy; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3Sink.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3Sink.java similarity index 91% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3Sink.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3Sink.java index 828fd2e414..3d1cfa1f7b 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3Sink.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3Sink.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import org.opensearch.dataprepper.aws.api.AwsCredentialsSupplier; import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; @@ -18,10 +18,10 @@ import org.opensearch.dataprepper.model.sink.AbstractSink; import org.opensearch.dataprepper.model.sink.SinkContext; import org.opensearch.dataprepper.model.sink.Sink; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferFactory; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferTypeOptions; -import org.opensearch.dataprepper.plugins.sink.accumulator.InMemoryBufferFactory; -import org.opensearch.dataprepper.plugins.sink.accumulator.LocalFileBufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferTypeOptions; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.InMemoryBufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.LocalFileBufferFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.services.s3.S3Client; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3SinkConfig.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkConfig.java similarity index 88% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3SinkConfig.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkConfig.java index 588f4984f4..1b18994f66 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3SinkConfig.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkConfig.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import org.opensearch.dataprepper.model.configuration.PluginModel; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferTypeOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.AwsAuthenticationOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ObjectKeyOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ThresholdOptions; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferTypeOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.AwsAuthenticationOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ObjectKeyOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ThresholdOptions; /** * s3 sink configuration class contains properties, used to read yaml configuration. diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3SinkService.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkService.java similarity index 96% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3SinkService.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkService.java index 8a67a1df9c..011ffdda6c 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/S3SinkService.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkService.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; @@ -13,9 +13,9 @@ import org.opensearch.dataprepper.model.event.EventHandle; import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.plugins.sink.accumulator.Buffer; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferFactory; -import org.opensearch.dataprepper.plugins.sink.accumulator.ObjectKey; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.Buffer; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.ObjectKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.awscore.exception.AwsServiceException; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/ThresholdCheck.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/ThresholdCheck.java similarity index 90% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/ThresholdCheck.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/ThresholdCheck.java index 1d087846f6..3f1b648894 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/ThresholdCheck.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/ThresholdCheck.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.plugins.sink.accumulator.Buffer; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.Buffer; /** * Check threshold limits. diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/Buffer.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/Buffer.java similarity index 92% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/Buffer.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/Buffer.java index 34dee39776..b90775ed47 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/Buffer.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/Buffer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import software.amazon.awssdk.services.s3.S3Client; import java.io.IOException; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferFactory.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferFactory.java similarity index 69% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferFactory.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferFactory.java index 7a75c45a0a..0235642bfd 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferFactory.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; public interface BufferFactory { Buffer getBuffer(); diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferTypeOptions.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferTypeOptions.java similarity index 94% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferTypeOptions.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferTypeOptions.java index 5200f8c741..494ce36a14 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferTypeOptions.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferTypeOptions.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Arrays; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBuffer.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBuffer.java similarity index 97% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBuffer.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBuffer.java index f3450f0d19..ea1f3bc697 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBuffer.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBuffer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.apache.commons.lang3.time.StopWatch; import software.amazon.awssdk.core.sync.RequestBody; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferFactory.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferFactory.java similarity index 78% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferFactory.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferFactory.java index 41ce0b2bd4..d26c2a317d 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferFactory.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; public class InMemoryBufferFactory implements BufferFactory { @Override diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBuffer.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBuffer.java similarity index 98% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBuffer.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBuffer.java index 4eca985f83..733a2b86fa 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBuffer.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBuffer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.apache.commons.lang3.time.StopWatch; import org.slf4j.Logger; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferFactory.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferFactory.java similarity index 92% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferFactory.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferFactory.java index 3d27ed08b8..e50c5e6dd6 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferFactory.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/ObjectKey.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/ObjectKey.java similarity index 95% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/ObjectKey.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/ObjectKey.java index 4eb0a12923..6c8b05044e 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/accumulator/ObjectKey.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/ObjectKey.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import java.util.regex.Pattern; import org.opensearch.dataprepper.plugins.s3keyindex.S3ObjectIndexUtility; -import org.opensearch.dataprepper.plugins.sink.S3SinkConfig; +import org.opensearch.dataprepper.plugins.sink.s3.S3SinkConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/codec/Codec.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/codec/Codec.java similarity index 91% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/codec/Codec.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/codec/Codec.java index 06b104287f..6cedf86779 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/codec/Codec.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/codec/Codec.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.codec; +package org.opensearch.dataprepper.plugins.sink.s3.codec; import java.io.IOException; import org.opensearch.dataprepper.model.event.Event; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/codec/JsonCodec.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/codec/JsonCodec.java similarity index 92% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/codec/JsonCodec.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/codec/JsonCodec.java index 78847f3145..15ac0ba7ec 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/codec/JsonCodec.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/codec/JsonCodec.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.codec; +package org.opensearch.dataprepper.plugins.sink.s3.codec; import java.io.IOException; import java.util.Objects; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptions.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/AwsAuthenticationOptions.java similarity index 95% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptions.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/AwsAuthenticationOptions.java index 03feb38c38..a0561f1318 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptions.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/AwsAuthenticationOptions.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.s3.configuration; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.Size; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ObjectKeyOptions.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ObjectKeyOptions.java similarity index 92% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ObjectKeyOptions.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ObjectKeyOptions.java index 9d736a42d6..bd0b07cf1a 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ObjectKeyOptions.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ObjectKeyOptions.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.s3.configuration; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptions.java b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ThresholdOptions.java similarity index 95% rename from data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptions.java rename to data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ThresholdOptions.java index d6f75e0df7..58c552f054 100644 --- a/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptions.java +++ b/data-prepper-plugins/s3-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ThresholdOptions.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.s3.configuration; import java.time.Duration; import org.hibernate.validator.constraints.time.DurationMax; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/ClientFactoryTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/ClientFactoryTest.java similarity index 97% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/ClientFactoryTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/ClientFactoryTest.java index 5f71106e09..bf70dde593 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/ClientFactoryTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/ClientFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.aws.api.AwsCredentialsOptions; import org.opensearch.dataprepper.aws.api.AwsCredentialsSupplier; -import org.opensearch.dataprepper.plugins.sink.configuration.AwsAuthenticationOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.AwsAuthenticationOptions; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; import software.amazon.awssdk.regions.Region; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkConfigTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkConfigTest.java similarity index 90% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkConfigTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkConfigTest.java index 3d619aa601..297a1ef818 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkConfigTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkConfigTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import org.junit.jupiter.api.Test; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferTypeOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ObjectKeyOptions; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferTypeOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ObjectKeyOptions; import org.opensearch.dataprepper.test.helper.ReflectivelySetField; import java.util.UUID; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkServiceTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkServiceTest.java similarity index 97% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkServiceTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkServiceTest.java index 9c8a4e30ab..8ddef20e86 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkServiceTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkServiceTest.java @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.metrics.PluginMetrics; @@ -19,18 +20,17 @@ import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.plugins.sink.accumulator.Buffer; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferFactory; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferTypeOptions; -import org.opensearch.dataprepper.plugins.sink.accumulator.InMemoryBuffer; -import org.opensearch.dataprepper.plugins.sink.accumulator.InMemoryBufferFactory; -import org.opensearch.dataprepper.plugins.sink.configuration.AwsAuthenticationOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ObjectKeyOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ThresholdOptions; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.Buffer; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferTypeOptions; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.InMemoryBuffer; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.InMemoryBufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.AwsAuthenticationOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ObjectKeyOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ThresholdOptions; import software.amazon.awssdk.awscore.exception.AwsServiceException; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; -import org.apache.commons.lang3.RandomStringUtils; import java.io.IOException; import java.io.OutputStream; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkTest.java similarity index 92% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkTest.java index f7f8ceb0fb..61d27cecae 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/S3SinkTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/S3SinkTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -17,10 +17,10 @@ import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.sink.SinkContext; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.plugins.sink.accumulator.BufferTypeOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.AwsAuthenticationOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ObjectKeyOptions; -import org.opensearch.dataprepper.plugins.sink.configuration.ThresholdOptions; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.BufferTypeOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.AwsAuthenticationOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ObjectKeyOptions; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ThresholdOptions; import software.amazon.awssdk.regions.Region; import java.time.Duration; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/ThresholdCheckTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/ThresholdCheckTest.java similarity index 96% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/ThresholdCheckTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/ThresholdCheckTest.java index 18d6672b0d..864421accb 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/ThresholdCheckTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/ThresholdCheckTest.java @@ -3,13 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink; +package org.opensearch.dataprepper.plugins.sink.s3; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.plugins.sink.accumulator.Buffer; -import org.opensearch.dataprepper.plugins.sink.accumulator.InMemoryBufferFactory; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.Buffer; +import org.opensearch.dataprepper.plugins.sink.s3.accumulator.InMemoryBufferFactory; + import java.io.IOException; import java.io.OutputStream; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferTypeOptionsTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferTypeOptionsTest.java similarity index 93% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferTypeOptionsTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferTypeOptionsTest.java index fc52c683ce..65531acc32 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/BufferTypeOptionsTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/BufferTypeOptionsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferFactoryTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferFactoryTest.java similarity index 92% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferFactoryTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferFactoryTest.java index 4e497de443..0964cbece4 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferFactoryTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferTest.java similarity index 97% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferTest.java index 254b32278c..e43f801eae 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/InMemoryBufferTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/InMemoryBufferTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferFactoryTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferFactoryTest.java similarity index 93% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferFactoryTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferFactoryTest.java index dc2d3b0432..4eb509dff5 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferFactoryTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferTest.java similarity index 98% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferTest.java index a7c30f7b13..f05a688936 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/LocalFileBufferTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/LocalFileBufferTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/ObjectKeyTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/ObjectKeyTest.java similarity index 92% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/ObjectKeyTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/ObjectKeyTest.java index e9c0f77c9c..1d10b7b7a3 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/accumulator/ObjectKeyTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/accumulator/ObjectKeyTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.accumulator; +package org.opensearch.dataprepper.plugins.sink.s3.accumulator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -14,8 +14,8 @@ import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.opensearch.dataprepper.model.plugin.PluginFactory; -import org.opensearch.dataprepper.plugins.sink.S3SinkConfig; -import org.opensearch.dataprepper.plugins.sink.configuration.ObjectKeyOptions; +import org.opensearch.dataprepper.plugins.sink.s3.S3SinkConfig; +import org.opensearch.dataprepper.plugins.sink.s3.configuration.ObjectKeyOptions; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/codec/JsonCodecTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/codec/JsonCodecTest.java similarity index 98% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/codec/JsonCodecTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/codec/JsonCodecTest.java index d2055cb0c8..35fd55c9f1 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/codec/JsonCodecTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/codec/JsonCodecTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.codec; +package org.opensearch.dataprepper.plugins.sink.s3.codec; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptionsTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/AwsAuthenticationOptionsTest.java similarity index 98% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptionsTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/AwsAuthenticationOptionsTest.java index 4be869dab5..9137086657 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/AwsAuthenticationOptionsTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/AwsAuthenticationOptionsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.s3.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ObjectKeyOptionsTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ObjectKeyOptionsTest.java similarity index 90% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ObjectKeyOptionsTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ObjectKeyOptionsTest.java index a18842747c..5f52015eaf 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ObjectKeyOptionsTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ObjectKeyOptionsTest.java @@ -3,11 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.s3.configuration; + +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.jupiter.api.Test; class ObjectKeyOptionsTest { diff --git a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptionsTest.java b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ThresholdOptionsTest.java similarity index 93% rename from data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptionsTest.java rename to data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ThresholdOptionsTest.java index 48b9a6885c..7a5fd4e3cc 100644 --- a/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/configuration/ThresholdOptionsTest.java +++ b/data-prepper-plugins/s3-sink/src/test/java/org/opensearch/dataprepper/plugins/sink/s3/configuration/ThresholdOptionsTest.java @@ -3,13 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.sink.configuration; +package org.opensearch.dataprepper.plugins.sink.s3.configuration; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.model.types.ByteCount; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + class ThresholdOptionsTest { private static final String DEFAULT_BYTE_CAPACITY = "50mb"; private static final int DEFAULT_EVENT_COUNT = 0;