Updated the package name to org.opensearch for data-prepper-core. (#1671

) Updated the package name to org.opensearch for data-prepper-core. Updated the Java main class package name to org.opensearch. Signed-off-by: David Venable <dlv@amazon.com>
opensearch-project · Aug 17, 2022 · cf86674 · cf86674
1 parent 3f3a9a0
commit cf86674
Show file tree

Hide file tree

Showing 123 changed files with 341 additions and 372 deletions.
diff --git a/data-prepper-core/build.gradle b/data-prepper-core/build.gradle
@@ -56,7 +56,7 @@ jar {
     manifest {
         attributes('Implementation-Title': project.name,
                 'Implementation-Version': project.version,
-                'Main-Class': 'com.amazon.dataprepper.DataPrepperExecute')
+                'Main-Class': 'org.opensearch.dataprepper.DataPrepperExecute')
     }
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }

diff --git a/...om/amazon/dataprepper/ContextManager.java → ...pensearch/dataprepper/ContextManager.java b/...om/amazon/dataprepper/ContextManager.java → ...pensearch/dataprepper/ContextManager.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper;
+package org.opensearch.dataprepper;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...a/com/amazon/dataprepper/DataPrepper.java → ...g/opensearch/dataprepper/DataPrepper.java b/...a/com/amazon/dataprepper/DataPrepper.java → ...g/opensearch/dataprepper/DataPrepper.java
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper;
+package org.opensearch.dataprepper;
 
 import com.amazon.dataprepper.model.plugin.PluginFactory;
-import com.amazon.dataprepper.parser.PipelineParser;
-import com.amazon.dataprepper.pipeline.Pipeline;
-import com.amazon.dataprepper.pipeline.server.DataPrepperServer;
+import org.opensearch.dataprepper.parser.PipelineParser;
+import org.opensearch.dataprepper.pipeline.Pipeline;
+import org.opensearch.dataprepper.pipeline.server.DataPrepperServer;
 import io.micrometer.core.instrument.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...mazon/dataprepper/DataPrepperExecute.java → ...earch/dataprepper/DataPrepperExecute.java b/...mazon/dataprepper/DataPrepperExecute.java → ...earch/dataprepper/DataPrepperExecute.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper;
+package org.opensearch.dataprepper;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...repper/meter/EMFLoggingMeterRegistry.java → ...repper/meter/EMFLoggingMeterRegistry.java b/...repper/meter/EMFLoggingMeterRegistry.java → ...repper/meter/EMFLoggingMeterRegistry.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.meter;
+package org.opensearch.dataprepper.meter;
 
 import io.micrometer.cloudwatch2.CloudWatchNamingConvention;
 import io.micrometer.core.instrument.Clock;

diff --git a/...epper/meter/EMFLoggingRegistryConfig.java → ...epper/meter/EMFLoggingRegistryConfig.java b/...epper/meter/EMFLoggingRegistryConfig.java → ...epper/meter/EMFLoggingRegistryConfig.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.meter;
+package org.opensearch.dataprepper.meter;
 
 import io.micrometer.core.instrument.step.StepRegistryConfig;
 

