Merge branch 'intro-core-pkg' of github.com:san81/data-prepper into s…

…aas-with-core-refactor
san81 · Oct 14, 2024 · 76b9ce2 · 76b9ce2
2 parents 07be050 + add4086
commit 76b9ce2
Show file tree

Hide file tree

Showing 236 changed files with 709 additions and 554 deletions.
diff --git a/...-api/src/main/java/org/opensearch/dataprepper/model/configuration/DataPrepperVersion.java b/...-api/src/main/java/org/opensearch/dataprepper/model/configuration/DataPrepperVersion.java
@@ -6,7 +6,7 @@
 import java.util.regex.Pattern;
 
 public class DataPrepperVersion {
-    private static final String CURRENT_VERSION = "2.11";
+    private static final String CURRENT_VERSION = "2.10";
 
     private static final String FULL_FORMAT = "%d.%d";
     private static final String SHORTHAND_FORMAT = "%d";

diff --git a/...re/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java b/...re/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java
@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.dataprepper.acknowledgements.DefaultAcknowledgementSetManager;
+import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager;
 import org.opensearch.dataprepper.core.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel;
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
@@ -20,9 +20,9 @@
 import org.opensearch.dataprepper.plugins.test.TestComponent;
 import org.opensearch.dataprepper.plugins.test.TestDISource;
 import org.opensearch.dataprepper.plugins.test.TestPlugin;
-import org.opensearch.dataprepper.validation.LoggingPluginErrorsHandler;
-import org.opensearch.dataprepper.validation.PluginErrorCollector;
-import org.opensearch.dataprepper.validation.PluginErrorsHandler;
+import org.opensearch.dataprepper.core.validation.LoggingPluginErrorsHandler;
+import org.opensearch.dataprepper.core.validation.PluginErrorCollector;
+import org.opensearch.dataprepper.core.validation.PluginErrorsHandler;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import java.util.HashMap;

diff --git a/...repper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java b/...repper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java
@@ -14,26 +14,26 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.dataprepper.acknowledgements.DefaultAcknowledgementSetManager;
-import org.opensearch.dataprepper.breaker.CircuitBreakerManager;
+import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager;
+import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager;
 import org.opensearch.dataprepper.core.event.EventFactoryApplicationContextMarker;
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager;
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
 import org.opensearch.dataprepper.model.event.EventFactory;
 import org.opensearch.dataprepper.model.plugin.PluginFactory;
-import org.opensearch.dataprepper.parser.config.DataPrepperAppConfiguration;
-import org.opensearch.dataprepper.parser.config.FileStructurePathProvider;
-import org.opensearch.dataprepper.parser.config.PipelineParserConfiguration;
-import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider;
-import org.opensearch.dataprepper.pipeline.router.RouterFactory;
+import org.opensearch.dataprepper.core.parser.config.DataPrepperAppConfiguration;
+import org.opensearch.dataprepper.core.parser.config.FileStructurePathProvider;
+import org.opensearch.dataprepper.core.parser.config.PipelineParserConfiguration;
+import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider;
+import org.opensearch.dataprepper.core.pipeline.router.RouterFactory;
 import org.opensearch.dataprepper.plugin.DefaultPluginFactory;
 import org.opensearch.dataprepper.plugin.ObjectMapperConfiguration;
 import org.opensearch.dataprepper.plugin.TestPluggableInterface;
 import org.opensearch.dataprepper.plugins.test.TestExtension;
-import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory;
-import org.opensearch.dataprepper.validation.LoggingPluginErrorsHandler;
-import org.opensearch.dataprepper.validation.PluginErrorCollector;
-import org.opensearch.dataprepper.validation.PluginErrorsHandler;
+import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory;
+import org.opensearch.dataprepper.core.validation.LoggingPluginErrorsHandler;
+import org.opensearch.dataprepper.core.validation.PluginErrorCollector;
+import org.opensearch.dataprepper.core.validation.PluginErrorsHandler;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import java.util.ArrayList;

diff --git a/...integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java b/...integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java
@@ -6,8 +6,8 @@
 package org.opensearch.dataprepper.test.framework;
 
 import org.opensearch.dataprepper.AbstractContextManager;
-import org.opensearch.dataprepper.DataPrepper;
-import org.opensearch.dataprepper.parser.config.FileStructurePathProvider;
+import org.opensearch.dataprepper.core.DataPrepper;
+import org.opensearch.dataprepper.core.parser.config.FileStructurePathProvider;
 import org.opensearch.dataprepper.plugins.InMemorySinkAccessor;
 import org.opensearch.dataprepper.plugins.InMemorySourceAccessor;
 import org.slf4j.Logger;

diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/AbstractContextManager.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/AbstractContextManager.java
@@ -5,6 +5,7 @@
 
 package org.opensearch.dataprepper;
 
+import org.opensearch.dataprepper.core.DataPrepper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -24,7 +25,11 @@
 public abstract class AbstractContextManager {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractContextManager.class);
     private static final String BASE_DATA_PREPPER_PACKAGE = "org.opensearch.dataprepper";
-    private static final String EXPRESSION_PACKAGE = BASE_DATA_PREPPER_PACKAGE + ".expression";
+    private static final String[] BASE_DATA_PREPPER_PACKAGES = {
+            BASE_DATA_PREPPER_PACKAGE + ".core",
+            BASE_DATA_PREPPER_PACKAGE + ".plugin"
+    };
+    private static final String EXPRESSION_PACKAGE =   BASE_DATA_PREPPER_PACKAGE + ".expression";
 
     private final AnnotationConfigApplicationContext publicApplicationContext;
     private final AnnotationConfigApplicationContext coreApplicationContext;
@@ -53,7 +58,7 @@ private void start() {
 
         publicApplicationContext.refresh();
         coreApplicationContext.setParent(publicApplicationContext);
-        coreApplicationContext.scan(BASE_DATA_PREPPER_PACKAGE);
+        coreApplicationContext.scan(BASE_DATA_PREPPER_PACKAGES);
         preRefreshCoreApplicationContext(coreApplicationContext);
 
         coreApplicationContext.refresh();

diff --git a/...g/opensearch/dataprepper/DataPrepper.java → ...nsearch/dataprepper/core/DataPrepper.java b/...g/opensearch/dataprepper/DataPrepper.java → ...nsearch/dataprepper/core/DataPrepper.java
@@ -3,17 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper;
+package org.opensearch.dataprepper.core;
 
 import io.micrometer.core.instrument.util.StringUtils;
+import org.opensearch.dataprepper.DataPrepperShutdownListener;
+import org.opensearch.dataprepper.DataPrepperShutdownOptions;
 import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel;
 import org.opensearch.dataprepper.model.plugin.PluginFactory;
-import org.opensearch.dataprepper.parser.PipelineTransformer;
-import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderServer;
-import org.opensearch.dataprepper.pipeline.Pipeline;
-import org.opensearch.dataprepper.pipeline.PipelineObserver;
-import org.opensearch.dataprepper.pipeline.PipelinesProvider;
-import org.opensearch.dataprepper.pipeline.server.DataPrepperServer;
+import org.opensearch.dataprepper.core.parser.PipelineTransformer;
+import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderServer;
+import org.opensearch.dataprepper.core.pipeline.Pipeline;
+import org.opensearch.dataprepper.core.pipeline.PipelineObserver;
+import org.opensearch.dataprepper.core.pipeline.PipelinesProvider;
+import org.opensearch.dataprepper.core.pipeline.server.DataPrepperServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Lazy;

diff --git a/...wledgements/AcknowledgementAppConfig.java → ...wledgements/AcknowledgementAppConfig.java b/...wledgements/AcknowledgementAppConfig.java → ...wledgements/AcknowledgementAppConfig.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...ledgements/AcknowledgementSetMonitor.java → ...ledgements/AcknowledgementSetMonitor.java b/...ledgements/AcknowledgementSetMonitor.java → ...ledgements/AcknowledgementSetMonitor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet;
 

diff --git a/...ents/AcknowledgementSetMonitorThread.java → ...ents/AcknowledgementSetMonitorThread.java b/...ents/AcknowledgementSetMonitorThread.java → ...ents/AcknowledgementSetMonitorThread.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import java.time.Duration;
 

diff --git a/...cknowledgements/CallbackTheadFactory.java → ...cknowledgements/CallbackTheadFactory.java b/...cknowledgements/CallbackTheadFactory.java → ...cknowledgements/CallbackTheadFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import java.util.Objects;
 import java.util.concurrent.ThreadFactory;

diff --git a/...ledgements/DefaultAcknowledgementSet.java → ...ledgements/DefaultAcknowledgementSet.java b/...ledgements/DefaultAcknowledgementSet.java → ...ledgements/DefaultAcknowledgementSet.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet;
 import org.opensearch.dataprepper.model.acknowledgements.ProgressCheck;

diff --git a/...nts/DefaultAcknowledgementSetManager.java → ...nts/DefaultAcknowledgementSetManager.java b/...nts/DefaultAcknowledgementSetManager.java → ...nts/DefaultAcknowledgementSetManager.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet;
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager;

diff --git a/...nts/DefaultAcknowledgementSetMetrics.java → ...nts/DefaultAcknowledgementSetMetrics.java b/...nts/DefaultAcknowledgementSetMetrics.java → ...nts/DefaultAcknowledgementSetMetrics.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import org.opensearch.dataprepper.metrics.PluginMetrics;
 import io.micrometer.core.instrument.Counter;

diff --git a/...cknowledgements/DefaultProgressCheck.java → ...cknowledgements/DefaultProgressCheck.java b/...cknowledgements/DefaultProgressCheck.java → ...cknowledgements/DefaultProgressCheck.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import org.opensearch.dataprepper.model.acknowledgements.ProgressCheck;
 

diff --git a/...ts/InactiveAcknowledgementSetManager.java → ...ts/InactiveAcknowledgementSetManager.java b/...ts/InactiveAcknowledgementSetManager.java → ...ts/InactiveAcknowledgementSetManager.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.acknowledgements;
+package org.opensearch.dataprepper.core.acknowledgements;
 
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager;
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet;

diff --git a/...pper/breaker/CircuitBreakerAppConfig.java → ...core/breaker/CircuitBreakerAppConfig.java b/...pper/breaker/CircuitBreakerAppConfig.java → ...core/breaker/CircuitBreakerAppConfig.java
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.breaker;
+package org.opensearch.dataprepper.core.breaker;
 
 import org.opensearch.dataprepper.model.breaker.CircuitBreaker;
-import org.opensearch.dataprepper.parser.model.CircuitBreakerConfig;
-import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;
+import org.opensearch.dataprepper.core.parser.model.CircuitBreakerConfig;
+import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/...repper/breaker/CircuitBreakerManager.java → ...r/core/breaker/CircuitBreakerManager.java b/...repper/breaker/CircuitBreakerManager.java → ...r/core/breaker/CircuitBreakerManager.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.breaker;
+package org.opensearch.dataprepper.core.breaker;
 
 import org.opensearch.dataprepper.model.breaker.CircuitBreaker;
 

diff --git a/...taprepper/breaker/HeapCircuitBreaker.java → ...pper/core/breaker/HeapCircuitBreaker.java b/...taprepper/breaker/HeapCircuitBreaker.java → ...pper/core/breaker/HeapCircuitBreaker.java
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.breaker;
+package org.opensearch.dataprepper.core.breaker;
 
 import io.micrometer.core.instrument.Metrics;
 import org.opensearch.dataprepper.model.breaker.CircuitBreaker;
-import org.opensearch.dataprepper.parser.model.HeapCircuitBreakerConfig;
+import org.opensearch.dataprepper.core.parser.model.HeapCircuitBreakerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...aprepper/breaker/InnerCircuitBreaker.java → ...per/core/breaker/InnerCircuitBreaker.java b/...aprepper/breaker/InnerCircuitBreaker.java → ...per/core/breaker/InnerCircuitBreaker.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.breaker;
+package org.opensearch.dataprepper.core.breaker;
 
 import org.opensearch.dataprepper.model.breaker.CircuitBreaker;
 

diff --git a/...ng/SensitiveArgumentMaskingConverter.java → ...ng/SensitiveArgumentMaskingConverter.java b/...ng/SensitiveArgumentMaskingConverter.java → ...ng/SensitiveArgumentMaskingConverter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.logging;
+package org.opensearch.dataprepper.core.logging;
 
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;

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

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

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

diff --git a/...pper/meter/JvmMemoryAggregateMetrics.java → ...core/meter/JvmMemoryAggregateMetrics.java b/...pper/meter/JvmMemoryAggregateMetrics.java → ...core/meter/JvmMemoryAggregateMetrics.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.meter;
+package org.opensearch.dataprepper.core.meter;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/...prepper/parser/CircuitBreakingBuffer.java → ...er/core/parser/CircuitBreakingBuffer.java b/...prepper/parser/CircuitBreakingBuffer.java → ...er/core/parser/CircuitBreakingBuffer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.parser;
+package org.opensearch.dataprepper.core.parser;
 
 import org.opensearch.dataprepper.model.breaker.CircuitBreaker;
 import org.opensearch.dataprepper.model.buffer.Buffer;

diff --git a/...dataprepper/parser/DataFlowComponent.java → ...repper/core/parser/DataFlowComponent.java b/...dataprepper/parser/DataFlowComponent.java → ...repper/core/parser/DataFlowComponent.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.parser;
+package org.opensearch.dataprepper.core.parser;
 
 import java.util.Collection;
 import java.util.HashSet;

diff --git a/...aprepper/parser/MultiBufferDecorator.java → ...per/core/parser/MultiBufferDecorator.java b/...aprepper/parser/MultiBufferDecorator.java → ...per/core/parser/MultiBufferDecorator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.parser;
+package org.opensearch.dataprepper.core.parser;
 
 import org.opensearch.dataprepper.model.buffer.Buffer;
 import org.opensearch.dataprepper.model.buffer.DelegatingBuffer;

diff --git a/...taprepper/parser/PipelineTransformer.java → ...pper/core/parser/PipelineTransformer.java b/...taprepper/parser/PipelineTransformer.java → ...pper/core/parser/PipelineTransformer.java
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.parser;
+package org.opensearch.dataprepper.core.parser;
 
-import org.opensearch.dataprepper.breaker.CircuitBreakerManager;
+import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager;
+import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration;
 import org.opensearch.dataprepper.model.annotations.SingleThread;
 import org.opensearch.dataprepper.model.buffer.Buffer;
 import org.opensearch.dataprepper.model.configuration.PipelineModel;
@@ -18,23 +19,22 @@
 import org.opensearch.dataprepper.model.sink.Sink;
 import org.opensearch.dataprepper.model.source.Source;
 import org.opensearch.dataprepper.model.sink.SinkContext;
-import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;
-import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
-import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider;
-import org.opensearch.dataprepper.peerforwarder.PeerForwardingProcessorDecorator;
+import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration;
+import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider;
+import org.opensearch.dataprepper.core.peerforwarder.PeerForwardingProcessorDecorator;
 import org.opensearch.dataprepper.model.event.EventFactory;
 import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager;
-import org.opensearch.dataprepper.pipeline.Pipeline;
-import org.opensearch.dataprepper.pipeline.PipelineConnector;
+import org.opensearch.dataprepper.core.pipeline.Pipeline;
+import org.opensearch.dataprepper.core.pipeline.PipelineConnector;
 import org.opensearch.dataprepper.pipeline.parser.PipelineConfigurationValidator;
 import org.opensearch.dataprepper.pipeline.parser.model.PipelineConfiguration;
 import org.opensearch.dataprepper.pipeline.parser.model.SinkContextPluginSetting;
-import org.opensearch.dataprepper.pipeline.router.Router;
-import org.opensearch.dataprepper.pipeline.router.RouterFactory;
-import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory;
-import org.opensearch.dataprepper.validation.PluginError;
-import org.opensearch.dataprepper.validation.PluginErrorCollector;
-import org.opensearch.dataprepper.validation.PluginErrorsHandler;
+import org.opensearch.dataprepper.core.pipeline.router.Router;
+import org.opensearch.dataprepper.core.pipeline.router.RouterFactory;
+import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory;
+import org.opensearch.dataprepper.core.validation.PluginError;
+import org.opensearch.dataprepper.core.validation.PluginErrorCollector;
+import org.opensearch.dataprepper.core.validation.PluginErrorsHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;