diff --git a/...zon/dataprepper/meter/EMFMetricUtils.java → ...rch/dataprepper/meter/EMFMetricUtils.java b/...zon/dataprepper/meter/EMFMetricUtils.java → ...rch/dataprepper/meter/EMFMetricUtils.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.meter;
+package org.opensearch.dataprepper.meter;
 
 class EMFMetricUtils {
 

diff --git a/...on/dataprepper/parser/ParseException.java → ...ch/dataprepper/parser/ParseException.java b/...on/dataprepper/parser/ParseException.java → ...ch/dataprepper/parser/ParseException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser;
+package org.opensearch.dataprepper.parser;
 
 public class ParseException extends RuntimeException {
     public ParseException(final Throwable cause) {

diff --git a/...arser/PipelineConfigurationValidator.java → ...arser/PipelineConfigurationValidator.java b/...arser/PipelineConfigurationValidator.java → ...arser/PipelineConfigurationValidator.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser;
+package org.opensearch.dataprepper.parser;
 
 import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.parser.model.PipelineConfiguration;
+import org.opensearch.dataprepper.parser.model.PipelineConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...on/dataprepper/parser/PipelineParser.java → ...ch/dataprepper/parser/PipelineParser.java b/...on/dataprepper/parser/PipelineParser.java → ...ch/dataprepper/parser/PipelineParser.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser;
+package org.opensearch.dataprepper.parser;
 
 import com.amazon.dataprepper.model.annotations.SingleThread;
 import com.amazon.dataprepper.model.buffer.Buffer;
@@ -15,10 +15,10 @@
 import com.amazon.dataprepper.model.processor.Processor;
 import com.amazon.dataprepper.model.sink.Sink;
 import com.amazon.dataprepper.model.source.Source;
-import com.amazon.dataprepper.parser.model.PipelineConfiguration;
-import com.amazon.dataprepper.peerforwarder.PeerForwardingProcessorDecorator;
-import com.amazon.dataprepper.pipeline.Pipeline;
-import com.amazon.dataprepper.pipeline.PipelineConnector;
+import org.opensearch.dataprepper.parser.model.PipelineConfiguration;
+import org.opensearch.dataprepper.peerforwarder.PeerForwardingProcessorDecorator;
+import org.opensearch.dataprepper.pipeline.Pipeline;
+import org.opensearch.dataprepper.pipeline.PipelineConnector;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...r/config/DataPrepperAppConfiguration.java → ...r/config/DataPrepperAppConfiguration.java b/...r/config/DataPrepperAppConfiguration.java → ...r/config/DataPrepperAppConfiguration.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser.config;
+package org.opensearch.dataprepper.parser.config;
 
 import com.amazon.dataprepper.model.configuration.PluginModel;
-import com.amazon.dataprepper.parser.model.DataPrepperConfiguration;
+import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...repper/parser/config/DataPrepperArgs.java → ...repper/parser/config/DataPrepperArgs.java b/...repper/parser/config/DataPrepperArgs.java → ...repper/parser/config/DataPrepperArgs.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser.config;
+package org.opensearch.dataprepper.parser.config;
 
 import org.opensearch.dataprepper.logstash.LogstashConfigConverter;
 import org.slf4j.Logger;

diff --git a/...aprepper/parser/config/MetricsConfig.java → ...aprepper/parser/config/MetricsConfig.java b/...aprepper/parser/config/MetricsConfig.java → ...aprepper/parser/config/MetricsConfig.java
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser.config;
+package org.opensearch.dataprepper.parser.config;
 
-import com.amazon.dataprepper.meter.EMFLoggingMeterRegistry;
-import com.amazon.dataprepper.parser.model.DataPrepperConfiguration;
-import com.amazon.dataprepper.parser.model.MetricRegistryType;
-import com.amazon.dataprepper.pipeline.server.CloudWatchMeterRegistryProvider;
+import org.opensearch.dataprepper.meter.EMFLoggingMeterRegistry;
+import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;
+import org.opensearch.dataprepper.parser.model.MetricRegistryType;
+import org.opensearch.dataprepper.pipeline.server.CloudWatchMeterRegistryProvider;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import io.micrometer.cloudwatch2.CloudWatchMeterRegistry;
@@ -37,7 +37,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.amazon.dataprepper.DataPrepper.getServiceNameForMetrics;
+import static org.opensearch.dataprepper.DataPrepper.getServiceNameForMetrics;
 import static com.amazon.dataprepper.metrics.MetricNames.SERVICE_NAME;
 
 @Configuration

diff --git a/...r/config/PipelineParserConfiguration.java → ...r/config/PipelineParserConfiguration.java b/...r/config/PipelineParserConfiguration.java → ...r/config/PipelineParserConfiguration.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser.config;
+package org.opensearch.dataprepper.parser.config;
 
 import com.amazon.dataprepper.model.plugin.PluginFactory;
-import com.amazon.dataprepper.parser.PipelineParser;
+import org.opensearch.dataprepper.parser.PipelineParser;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/...arser/model/DataPrepperConfiguration.java → ...arser/model/DataPrepperConfiguration.java b/...arser/model/DataPrepperConfiguration.java → ...arser/model/DataPrepperConfiguration.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser.model;
+package org.opensearch.dataprepper.parser.model;
 
 import com.amazon.dataprepper.model.configuration.PluginModel;
-import com.amazon.dataprepper.peerforwarder.PeerForwarderConfiguration;
+import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...pper/parser/model/MetricRegistryType.java → ...pper/parser/model/MetricRegistryType.java b/...pper/parser/model/MetricRegistryType.java → ...pper/parser/model/MetricRegistryType.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser.model;
+package org.opensearch.dataprepper.parser.model;
 
 public enum MetricRegistryType {
     // TODO: capitalize enum values

diff --git a/...r/parser/model/PipelineConfiguration.java → ...r/parser/model/PipelineConfiguration.java b/...r/parser/model/PipelineConfiguration.java → ...r/parser/model/PipelineConfiguration.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.parser.model;
+package org.opensearch.dataprepper.parser.model;
 
 import com.amazon.dataprepper.model.configuration.PluginSetting;
 import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;

diff --git a/...n/dataprepper/peerforwarder/HashRing.java → ...h/dataprepper/peerforwarder/HashRing.java b/...n/dataprepper/peerforwarder/HashRing.java → ...h/dataprepper/peerforwarder/HashRing.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder;
+package org.opensearch.dataprepper.peerforwarder;
 
-import com.amazon.dataprepper.peerforwarder.discovery.PeerListProvider;
 import com.linecorp.armeria.client.Endpoint;
+import org.opensearch.dataprepper.peerforwarder.discovery.PeerListProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...prepper/peerforwarder/PeerClientPool.java → ...prepper/peerforwarder/PeerClientPool.java b/...prepper/peerforwarder/PeerClientPool.java → ...prepper/peerforwarder/PeerClientPool.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder;
+package org.opensearch.dataprepper.peerforwarder;
 
 import com.amazon.dataprepper.plugins.certificate.model.Certificate;
 import com.linecorp.armeria.client.ClientBuilder;

diff --git a/...peerforwarder/PeerForwarderAppConfig.java → ...peerforwarder/PeerForwarderAppConfig.java b/...peerforwarder/PeerForwarderAppConfig.java → ...peerforwarder/PeerForwarderAppConfig.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder;
+package org.opensearch.dataprepper.peerforwarder;
 
-import com.amazon.dataprepper.parser.model.DataPrepperConfiguration;
+import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...forwarder/PeerForwarderClientFactory.java → ...forwarder/PeerForwarderClientFactory.java b/...forwarder/PeerForwarderClientFactory.java → ...forwarder/PeerForwarderClientFactory.java
@@ -3,11 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder;
+package org.opensearch.dataprepper.peerforwarder;
 
-import com.amazon.dataprepper.peerforwarder.certificate.CertificateProviderFactory;
-import com.amazon.dataprepper.peerforwarder.discovery.DiscoveryMode;
-import com.amazon.dataprepper.peerforwarder.discovery.PeerListProvider;
+
+import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory;
+import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode;
+import org.opensearch.dataprepper.peerforwarder.discovery.PeerListProvider;
 
 import javax.inject.Inject;
 import javax.inject.Named;

diff --git a/...forwarder/PeerForwarderConfiguration.java → ...forwarder/PeerForwarderConfiguration.java b/...forwarder/PeerForwarderConfiguration.java → ...forwarder/PeerForwarderConfiguration.java
@@ -3,20 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder;
+package org.opensearch.dataprepper.peerforwarder;
 
-import com.amazon.dataprepper.peerforwarder.discovery.DiscoveryMode;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.StringUtils;
+import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 /**
- * Class to hold configuration for Core Peer Forwarder in {@link com.amazon.dataprepper.parser.model.DataPrepperConfiguration},
+ * Class to hold configuration for Core Peer Forwarder in {@link org.opensearch.dataprepper.parser.model.DataPrepperConfiguration},
  * including port, ssl, buffer, peer forwarder client and server configuration.
  * @since 2.0
  */

diff --git a/...forwarder/PeerForwarderReceiveBuffer.java → ...forwarder/PeerForwarderReceiveBuffer.java b/...forwarder/PeerForwarderReceiveBuffer.java → ...forwarder/PeerForwarderReceiveBuffer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder;
+package org.opensearch.dataprepper.peerforwarder;
 
 import com.amazon.dataprepper.model.CheckpointState;
 import com.amazon.dataprepper.model.buffer.Buffer;

diff --git a/...der/PeerForwardingProcessorDecorator.java → ...der/PeerForwardingProcessorDecorator.java b/...der/PeerForwardingProcessorDecorator.java → ...der/PeerForwardingProcessorDecorator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder;
+package org.opensearch.dataprepper.peerforwarder;
 
 import com.amazon.dataprepper.model.event.Event;
 import com.amazon.dataprepper.model.processor.Processor;

diff --git a/...rtificate/CertificateProviderFactory.java → ...rtificate/CertificateProviderFactory.java b/...rtificate/CertificateProviderFactory.java → ...rtificate/CertificateProviderFactory.java
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder.certificate;
+package org.opensearch.dataprepper.peerforwarder.certificate;
 
-import com.amazon.dataprepper.peerforwarder.PeerForwarderConfiguration;
 import com.amazon.dataprepper.plugins.certificate.CertificateProvider;
 import com.amazon.dataprepper.plugins.certificate.acm.ACMCertificateProvider;
 import com.amazon.dataprepper.plugins.certificate.file.FileCertificateProvider;
 import com.amazon.dataprepper.plugins.certificate.s3.S3CertificateProvider;
+import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;

diff --git a/...iscovery/AwsCloudMapPeerListProvider.java → ...iscovery/AwsCloudMapPeerListProvider.java b/...iscovery/AwsCloudMapPeerListProvider.java → ...iscovery/AwsCloudMapPeerListProvider.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder.discovery;
+package org.opensearch.dataprepper.peerforwarder.discovery;
 
-import com.amazon.dataprepper.peerforwarder.PeerForwarderConfiguration;
+import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
 import com.linecorp.armeria.client.Endpoint;
 import com.linecorp.armeria.client.endpoint.DynamicEndpointGroup;
 import com.linecorp.armeria.client.retry.Backoff;

diff --git a/...eerforwarder/discovery/DiscoveryMode.java → ...eerforwarder/discovery/DiscoveryMode.java b/...eerforwarder/discovery/DiscoveryMode.java → ...eerforwarder/discovery/DiscoveryMode.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder.discovery;
+package org.opensearch.dataprepper.peerforwarder.discovery;
 
-import com.amazon.dataprepper.peerforwarder.PeerForwarderConfiguration;
+import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
 
 import java.util.Objects;
 import java.util.function.Function;

diff --git a/...erforwarder/discovery/DiscoveryUtils.java → ...erforwarder/discovery/DiscoveryUtils.java b/...erforwarder/discovery/DiscoveryUtils.java → ...erforwarder/discovery/DiscoveryUtils.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder.discovery;
+package org.opensearch.dataprepper.peerforwarder.discovery;
 
 import com.google.common.net.InternetDomainName;
 import org.apache.commons.validator.routines.InetAddressValidator;

diff --git a/...warder/discovery/DnsPeerListProvider.java → ...warder/discovery/DnsPeerListProvider.java b/...warder/discovery/DnsPeerListProvider.java → ...warder/discovery/DnsPeerListProvider.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder.discovery;
+package org.opensearch.dataprepper.peerforwarder.discovery;
 
-import com.amazon.dataprepper.peerforwarder.PeerForwarderConfiguration;
+import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
 import com.google.common.base.Preconditions;
 import com.linecorp.armeria.client.Endpoint;
 import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup;

diff --git a/...forwarder/discovery/PeerListProvider.java → ...forwarder/discovery/PeerListProvider.java b/...forwarder/discovery/PeerListProvider.java → ...forwarder/discovery/PeerListProvider.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder.discovery;
+package org.opensearch.dataprepper.peerforwarder.discovery;
 
 import com.linecorp.armeria.client.Endpoint;
 import com.linecorp.armeria.common.util.Listenable;

diff --git a/...der/discovery/StaticPeerListProvider.java → ...der/discovery/StaticPeerListProvider.java b/...der/discovery/StaticPeerListProvider.java → ...der/discovery/StaticPeerListProvider.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.peerforwarder.discovery;
+package org.opensearch.dataprepper.peerforwarder.discovery;
 
-import com.amazon.dataprepper.peerforwarder.PeerForwarderConfiguration;
+import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
 import com.google.common.base.Preconditions;
 import com.linecorp.armeria.client.Endpoint;
 import org.slf4j.Logger;