From 16c74765b89dd4583c67cc18cdfe9d42bb94f477 Mon Sep 17 00:00:00 2001 From: Santhosh Gandhe <1909520+san81@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:05:01 -0700 Subject: [PATCH 1/6] core package introduced in the data-prepper-core module Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com> --- .../plugin/DefaultPluginFactoryIT.java | 2 +- .../dataprepper/plugins/ExtensionsIT.java | 16 ++++---- .../test/framework/DataPrepperTestRunner.java | 2 +- .../opensearch/dataprepper/DataPrepper.java | 12 +++--- .../AcknowledgementAppConfig.java | 2 +- .../AcknowledgementSetMonitor.java | 2 +- .../AcknowledgementSetMonitorThread.java | 2 +- .../CallbackTheadFactory.java | 2 +- .../DefaultAcknowledgementSet.java | 2 +- .../DefaultAcknowledgementSetManager.java | 2 +- .../DefaultAcknowledgementSetMetrics.java | 2 +- .../DefaultProgressCheck.java | 2 +- .../InactiveAcknowledgementSetManager.java | 2 +- .../breaker/CircuitBreakerAppConfig.java | 6 +-- .../breaker/CircuitBreakerManager.java | 2 +- .../breaker/HeapCircuitBreaker.java | 4 +- .../breaker/InnerCircuitBreaker.java | 2 +- .../SensitiveArgumentMaskingConverter.java | 2 +- .../meter/EMFLoggingMeterRegistry.java | 2 +- .../meter/EMFLoggingRegistryConfig.java | 2 +- .../{ => core}/meter/EMFMetricUtils.java | 2 +- .../meter/JvmMemoryAggregateMetrics.java | 2 +- .../parser/CircuitBreakingBuffer.java | 2 +- .../{ => core}/parser/DataFlowComponent.java | 2 +- .../parser/MultiBufferDecorator.java | 2 +- .../parser/PipelineTransformer.java | 22 +++++------ .../parser/config/CustomTagsMeterFilter.java | 2 +- .../config/DataPrepperAppConfiguration.java | 4 +- .../config/FileStructurePathProvider.java | 2 +- .../parser/config/MetricTagFilter.java | 2 +- .../parser/config/MetricsConfig.java | 12 +++--- .../config/PipelineParserConfiguration.java | 14 +++---- .../parser/model/CircuitBreakerConfig.java | 2 +- .../model/DataPrepperConfiguration.java | 8 ++-- .../model/HeapCircuitBreakerConfig.java | 2 +- .../parser/model/MetricRegistryType.java | 2 +- .../model/SourceCoordinationConfig.java | 2 +- .../DefaultPeerForwarderProvider.java | 6 +-- .../ForwardingAuthentication.java | 2 +- .../{ => core}/peerforwarder/HashRing.java | 4 +- .../LocalModePeerForwarderProvider.java | 2 +- .../peerforwarder/LocalPeerForwarder.java | 2 +- .../peerforwarder/PeerClientPool.java | 2 +- .../peerforwarder/PeerForwarder.java | 2 +- .../peerforwarder/PeerForwarderAppConfig.java | 20 +++++----- .../PeerForwarderClientFactory.java | 8 ++-- .../PeerForwarderConfiguration.java | 7 ++-- .../peerforwarder/PeerForwarderProvider.java | 2 +- .../PeerForwarderReceiveBuffer.java | 2 +- .../PeerForwardingProcessorDecorator.java | 6 +-- .../peerforwarder/RemotePeerForwarder.java | 6 +-- .../CertificateProviderFactory.java | 4 +- .../client/PeerForwarderClient.java | 16 ++++---- .../codec/JacksonPeerForwarderCodec.java | 8 ++-- .../codec/JavaPeerForwarderCodec.java | 4 +- .../codec/LoggingObjectInputFilter.java | 2 +- .../codec/PeerForwarderCodec.java | 4 +- .../codec/PeerForwarderCodecAppConfig.java | 6 +-- .../AwsCloudMapPeerListProvider.java | 4 +- .../discovery/DiscoveryMode.java | 4 +- .../discovery/DiscoveryUtils.java | 2 +- .../discovery/DnsPeerListProvider.java | 4 +- .../discovery/LocalPeerListProvider.java | 4 +- .../discovery/PeerListProvider.java | 2 +- .../discovery/StaticPeerListProvider.java | 4 +- ...rderPluginIdentificationKeysException.java | 2 +- ...supportedPeerForwarderPluginException.java | 6 ++- .../model/PeerForwardingEvents.java | 4 +- .../peerforwarder/model/WireEvent.java | 4 +- .../peerforwarder/model/WireEvents.java | 4 +- .../server/NoOpPeerForwarderServer.java | 2 +- .../PeerForwarderHttpServerProvider.java | 8 ++-- .../server/PeerForwarderHttpService.java | 12 +++--- .../server/PeerForwarderServer.java | 2 +- .../server/PeerForwarderServerProxy.java | 6 +-- .../server/RemotePeerForwarderServer.java | 4 +- .../peerforwarder/server/ResponseHandler.java | 2 +- .../{ => core}/pipeline/Pipeline.java | 18 ++++----- .../pipeline/PipelineConnector.java | 2 +- .../{ => core}/pipeline/PipelineObserver.java | 2 +- .../{ => core}/pipeline/PipelineShutdown.java | 2 +- .../pipeline/PipelineShutdownAppConfig.java | 4 +- .../pipeline/PipelineShutdownOption.java | 2 +- .../pipeline/PipelinesProvider.java | 2 +- .../{ => core}/pipeline/ProcessWorker.java | 6 +-- .../pipeline/common/FutureHelper.java | 2 +- .../pipeline/common/FutureHelperResult.java | 2 +- .../common/PipelineThreadFactory.java | 2 +- .../common/PipelineThreadPoolExecutor.java | 4 +- .../router/DataFlowComponentRouter.java | 4 +- .../pipeline/router/RouteEventEvaluator.java | 2 +- .../{ => core}/pipeline/router/Router.java | 4 +- .../pipeline/router/RouterAppConfig.java | 2 +- .../router/RouterCopyRecordStrategy.java | 9 ++--- .../pipeline/router/RouterFactory.java | 2 +- .../router/RouterGetRecordStrategy.java | 2 +- .../CloudWatchMeterRegistryProvider.java | 2 +- ...DataPrepperCoreAuthenticationProvider.java | 2 +- .../pipeline/server/DataPrepperServer.java | 2 +- .../pipeline/server/GetPipelinesHandler.java | 4 +- .../server/HttpBasicAuthenticationConfig.java | 2 +- .../pipeline/server/HttpServerProvider.java | 4 +- .../pipeline/server/ListPipelinesHandler.java | 4 +- .../server/PrometheusMetricsHandler.java | 2 +- .../pipeline/server/ShutdownHandler.java | 2 +- .../{ => core}/pipeline/server/SslUtil.java | 2 +- .../DataPrepperServerConfiguration.java | 12 +++--- .../LeaseBasedSourceCoordinator.java | 4 +- .../sourcecoordination/PartitionManager.java | 2 +- .../SourceCoordinatorAppConfig.java | 6 +-- .../SourceCoordinatorFactory.java | 6 +-- .../EnhancedLeaseBasedSourceCoordinator.java | 4 +- ...DataPrepperCoreAuthenticationProvider.java | 4 +- ...DataPrepperCoreAuthenticationProvider.java | 2 +- .../dataprepper/DataPrepperTests.java | 10 ++--- .../AcknowledgementSetMonitorTests.java | 4 +- .../AcknowledgementSetMonitorThreadTest.java | 4 +- .../CallbackTheadFactoryTest.java | 3 +- ...DefaultAcknowledgementSetManagerTests.java | 3 +- ...DefaultAcknowledgementSetMetricsTests.java | 3 +- .../DefaultAcknowledgementSetTests.java | 4 +- ...nactiveAcknowledgementSetManagerTests.java | 4 +- .../breaker/CircuitBreakerAppConfigTest.java | 10 +++-- .../{ => core}/breaker/CircuitBreakerIT.java | 10 +++-- .../breaker/CircuitBreakerManagerTest.java | 4 +- .../breaker/HeapCircuitBreakerTest.java | 5 ++- ...SensitiveArgumentMaskingConverterTest.java | 5 ++- .../meter/EMFLoggingMeterRegistryTest.java | 4 +- .../meter/EMFLoggingRegistryConfigTest.java | 3 +- .../{ => core}/meter/EMFMetricUtilsTest.java | 3 +- .../meter/JvmMemoryAggregateMetricsTest.java | 7 ++-- .../parser/CircuitBreakingBufferTest.java | 3 +- .../parser/DataFlowComponentTest.java | 3 +- .../parser/MultiBufferDecoratorTest.java | 3 +- .../parser/PipelineTransformerTests.java | 22 ++++++----- .../config/CustomTagsMeterFilterTest.java | 4 +- .../DataPrepperAppConfigurationTest.java | 6 ++- .../parser/config/MetricTagFilterTest.java | 3 +- .../parser/config/MetricsConfigTest.java | 11 +++--- .../PipelineParserConfigurationTest.java | 15 +++---- .../model/DataPrepperConfigurationTests.java | 8 ++-- .../model/HeapCircuitBreakerConfigTest.java | 3 +- .../DefaultPeerForwarderProviderTest.java | 17 ++++++-- .../ForwardingAuthenticationTest.java | 3 +- .../peerforwarder/HashRingTest.java | 5 ++- .../peerforwarder/LocalPeerForwarderTest.java | 3 +- .../peerforwarder/PeerClientPoolTest.java | 2 +- .../PeerForwarderAppConfigIT.java | 12 +++--- .../PeerForwarderAppConfigTest.java | 10 +++-- .../PeerForwarderClientFactoryTest.java | 11 ++++-- .../PeerForwarderConfigurationTest.java | 12 +++--- .../PeerForwarderReceiveBufferTest.java | 3 +- .../PeerForwarder_ClientServerIT.java | 33 +++++++++------- ...PeerForwardingProcessingDecoratorTest.java | 10 +++-- .../RemotePeerForwarderTest.java | 23 ++++++----- .../CertificateProviderFactoryTest.java | 5 ++- .../client/PeerForwarderClientTest.java | 19 ++++----- .../codec/JacksonPeerForwarderCodecTest.java | 7 ++-- .../codec/JavaPeerForwarderCodecTest.java | 5 ++- .../codec/LoggingObjectInputFilterTest.java | 3 +- ...rCodecAppConfig_SerializationFilterIT.java | 10 +++-- ...sCloudMapPeerListProviderCreationTest.java | 6 ++- .../AwsCloudMapPeerListProviderTest.java | 3 +- .../DnsPeerListProviderCreationTest.java | 6 ++- .../discovery/DnsPeerListProviderTest.java | 7 ++-- .../discovery/LocalPeerListProviderTest.java | 5 ++- .../StaticPeerListProviderCreationTest.java | 6 ++- .../discovery/StaticPeerListProviderTest.java | 7 ++-- ...PluginIdentificationKeysExceptionTest.java | 3 +- ...ortedPeerForwarderPluginExceptionTest.java | 2 +- .../server/NoOpPeerForwarderServerTest.java | 3 +- .../PeerForwarderHttpServerProviderTest.java | 8 ++-- .../server/PeerForwarderHttpServiceTest.java | 18 +++++---- .../server/PeerForwarderServerProxyTest.java | 8 ++-- .../server/RemotePeerForwarderServerTest.java | 5 ++- .../server/ResponseHandlerTest.java | 11 +++--- .../pipeline/PipelineConnectorTest.java | 3 +- .../PipelineShutdownAppConfigTest.java | 7 +++- .../pipeline/PipelineShutdownOptionTest.java | 4 +- .../pipeline/PipelineShutdownTest.java | 3 +- .../{ => core}/pipeline/PipelineTests.java | 16 ++++---- .../pipeline/ProcessWorkerTest.java | 8 ++-- .../common/FutureHelperResultTest.java | 3 +- .../pipeline/common/FutureHelperTest.java | 4 +- .../PipelineThreadPoolExecutorTest.java | 6 ++- .../pipeline/common/TestProcessor.java | 2 +- .../router/DataFlowComponentRouterTest.java | 6 ++- .../router/RouteEventEvaluatorTest.java | 3 +- .../router/RouterCopyRecordStrategyTests.java | 8 ++-- .../pipeline/router/RouterFactoryTest.java | 4 +- .../pipeline/router/RouterTest.java | 8 +++- .../CloudWatchMeterRegistryProviderTest.java | 3 +- .../server/DataPrepperServerTest.java | 8 +++- .../server/GetPipelinesHandlerTest.java | 5 ++- .../server/HttpServerProviderTest.java | 5 ++- .../server/ListPipelinesHandlerTest.java | 7 ++-- .../server/PrometheusMetricsHandlerTest.java | 3 +- .../pipeline/server/ShutdownHandlerTest.java | 3 +- .../pipeline/server/SslUtilTest.java | 3 +- .../DataPrepperServerConfigurationTest.java | 11 +++--- .../LeaseBasedSourceCoordinatorTest.java | 39 ++++++++++--------- .../PartitionManagerTest.java | 3 +- .../SourceCoordinatorFactoryTest.java | 5 ++- ...hancedLeaseBasedSourceCoordinatorTest.java | 5 ++- ...PrepperCoreAuthenticationProviderTest.java | 2 +- .../TestSourceWithEnhancedCoordination.java | 2 +- .../parser/model/heap_with_reset.yaml | 2 - .../parser/model/heap_without_reset.yaml | 1 - .../dataprepper/DataPrepperArgs.java | 2 +- .../DataPrepperArgumentConfiguration.java | 2 +- .../extension/GeoIpServiceConfigTest.java | 2 +- .../kafka/source/KafkaSourceJsonTypeIT.java | 2 +- .../source/KafkaSourceSaslPlainTextIT.java | 2 +- .../kafka/source/KafkaSourceSaslScramIT.java | 2 +- .../consumer/KafkaCustomConsumerTest.java | 2 +- .../extension/KafkaClusterConfigTest.java | 2 +- .../extension/KinesisLeaseConfigTest.java | 2 +- .../source/s3/S3ScanObjectWorkerIT.java | 6 +-- .../plugins/source/s3/SqsWorkerIT.java | 2 +- 219 files changed, 654 insertions(+), 510 deletions(-) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/AcknowledgementAppConfig.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/AcknowledgementSetMonitor.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/AcknowledgementSetMonitorThread.java (95%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/CallbackTheadFactory.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/DefaultAcknowledgementSet.java (99%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/DefaultAcknowledgementSetManager.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/DefaultAcknowledgementSetMetrics.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/DefaultProgressCheck.java (87%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/acknowledgements/InactiveAcknowledgementSetManager.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/breaker/CircuitBreakerAppConfig.java (86%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/breaker/CircuitBreakerManager.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/breaker/HeapCircuitBreaker.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/breaker/InnerCircuitBreaker.java (87%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/logging/SensitiveArgumentMaskingConverter.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/meter/EMFLoggingMeterRegistry.java (99%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/meter/EMFLoggingRegistryConfig.java (87%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/meter/EMFMetricUtils.java (95%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/meter/JvmMemoryAggregateMetrics.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/CircuitBreakingBuffer.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/DataFlowComponent.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/MultiBufferDecorator.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/PipelineTransformer.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/config/CustomTagsMeterFilter.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/config/DataPrepperAppConfiguration.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/config/FileStructurePathProvider.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/config/MetricTagFilter.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/config/MetricsConfig.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/config/PipelineParserConfiguration.java (88%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/model/CircuitBreakerConfig.java (91%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/model/DataPrepperConfiguration.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/model/HeapCircuitBreakerConfig.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/model/MetricRegistryType.java (79%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/parser/model/SourceCoordinationConfig.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/DefaultPeerForwarderProvider.java (95%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/ForwardingAuthentication.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/HashRing.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/LocalModePeerForwarderProvider.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/LocalPeerForwarder.java (91%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerClientPool.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarder.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderAppConfig.java (86%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderClientFactory.java (88%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderConfiguration.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderProvider.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderReceiveBuffer.java (99%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwardingProcessorDecorator.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/RemotePeerForwarder.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/certificate/CertificateProviderFactory.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/client/PeerForwarderClient.java (87%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/JacksonPeerForwarderCodec.java (92%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/JavaPeerForwarderCodec.java (91%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/LoggingObjectInputFilter.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/PeerForwarderCodec.java (66%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/PeerForwarderCodecAppConfig.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/AwsCloudMapPeerListProvider.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/DiscoveryMode.java (90%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/DiscoveryUtils.java (86%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/DnsPeerListProvider.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/LocalPeerListProvider.java (85%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/PeerListProvider.java (91%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/StaticPeerListProvider.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java (89%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java (70%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/model/PeerForwardingEvents.java (89%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/model/WireEvent.java (91%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/model/WireEvents.java (88%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/NoOpPeerForwarderServer.java (88%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/PeerForwarderHttpServerProvider.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/PeerForwarderHttpService.java (92%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/PeerForwarderServer.java (86%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/PeerForwarderServerProxy.java (87%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/RemotePeerForwarderServer.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/ResponseHandler.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/Pipeline.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineConnector.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineObserver.java (82%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineShutdown.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineShutdownAppConfig.java (82%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineShutdownOption.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelinesProvider.java (89%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/ProcessWorker.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/common/FutureHelper.java (95%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/common/FutureHelperResult.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/common/PipelineThreadFactory.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/common/PipelineThreadPoolExecutor.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/router/DataFlowComponentRouter.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouteEventEvaluator.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/router/Router.java (95%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouterAppConfig.java (89%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouterCopyRecordStrategy.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouterFactory.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouterGetRecordStrategy.java (85%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/CloudWatchMeterRegistryProvider.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/DataPrepperCoreAuthenticationProvider.java (92%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/DataPrepperServer.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/GetPipelinesHandler.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/HttpBasicAuthenticationConfig.java (93%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/HttpServerProvider.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/ListPipelinesHandler.java (95%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/PrometheusMetricsHandler.java (97%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/ShutdownHandler.java (98%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/SslUtil.java (96%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/pipeline/server/config/DataPrepperServerConfiguration.java (86%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/LeaseBasedSourceCoordinator.java (99%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/PartitionManager.java (92%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/SourceCoordinatorAppConfig.java (83%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/SourceCoordinatorFactory.java (94%) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinator.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/acknowledgements/AcknowledgementSetMonitorTests.java (91%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/acknowledgements/AcknowledgementSetMonitorThreadTest.java (85%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/acknowledgements/CallbackTheadFactoryTest.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/acknowledgements/DefaultAcknowledgementSetManagerTests.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/acknowledgements/DefaultAcknowledgementSetMetricsTests.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/acknowledgements/DefaultAcknowledgementSetTests.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/acknowledgements/InactiveAcknowledgementSetManagerTests.java (84%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/breaker/CircuitBreakerAppConfigTest.java (85%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/breaker/CircuitBreakerIT.java (89%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/breaker/CircuitBreakerManagerTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/breaker/HeapCircuitBreakerTest.java (97%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/logging/SensitiveArgumentMaskingConverterTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/meter/EMFLoggingMeterRegistryTest.java (99%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/meter/EMFLoggingRegistryConfigTest.java (79%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/meter/EMFMetricUtilsTest.java (95%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/meter/JvmMemoryAggregateMetricsTest.java (90%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/CircuitBreakingBufferTest.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/DataFlowComponentTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/MultiBufferDecoratorTest.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/PipelineTransformerTests.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/config/CustomTagsMeterFilterTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/config/DataPrepperAppConfigurationTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/config/MetricTagFilterTest.java (88%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/config/MetricsConfigTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/config/PipelineParserConfigurationTest.java (79%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/model/DataPrepperConfigurationTests.java (97%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/parser/model/HeapCircuitBreakerConfigTest.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/DefaultPeerForwarderProviderTest.java (90%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/ForwardingAuthenticationTest.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/HashRingTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/LocalPeerForwarderTest.java (91%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerClientPoolTest.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderAppConfigIT.java (80%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderAppConfigTest.java (81%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderClientFactoryTest.java (89%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderConfigurationTest.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarderReceiveBufferTest.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwarder_ClientServerIT.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/PeerForwardingProcessingDecoratorTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/RemotePeerForwarderTest.java (95%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/certificate/CertificateProviderFactoryTest.java (92%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/client/PeerForwarderClientTest.java (90%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/JacksonPeerForwarderCodecTest.java (91%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/JavaPeerForwarderCodecTest.java (95%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/LoggingObjectInputFilterTest.java (92%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/codec/PeerForwarderCodecAppConfig_SerializationFilterIT.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java (92%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java (99%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/DnsPeerListProviderCreationTest.java (91%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/DnsPeerListProviderTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/LocalPeerListProviderTest.java (84%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/StaticPeerListProviderCreationTest.java (87%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/discovery/StaticPeerListProviderTest.java (90%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysExceptionTest.java (81%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java (92%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/NoOpPeerForwarderServerTest.java (79%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/PeerForwarderHttpServerProviderTest.java (75%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/PeerForwarderHttpServiceTest.java (89%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/PeerForwarderServerProxyTest.java (89%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/RemotePeerForwarderServerTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/peerforwarder/server/ResponseHandlerTest.java (91%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineConnectorTest.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineShutdownAppConfigTest.java (80%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineShutdownOptionTest.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineShutdownTest.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/PipelineTests.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/ProcessWorkerTest.java (97%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/common/FutureHelperResultTest.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/common/FutureHelperTest.java (89%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/common/PipelineThreadPoolExecutorTest.java (90%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/common/TestProcessor.java (94%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/router/DataFlowComponentRouterTest.java (97%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouteEventEvaluatorTest.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouterCopyRecordStrategyTests.java (98%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouterFactoryTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/router/RouterTest.java (97%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/CloudWatchMeterRegistryProviderTest.java (90%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/DataPrepperServerTest.java (92%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/GetPipelinesHandlerTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/HttpServerProviderTest.java (95%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/ListPipelinesHandlerTest.java (95%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/PrometheusMetricsHandlerTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/ShutdownHandlerTest.java (97%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/SslUtilTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/pipeline/server/config/DataPrepperServerConfigurationTest.java (91%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/LeaseBasedSourceCoordinatorTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/PartitionManagerTest.java (93%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/SourceCoordinatorFactoryTest.java (96%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinatorTest.java (97%) delete mode 100644 data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_with_reset.yaml delete mode 100644 data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_without_reset.yaml diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java index 64c642dae6..e413813766 100644 --- a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java +++ b/data-prepper-core/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; diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java index 53dee72e55..c10a4745e5 100644 --- a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java +++ b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java @@ -14,23 +14,23 @@ 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.core.sourcecoordination.SourceCoordinatorFactory; import org.opensearch.dataprepper.validation.LoggingPluginErrorsHandler; import org.opensearch.dataprepper.validation.PluginErrorCollector; import org.opensearch.dataprepper.validation.PluginErrorsHandler; diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java index 976b0dce66..bf0a39e694 100644 --- a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java +++ b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java @@ -7,7 +7,7 @@ import org.opensearch.dataprepper.AbstractContextManager; import org.opensearch.dataprepper.DataPrepper; -import org.opensearch.dataprepper.parser.config.FileStructurePathProvider; +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/DataPrepper.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/DataPrepper.java index 290198f54f..3a31ca123b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/DataPrepper.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/DataPrepper.java @@ -8,12 +8,12 @@ import io.micrometer.core.instrument.util.StringUtils; 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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementAppConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementAppConfig.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementAppConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementAppConfig.java index 2d32cb116c..41b6e79142 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitor.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitor.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitor.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitor.java index 8c911346db..d5ef616b33 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitor.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorThread.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorThread.java similarity index 95% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorThread.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorThread.java index 98377df89a..af35fec348 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorThread.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/CallbackTheadFactory.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/CallbackTheadFactory.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/CallbackTheadFactory.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/CallbackTheadFactory.java index 5969994f0d..c65e96933c 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/CallbackTheadFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSet.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSet.java similarity index 99% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSet.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSet.java index fd26d10c72..2bd21c61c5 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSet.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetManager.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetManager.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetManager.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetManager.java index b8f81dbfc1..5ef550edcf 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetManager.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetMetrics.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetMetrics.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetMetrics.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetMetrics.java index 6b1b36b592..4200dfdf68 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetMetrics.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultProgressCheck.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultProgressCheck.java similarity index 87% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultProgressCheck.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/DefaultProgressCheck.java index 87b7a8226d..0a4d7f8cd7 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/DefaultProgressCheck.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/InactiveAcknowledgementSetManager.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/InactiveAcknowledgementSetManager.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/InactiveAcknowledgementSetManager.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/InactiveAcknowledgementSetManager.java index 52f0e1978f..29ebeb0b4a 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/acknowledgements/InactiveAcknowledgementSetManager.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/acknowledgements/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/CircuitBreakerAppConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerAppConfig.java similarity index 86% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/CircuitBreakerAppConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerAppConfig.java index c8d6393682..0362b96f33 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/CircuitBreakerAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/CircuitBreakerManager.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerManager.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/CircuitBreakerManager.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerManager.java index 405b9e3bdc..634e0c9906 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/CircuitBreakerManager.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/HeapCircuitBreaker.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/HeapCircuitBreaker.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/HeapCircuitBreaker.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/HeapCircuitBreaker.java index 9993b9e4a8..671e06e5e1 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/HeapCircuitBreaker.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/InnerCircuitBreaker.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/InnerCircuitBreaker.java similarity index 87% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/InnerCircuitBreaker.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/breaker/InnerCircuitBreaker.java index ebaa81fa7d..ba5c9a3509 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/breaker/InnerCircuitBreaker.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/logging/SensitiveArgumentMaskingConverter.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/logging/SensitiveArgumentMaskingConverter.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/logging/SensitiveArgumentMaskingConverter.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/logging/SensitiveArgumentMaskingConverter.java index fa8c184c57..b3bd7a9ce5 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/logging/SensitiveArgumentMaskingConverter.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/logging/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFLoggingMeterRegistry.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java similarity index 99% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFLoggingMeterRegistry.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java index 1ebf870c71..ede3e36600 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFLoggingMeterRegistry.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFLoggingRegistryConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingRegistryConfig.java similarity index 87% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFLoggingRegistryConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingRegistryConfig.java index fd1a0fa189..9beb1d6cd9 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFLoggingRegistryConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFMetricUtils.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFMetricUtils.java similarity index 95% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFMetricUtils.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFMetricUtils.java index 9b12314c79..54112eba83 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/EMFMetricUtils.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/JvmMemoryAggregateMetrics.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/JvmMemoryAggregateMetrics.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/JvmMemoryAggregateMetrics.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/JvmMemoryAggregateMetrics.java index 7311504980..5838c53e97 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/meter/JvmMemoryAggregateMetrics.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/CircuitBreakingBuffer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/CircuitBreakingBuffer.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/CircuitBreakingBuffer.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/CircuitBreakingBuffer.java index d61f183f05..8e721fec1a 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/CircuitBreakingBuffer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/DataFlowComponent.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/DataFlowComponent.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/DataFlowComponent.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/DataFlowComponent.java index 731ad54ea5..a15e028a12 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/DataFlowComponent.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/MultiBufferDecorator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/MultiBufferDecorator.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/MultiBufferDecorator.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/MultiBufferDecorator.java index 76440c0c56..a77f3a441e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/MultiBufferDecorator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineTransformer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineTransformer.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java index c57c5eab61..71b034aac2 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineTransformer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/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,20 +19,19 @@ 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.core.pipeline.router.Router; +import org.opensearch.dataprepper.core.pipeline.router.RouterFactory; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; import org.opensearch.dataprepper.validation.PluginError; import org.opensearch.dataprepper.validation.PluginErrorCollector; import org.opensearch.dataprepper.validation.PluginErrorsHandler; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/CustomTagsMeterFilter.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilter.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/CustomTagsMeterFilter.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilter.java index 0371709544..224fa30a8d 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/CustomTagsMeterFilter.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Tag; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/DataPrepperAppConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/DataPrepperAppConfiguration.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/DataPrepperAppConfiguration.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/DataPrepperAppConfiguration.java index e3783cfd88..0838f147f1 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/DataPrepperAppConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/DataPrepperAppConfiguration.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.model.types.ByteCount; import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/FileStructurePathProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/FileStructurePathProvider.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/FileStructurePathProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/FileStructurePathProvider.java index e72b9df472..1afa745162 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/FileStructurePathProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/FileStructurePathProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import javax.annotation.Nullable; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/MetricTagFilter.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/MetricTagFilter.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/MetricTagFilter.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/MetricTagFilter.java index a5c74e8b7a..db34701623 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/MetricTagFilter.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/MetricTagFilter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/MetricsConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/MetricsConfig.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/MetricsConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/MetricsConfig.java index 27a5e93feb..6675021c92 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/MetricsConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/MetricsConfig.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; -import org.opensearch.dataprepper.meter.EMFLoggingMeterRegistry; -import org.opensearch.dataprepper.meter.JvmMemoryAggregateMetrics; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.parser.model.MetricRegistryType; -import org.opensearch.dataprepper.pipeline.server.CloudWatchMeterRegistryProvider; +import org.opensearch.dataprepper.core.meter.EMFLoggingMeterRegistry; +import org.opensearch.dataprepper.core.meter.JvmMemoryAggregateMetrics; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.MetricRegistryType; +import org.opensearch.dataprepper.core.pipeline.server.CloudWatchMeterRegistryProvider; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import io.micrometer.cloudwatch2.CloudWatchMeterRegistry; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/PipelineParserConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfiguration.java similarity index 88% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/PipelineParserConfiguration.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfiguration.java index 440e618f3b..1c3521abe0 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/config/PipelineParserConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfiguration.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; -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.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; import org.opensearch.dataprepper.model.event.EventFactory; import org.opensearch.dataprepper.model.plugin.PluginFactory; -import org.opensearch.dataprepper.parser.PipelineTransformer; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.parser.PipelineTransformer; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; import org.opensearch.dataprepper.pipeline.parser.PipelineConfigurationFileReader; import org.opensearch.dataprepper.pipeline.parser.PipelineConfigurationReader; import org.opensearch.dataprepper.pipeline.parser.PipelinesDataflowModelParser; import org.opensearch.dataprepper.pipeline.parser.rule.RuleEvaluator; import org.opensearch.dataprepper.pipeline.parser.transformer.DynamicConfigTransformer; import org.opensearch.dataprepper.pipeline.parser.transformer.PipelineConfigurationTransformer; -import org.opensearch.dataprepper.pipeline.router.RouterFactory; -import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory; +import org.opensearch.dataprepper.core.pipeline.router.RouterFactory; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; import org.opensearch.dataprepper.validation.PluginErrorCollector; import org.opensearch.dataprepper.validation.PluginErrorsHandler; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/CircuitBreakerConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/CircuitBreakerConfig.java similarity index 91% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/CircuitBreakerConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/CircuitBreakerConfig.java index 99c9c45406..f3d51a1f5a 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/CircuitBreakerConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/CircuitBreakerConfig.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.model; +package org.opensearch.dataprepper.core.parser.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/DataPrepperConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfiguration.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/DataPrepperConfiguration.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfiguration.java index 58cdefc167..98501a2789 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/DataPrepperConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.model; +package org.opensearch.dataprepper.core.parser.model; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonCreator; @@ -15,9 +15,9 @@ import org.opensearch.dataprepper.core.event.EventConfigurationContainer; import org.opensearch.dataprepper.model.configuration.PipelineExtensions; import org.opensearch.dataprepper.model.configuration.PluginModel; -import org.opensearch.dataprepper.parser.config.MetricTagFilter; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.pipeline.PipelineShutdownOption; +import org.opensearch.dataprepper.core.parser.config.MetricTagFilter; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.pipeline.PipelineShutdownOption; import org.opensearch.dataprepper.plugin.ExtensionsConfiguration; import java.time.Duration; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/HeapCircuitBreakerConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/HeapCircuitBreakerConfig.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/HeapCircuitBreakerConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/HeapCircuitBreakerConfig.java index 1248177a91..ac42bb8a17 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/HeapCircuitBreakerConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/HeapCircuitBreakerConfig.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.model; +package org.opensearch.dataprepper.core.parser.model; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/MetricRegistryType.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/MetricRegistryType.java similarity index 79% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/MetricRegistryType.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/MetricRegistryType.java index 5bee5b7875..10ef2f7b0e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/MetricRegistryType.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/MetricRegistryType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.model; +package org.opensearch.dataprepper.core.parser.model; public enum MetricRegistryType { // TODO: capitalize enum values diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/SourceCoordinationConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/SourceCoordinationConfig.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/SourceCoordinationConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/SourceCoordinationConfig.java index 4e86bfee33..aa2632d2c6 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/SourceCoordinationConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/SourceCoordinationConfig.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.model; +package org.opensearch.dataprepper.core.parser.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/DefaultPeerForwarderProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/DefaultPeerForwarderProvider.java similarity index 95% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/DefaultPeerForwarderProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/DefaultPeerForwarderProvider.java index ff638ee26f..b5382618a3 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/DefaultPeerForwarderProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/DefaultPeerForwarderProvider.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.processor.Processor; -import org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient; -import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; +import org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient; import java.util.HashMap; import java.util.Map; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/ForwardingAuthentication.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/ForwardingAuthentication.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/ForwardingAuthentication.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/ForwardingAuthentication.java index 78ec756e90..cf069e29d6 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/ForwardingAuthentication.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/ForwardingAuthentication.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import java.util.Arrays; import java.util.HashMap; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/HashRing.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/HashRing.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/HashRing.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/HashRing.java index 3a017a691b..8f471f5d20 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/HashRing.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/HashRing.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.linecorp.armeria.client.Endpoint; -import org.opensearch.dataprepper.peerforwarder.discovery.PeerListProvider; +import org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalModePeerForwarderProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/LocalModePeerForwarderProvider.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalModePeerForwarderProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/LocalModePeerForwarderProvider.java index 6c2c4fe688..52f0e06ce4 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalModePeerForwarderProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/LocalModePeerForwarderProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarder.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/LocalPeerForwarder.java similarity index 91% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarder.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/LocalPeerForwarder.java index 87d1514671..9fe8983ebe 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarder.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/LocalPeerForwarder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerClientPool.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerClientPool.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerClientPool.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerClientPool.java index 286f739a34..65793d2174 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerClientPool.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerClientPool.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.linecorp.armeria.client.ClientBuilder; import com.linecorp.armeria.client.ClientFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarder.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarder.java index 4cef5d774c..e6fda09037 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfig.java similarity index 86% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfig.java index 4cca81819d..7c4e8be232 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfig.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodec; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; -import org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient; -import org.opensearch.dataprepper.peerforwarder.codec.PeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderHttpServerProvider; -import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderHttpService; -import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderServer; -import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderServerProxy; -import org.opensearch.dataprepper.peerforwarder.server.ResponseHandler; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpServerProvider; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpService; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderServer; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderServerProxy; +import org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactory.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderClientFactory.java similarity index 88% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactory.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderClientFactory.java index 5c452cfb0f..be1ea1dae7 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderClientFactory.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; +import org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; -import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; -import org.opensearch.dataprepper.peerforwarder.discovery.PeerListProvider; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; public class PeerForwarderClientFactory { public static final int NUM_VIRTUAL_NODES = 128; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderConfiguration.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderConfiguration.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderConfiguration.java index 359a9d1687..27a0e3c83a 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderConfiguration.java @@ -3,12 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; 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 org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; import java.time.Duration; import java.util.ArrayList; @@ -17,7 +18,7 @@ import java.util.Map; /** - * Class to hold configuration for Core Peer Forwarder in {@link org.opensearch.dataprepper.parser.model.DataPrepperConfiguration}, + * Class to hold configuration for Core Peer Forwarder in {@link DataPrepperConfiguration}, * including port, ssl, buffer, peer forwarder client and server configuration. * @since 2.0 */ diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderProvider.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderProvider.java index 40b3a03deb..1ac6b9c349 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBuffer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderReceiveBuffer.java similarity index 99% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBuffer.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderReceiveBuffer.java index 0c40a2acb7..66c3ca2d22 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBuffer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderReceiveBuffer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.google.common.util.concurrent.AtomicDouble; import org.opensearch.dataprepper.model.CheckpointState; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessorDecorator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwardingProcessorDecorator.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessorDecorator.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwardingProcessorDecorator.java index 038bdb28c5..0affa9f45b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessorDecorator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwardingProcessorDecorator.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; +import org.opensearch.dataprepper.core.peerforwarder.exception.EmptyPeerForwarderPluginIdentificationKeysException; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding; import org.opensearch.dataprepper.model.processor.Processor; import org.opensearch.dataprepper.model.record.Record; import org.apache.commons.collections.CollectionUtils; -import org.opensearch.dataprepper.peerforwarder.exception.EmptyPeerForwarderPluginIdentificationKeysException; -import org.opensearch.dataprepper.peerforwarder.exception.UnsupportedPeerForwarderPluginException; +import org.opensearch.dataprepper.core.peerforwarder.exception.UnsupportedPeerForwarderPluginException; import java.util.Collection; import java.util.Collections; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarder.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/RemotePeerForwarder.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarder.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/RemotePeerForwarder.java index d0c01a09ab..f0319eade3 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarder.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/RemotePeerForwarder.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.linecorp.armeria.common.AggregatedHttpResponse; import com.linecorp.armeria.common.HttpStatus; +import org.opensearch.dataprepper.core.peerforwarder.discovery.StaticPeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; -import org.opensearch.dataprepper.peerforwarder.discovery.StaticPeerListProvider; -import org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient; +import org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/certificate/CertificateProviderFactory.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/certificate/CertificateProviderFactory.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/certificate/CertificateProviderFactory.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/certificate/CertificateProviderFactory.java index 99db5d5d0b..175c28c4e9 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/certificate/CertificateProviderFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/certificate/CertificateProviderFactory.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.certificate; +package org.opensearch.dataprepper.core.peerforwarder.certificate; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; import org.opensearch.dataprepper.plugins.certificate.acm.ACMCertificateProvider; import org.opensearch.dataprepper.plugins.certificate.file.FileCertificateProvider; import org.opensearch.dataprepper.plugins.certificate.s3.S3CertificateProvider; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.plugins.metricpublisher.MicrometerMetricPublisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/client/PeerForwarderClient.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/client/PeerForwarderClient.java similarity index 87% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/client/PeerForwarderClient.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/client/PeerForwarderClient.java index 9acb6f505c..e01ef392e3 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/client/PeerForwarderClient.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/client/PeerForwarderClient.java @@ -3,8 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.client; +package org.opensearch.dataprepper.core.peerforwarder.client; +import org.opensearch.dataprepper.core.peerforwarder.PeerClientPool; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderClientFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; @@ -12,11 +17,6 @@ import com.linecorp.armeria.common.AggregatedHttpResponse; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Timer; -import org.opensearch.dataprepper.peerforwarder.PeerClientPool; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderClientFactory; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.codec.PeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +27,6 @@ import java.util.concurrent.Executors; import java.util.stream.Collectors; -import static org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration.DEFAULT_PEER_FORWARDING_URI; - public class PeerForwarderClient { private static final Logger LOG = LoggerFactory.getLogger(PeerForwarderClient.class); static final String REQUESTS = "requests"; @@ -91,7 +89,7 @@ private byte[] getSerializedJsonBytes(final Collection> records, f private CompletableFuture processHttpRequest(final WebClient client, final byte[] content) { return CompletableFuture.supplyAsync(() -> { - final CompletableFuture aggregate = client.post(DEFAULT_PEER_FORWARDING_URI, content).aggregate(); + final CompletableFuture aggregate = client.post(PeerForwarderConfiguration.DEFAULT_PEER_FORWARDING_URI, content).aggregate(); return aggregate.join(); }, executorService); } diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/JacksonPeerForwarderCodec.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/JacksonPeerForwarderCodec.java similarity index 92% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/JacksonPeerForwarderCodec.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/JacksonPeerForwarderCodec.java index 4fac8a7c2d..0ef119189d 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/JacksonPeerForwarderCodec.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/JacksonPeerForwarderCodec.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; import com.fasterxml.jackson.databind.ObjectMapper; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.model.WireEvent; +import org.opensearch.dataprepper.core.peerforwarder.model.WireEvents; import org.opensearch.dataprepper.model.event.DefaultEventMetadata; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.model.trace.JacksonSpan; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; -import org.opensearch.dataprepper.peerforwarder.model.WireEvent; -import org.opensearch.dataprepper.peerforwarder.model.WireEvents; import java.io.IOException; import java.util.List; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/JavaPeerForwarderCodec.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/JavaPeerForwarderCodec.java similarity index 91% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/JavaPeerForwarderCodec.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/JavaPeerForwarderCodec.java index 97b77358ef..d90249940a 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/JavaPeerForwarderCodec.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/JavaPeerForwarderCodec.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/LoggingObjectInputFilter.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/LoggingObjectInputFilter.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/LoggingObjectInputFilter.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/LoggingObjectInputFilter.java index 16de7cdb5a..59d966a199 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/LoggingObjectInputFilter.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/LoggingObjectInputFilter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodec.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodec.java similarity index 66% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodec.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodec.java index fa7783be7d..ee013865d1 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodec.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodec.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; public interface PeerForwarderCodec { byte[] serialize(PeerForwardingEvents peerForwardingEvents) throws Exception; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodecAppConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodecAppConfig.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodecAppConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodecAppConfig.java index 70c8600121..a76a0ad3c3 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodecAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodecAppConfig.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -66,7 +66,7 @@ public ObjectInputFilter objectInputFilter(final PeerForwarderConfiguration peer "com.fasterxml.jackson.databind.node.NodeSerialization;" + "com.fasterxml.jackson.databind.node.ObjectNode;" + "com.fasterxml.jackson.databind.node.ArrayNode;" + - "org.opensearch.dataprepper.peerforwarder.model.*;" + + "org.opensearch.dataprepper.core.peerforwarder.model.*;" + baseModelPackage + ".event.*;" + baseModelPackage + ".trace.*;" + baseModelPackage + ".log.*;" + diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProvider.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProvider.java index 1b86adebfe..07e05accbe 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.DynamicEndpointGroup; @@ -11,8 +11,8 @@ import com.linecorp.armeria.common.CommonPools; import io.netty.channel.EventLoop; import io.netty.util.concurrent.ScheduledFuture; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.plugins.metricpublisher.MicrometerMetricPublisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DiscoveryMode.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DiscoveryMode.java similarity index 90% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DiscoveryMode.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DiscoveryMode.java index 30b165bf7f..f4e420b8dc 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DiscoveryMode.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DiscoveryMode.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import java.util.Objects; import java.util.function.BiFunction; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DiscoveryUtils.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DiscoveryUtils.java similarity index 86% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DiscoveryUtils.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DiscoveryUtils.java index 13b8dbccaf..7116fa6461 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DiscoveryUtils.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DiscoveryUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.google.common.net.InternetDomainName; import org.apache.commons.validator.routines.InetAddressValidator; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProvider.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProvider.java index 85d73d643c..ac9021ac91 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProvider.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.google.common.base.Preconditions; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/LocalPeerListProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/LocalPeerListProvider.java similarity index 85% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/LocalPeerListProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/LocalPeerListProvider.java index 735c5cda07..1804e1e424 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/LocalPeerListProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/LocalPeerListProvider.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.linecorp.armeria.client.Endpoint; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import java.util.Collections; import java.util.List; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/PeerListProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/PeerListProvider.java similarity index 91% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/PeerListProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/PeerListProvider.java index 3b70165196..484d88fe77 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/PeerListProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/PeerListProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.common.util.Listenable; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProvider.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProvider.java index 4825538e1e..fd7f379217 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProvider.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.google.common.base.Preconditions; import com.linecorp.armeria.client.Endpoint; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java similarity index 89% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java index 6fc939f5ef..d9fea9bc03 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.exception; +package org.opensearch.dataprepper.core.peerforwarder.exception; /** * This exception is thrown when processor which implements diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java similarity index 70% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java index b70f3be277..1e893ad26f 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java @@ -3,12 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.exception; +package org.opensearch.dataprepper.core.peerforwarder.exception; + +import org.opensearch.dataprepper.core.peerforwarder.PeerForwardingProcessorDecorator; /** * This exception is thrown when processor which doesn't implement * {@link org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding} interface is passed to - * {@link org.opensearch.dataprepper.peerforwarder.PeerForwardingProcessorDecorator}. + * {@link PeerForwardingProcessorDecorator}. * * @since 2.0 */ diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/PeerForwardingEvents.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/PeerForwardingEvents.java similarity index 89% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/PeerForwardingEvents.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/PeerForwardingEvents.java index 5b70f4ce72..cced0228b3 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/PeerForwardingEvents.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/PeerForwardingEvents.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.model; +package org.opensearch.dataprepper.core.peerforwarder.model; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarder; import org.opensearch.dataprepper.model.event.Event; -import org.opensearch.dataprepper.peerforwarder.PeerForwarder; import java.io.Serializable; import java.util.List; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/WireEvent.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/WireEvent.java similarity index 91% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/WireEvent.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/WireEvent.java index c824cbff10..0d447ce085 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/WireEvent.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/WireEvent.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.model; +package org.opensearch.dataprepper.core.peerforwarder.model; -import org.opensearch.dataprepper.peerforwarder.PeerForwarder; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarder; import java.time.Instant; import java.util.Map; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/WireEvents.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/WireEvents.java similarity index 88% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/WireEvents.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/WireEvents.java index 09183e0508..8a07e93776 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/model/WireEvents.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/model/WireEvents.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.model; +package org.opensearch.dataprepper.core.peerforwarder.model; -import org.opensearch.dataprepper.peerforwarder.PeerForwarder; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarder; import java.util.List; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/NoOpPeerForwarderServer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/NoOpPeerForwarderServer.java similarity index 88% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/NoOpPeerForwarderServer.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/NoOpPeerForwarderServer.java index ed66c1fc37..20bd7459a0 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/NoOpPeerForwarderServer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/NoOpPeerForwarderServer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; /** * Class to handle NoOp Peer Forwarder server if no peers are configured diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServerProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServerProvider.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServerProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServerProvider.java index aab39c2e3f..6e347e3c75 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServerProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServerProvider.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import com.linecorp.armeria.server.Server; import com.linecorp.armeria.server.ServerBuilder; import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.util.FingerprintTrustManagerFactory; -import org.opensearch.dataprepper.peerforwarder.ForwardingAuthentication; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.core.peerforwarder.ForwardingAuthentication; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; import org.opensearch.dataprepper.plugins.certificate.model.Certificate; import org.slf4j.Logger; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpService.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpService.java similarity index 92% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpService.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpService.java index bb2d32f931..732f994246 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpService.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpService.java @@ -3,9 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import io.micrometer.core.instrument.Counter; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; @@ -15,11 +19,7 @@ import com.linecorp.armeria.common.HttpStatus; import com.linecorp.armeria.server.annotation.Post; import io.micrometer.core.instrument.Timer; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderReceiveBuffer; -import org.opensearch.dataprepper.peerforwarder.codec.PeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServer.java similarity index 86% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServer.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServer.java index 3286c6c31b..0c30b3c972 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; /** * Interface to start and stop Peer Forwarder server diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServerProxy.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServerProxy.java similarity index 87% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServerProxy.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServerProxy.java index f0059687ce..635d0317f9 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServerProxy.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServerProxy.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import com.linecorp.armeria.server.Server; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; public class PeerForwarderServerProxy implements PeerForwarderServer { private final PeerForwarderHttpServerProvider peerForwarderHttpServerProvider; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/RemotePeerForwarderServer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/RemotePeerForwarderServer.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/RemotePeerForwarderServer.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/RemotePeerForwarderServer.java index dc0b796bbf..d26c0b3927 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/RemotePeerForwarderServer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/RemotePeerForwarderServer.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import com.linecorp.armeria.server.Server; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/ResponseHandler.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/ResponseHandler.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/ResponseHandler.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/ResponseHandler.java index e48808d731..f0931a4f20 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/server/ResponseHandler.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/peerforwarder/server/ResponseHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.buffer.SizeOverflowException; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/Pipeline.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/Pipeline.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/Pipeline.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/Pipeline.java index c3d604601d..8b635f79f6 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/Pipeline.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/Pipeline.java @@ -3,11 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import com.google.common.base.Preconditions; import org.opensearch.dataprepper.DataPrepperShutdownOptions; -import org.opensearch.dataprepper.acknowledgements.InactiveAcknowledgementSetManager; +import org.opensearch.dataprepper.core.acknowledgements.InactiveAcknowledgementSetManager; +import org.opensearch.dataprepper.core.pipeline.common.PipelineThreadFactory; +import org.opensearch.dataprepper.core.pipeline.common.PipelineThreadPoolExecutor; +import org.opensearch.dataprepper.core.pipeline.router.Router; +import org.opensearch.dataprepper.core.pipeline.router.RouterGetRecordStrategy; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.model.buffer.Buffer; import org.opensearch.dataprepper.model.event.EventFactory; @@ -21,13 +25,9 @@ import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; import org.opensearch.dataprepper.model.source.coordinator.enhanced.UsesEnhancedSourceCoordination; -import org.opensearch.dataprepper.parser.DataFlowComponent; -import org.opensearch.dataprepper.pipeline.common.PipelineThreadFactory; -import org.opensearch.dataprepper.pipeline.common.PipelineThreadPoolExecutor; -import org.opensearch.dataprepper.pipeline.router.Router; -import org.opensearch.dataprepper.pipeline.router.RouterCopyRecordStrategy; -import org.opensearch.dataprepper.pipeline.router.RouterGetRecordStrategy; -import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.pipeline.router.RouterCopyRecordStrategy; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineConnector.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineConnector.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineConnector.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineConnector.java index f19ff36697..aaf113480b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineConnector.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineConnector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.opensearch.dataprepper.model.buffer.Buffer; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineObserver.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineObserver.java similarity index 82% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineObserver.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineObserver.java index 4d07deede9..8c2fc37c7a 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineObserver.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineObserver.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; /** * Allows an observer to observe major changes in pipelines. diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdown.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdown.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdown.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdown.java index 7398e3f688..fcb44a544b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdown.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdown.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.opensearch.dataprepper.DataPrepperShutdownOptions; import org.opensearch.dataprepper.model.buffer.Buffer; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdownAppConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownAppConfig.java similarity index 82% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdownAppConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownAppConfig.java index 510ad02cc6..9c4b04d2ff 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdownAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownAppConfig.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdownOption.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownOption.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdownOption.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownOption.java index d700100e02..adf06dd83e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineShutdownOption.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownOption.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelinesProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelinesProvider.java similarity index 89% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelinesProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelinesProvider.java index 8d6dc8bda8..15ebc4962f 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelinesProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/PipelinesProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/ProcessWorker.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/ProcessWorker.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/ProcessWorker.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/ProcessWorker.java index 8117848f9a..e2e1c5b338 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/ProcessWorker.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/ProcessWorker.java @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import io.micrometer.core.instrument.Counter; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelper; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.buffer.Buffer; @@ -15,8 +16,7 @@ import org.opensearch.dataprepper.model.event.InternalEventHandle; import org.opensearch.dataprepper.model.processor.Processor; import org.opensearch.dataprepper.model.record.Record; -import org.opensearch.dataprepper.pipeline.common.FutureHelper; -import org.opensearch.dataprepper.pipeline.common.FutureHelperResult; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelperResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/FutureHelper.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelper.java similarity index 95% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/FutureHelper.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelper.java index c7c17c88ba..74dabfe251 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/FutureHelper.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/FutureHelperResult.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperResult.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/FutureHelperResult.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperResult.java index da3bb1ce6a..5769629823 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/FutureHelperResult.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperResult.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; import java.util.Collections; import java.util.List; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadFactory.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadFactory.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadFactory.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadFactory.java index 707cf61885..3df65890f4 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadPoolExecutor.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadPoolExecutor.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadPoolExecutor.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadPoolExecutor.java index 673cb230d2..0d9219206e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadPoolExecutor.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadPoolExecutor.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; -import org.opensearch.dataprepper.pipeline.Pipeline; +import org.opensearch.dataprepper.core.pipeline.Pipeline; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/DataFlowComponentRouter.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/DataFlowComponentRouter.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/DataFlowComponentRouter.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/DataFlowComponentRouter.java index 4e5c89cc29..302229e0b8 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/DataFlowComponentRouter.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/DataFlowComponentRouter.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; import org.opensearch.dataprepper.model.record.Record; -import org.opensearch.dataprepper.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; import java.util.ArrayList; import java.util.Collection; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouteEventEvaluator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouteEventEvaluator.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouteEventEvaluator.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouteEventEvaluator.java index 6d7c1ce3b0..b3a2c80645 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouteEventEvaluator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouteEventEvaluator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; import org.opensearch.dataprepper.model.configuration.ConditionalRoute; import org.opensearch.dataprepper.model.event.Event; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/Router.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/Router.java similarity index 95% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/Router.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/Router.java index 16a280f39c..fd59bcdb0b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/Router.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/Router.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.event.Event; -import org.opensearch.dataprepper.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; import java.util.Collection; import java.util.Map; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterAppConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterAppConfig.java similarity index 89% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterAppConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterAppConfig.java index dbfca03124..ff50366c7d 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterAppConfig.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; import org.opensearch.dataprepper.expression.ExpressionEvaluator; import org.springframework.context.annotation.Bean; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterCopyRecordStrategy.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterCopyRecordStrategy.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterCopyRecordStrategy.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterCopyRecordStrategy.java index b4982c5b07..198943b2c1 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterCopyRecordStrategy.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterCopyRecordStrategy.java @@ -3,15 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; -import org.opensearch.dataprepper.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.pipeline.PipelineConnector; import org.opensearch.dataprepper.model.record.Record; -import org.opensearch.dataprepper.pipeline.PipelineConnector; import org.opensearch.dataprepper.model.trace.Span; import org.opensearch.dataprepper.model.trace.JacksonSpan; -import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.model.event.EventFactory; @@ -21,7 +20,7 @@ import org.opensearch.dataprepper.model.event.EventMetadata; import org.opensearch.dataprepper.model.event.DefaultEventHandle; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; -import org.opensearch.dataprepper.acknowledgements.InactiveAcknowledgementSetManager; +import org.opensearch.dataprepper.core.acknowledgements.InactiveAcknowledgementSetManager; import java.util.ArrayList; import java.util.Collection; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterFactory.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterFactory.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterFactory.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterFactory.java index 2c7c81150b..06214e406e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; import org.opensearch.dataprepper.model.configuration.ConditionalRoute; import org.opensearch.dataprepper.expression.ExpressionEvaluator; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterGetRecordStrategy.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterGetRecordStrategy.java similarity index 85% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterGetRecordStrategy.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterGetRecordStrategy.java index 184e6b1687..d86f7d77c7 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/router/RouterGetRecordStrategy.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/router/RouterGetRecordStrategy.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/CloudWatchMeterRegistryProvider.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/CloudWatchMeterRegistryProvider.java index beaca0ff3f..125037e90e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/CloudWatchMeterRegistryProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import io.micrometer.cloudwatch2.CloudWatchConfig; import io.micrometer.cloudwatch2.CloudWatchMeterRegistry; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/DataPrepperCoreAuthenticationProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperCoreAuthenticationProvider.java similarity index 92% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/DataPrepperCoreAuthenticationProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperCoreAuthenticationProvider.java index 7b1f1510bd..9438213cd4 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/DataPrepperCoreAuthenticationProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperCoreAuthenticationProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.Authenticator; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/DataPrepperServer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperServer.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/DataPrepperServer.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperServer.java index 5670af0a13..a67875acb5 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/DataPrepperServer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperServer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.Authenticator; import com.sun.net.httpserver.HttpContext; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/GetPipelinesHandler.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/GetPipelinesHandler.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/GetPipelinesHandler.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/GetPipelinesHandler.java index 9f19a599b9..8120ad9979 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/GetPipelinesHandler.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/GetPipelinesHandler.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.fasterxml.jackson.databind.ObjectMapper; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; +import org.opensearch.dataprepper.core.pipeline.PipelinesProvider; import org.opensearch.dataprepper.model.configuration.PipelineModel; -import org.opensearch.dataprepper.pipeline.PipelinesProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/HttpBasicAuthenticationConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/HttpBasicAuthenticationConfig.java similarity index 93% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/HttpBasicAuthenticationConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/HttpBasicAuthenticationConfig.java index 1abd774489..748bc608d9 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/HttpBasicAuthenticationConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/HttpBasicAuthenticationConfig.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/HttpServerProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/HttpServerProvider.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/HttpServerProvider.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/HttpServerProvider.java index 1d470bf03a..6110113a6c 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/HttpServerProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/HttpServerProvider.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpsConfigurator; import com.sun.net.httpserver.HttpsParameters; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/ListPipelinesHandler.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ListPipelinesHandler.java similarity index 95% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/ListPipelinesHandler.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ListPipelinesHandler.java index ab933b6c69..fed53aff9a 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/ListPipelinesHandler.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ListPipelinesHandler.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.fasterxml.jackson.databind.ObjectMapper; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; -import org.opensearch.dataprepper.pipeline.PipelinesProvider; +import org.opensearch.dataprepper.core.pipeline.PipelinesProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/PrometheusMetricsHandler.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/PrometheusMetricsHandler.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/PrometheusMetricsHandler.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/PrometheusMetricsHandler.java index 0af3f82592..5f5d150f3d 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/PrometheusMetricsHandler.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/PrometheusMetricsHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/ShutdownHandler.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandler.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/ShutdownHandler.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandler.java index e3da8fc51d..aa90b7efe7 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/ShutdownHandler.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/SslUtil.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/SslUtil.java similarity index 96% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/SslUtil.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/SslUtil.java index 521fc71772..a5f68397ea 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/SslUtil.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/SslUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/config/DataPrepperServerConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfiguration.java similarity index 86% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/config/DataPrepperServerConfiguration.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfiguration.java index 49b12a8e52..de6739adf4 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/server/config/DataPrepperServerConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfiguration.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server.config; +package org.opensearch.dataprepper.core.pipeline.server.config; import org.opensearch.dataprepper.DataPrepper; +import org.opensearch.dataprepper.core.pipeline.PipelinesProvider; +import org.opensearch.dataprepper.core.pipeline.server.DataPrepperCoreAuthenticationProvider; +import org.opensearch.dataprepper.core.pipeline.server.ShutdownHandler; 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.pipeline.PipelinesProvider; -import org.opensearch.dataprepper.pipeline.server.DataPrepperCoreAuthenticationProvider; -import org.opensearch.dataprepper.pipeline.server.GetPipelinesHandler; -import org.opensearch.dataprepper.pipeline.server.ListPipelinesHandler; -import org.opensearch.dataprepper.pipeline.server.ShutdownHandler; +import org.opensearch.dataprepper.core.pipeline.server.GetPipelinesHandler; +import org.opensearch.dataprepper.core.pipeline.server.ListPipelinesHandler; import com.sun.net.httpserver.Authenticator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/LeaseBasedSourceCoordinator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/LeaseBasedSourceCoordinator.java similarity index 99% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/LeaseBasedSourceCoordinator.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/LeaseBasedSourceCoordinator.java index b66edb496a..cf2eada3ec 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/LeaseBasedSourceCoordinator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/LeaseBasedSourceCoordinator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination; +package org.opensearch.dataprepper.core.sourcecoordination; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -20,7 +20,7 @@ import org.opensearch.dataprepper.model.source.coordinator.exceptions.PartitionNotOwnedException; import org.opensearch.dataprepper.model.source.coordinator.exceptions.PartitionUpdateException; import org.opensearch.dataprepper.model.source.coordinator.exceptions.UninitializedSourceCoordinatorException; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/PartitionManager.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/PartitionManager.java similarity index 92% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/PartitionManager.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/PartitionManager.java index 4a8b9ef1c6..c6e980359c 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/PartitionManager.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/PartitionManager.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination; +package org.opensearch.dataprepper.core.sourcecoordination; import org.opensearch.dataprepper.model.source.coordinator.SourcePartition; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorAppConfig.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorAppConfig.java similarity index 83% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorAppConfig.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorAppConfig.java index 7df88dbde7..2635e5d198 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorAppConfig.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination; +package org.opensearch.dataprepper.core.sourcecoordination; import org.opensearch.dataprepper.model.plugin.PluginFactory; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorFactory.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorFactory.java similarity index 94% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorFactory.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorFactory.java index d98e447339..0c078eeb0b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorFactory.java @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination; +package org.opensearch.dataprepper.core.sourcecoordination; +import org.opensearch.dataprepper.core.sourcecoordination.enhanced.EnhancedLeaseBasedSourceCoordinator; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.model.source.coordinator.SourceCoordinator; @@ -12,8 +13,7 @@ import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; -import org.opensearch.dataprepper.sourcecoordination.enhanced.EnhancedLeaseBasedSourceCoordinator; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinator.java similarity index 98% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinator.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinator.java index a07706152a..c69ba22120 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination.enhanced; +package org.opensearch.dataprepper.core.sourcecoordination.enhanced; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.source.SourceCoordinationStore; @@ -11,7 +11,7 @@ import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProvider.java index 0a76e939d4..2565bb70ac 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProvider.java @@ -7,8 +7,8 @@ import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; -import org.opensearch.dataprepper.pipeline.server.DataPrepperCoreAuthenticationProvider; -import org.opensearch.dataprepper.pipeline.server.HttpBasicAuthenticationConfig; +import org.opensearch.dataprepper.core.pipeline.server.DataPrepperCoreAuthenticationProvider; +import org.opensearch.dataprepper.core.pipeline.server.HttpBasicAuthenticationConfig; import com.sun.net.httpserver.Authenticator; import com.sun.net.httpserver.BasicAuthenticator; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedDataPrepperCoreAuthenticationProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedDataPrepperCoreAuthenticationProvider.java index 3a8b71466f..6346880bfe 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedDataPrepperCoreAuthenticationProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedDataPrepperCoreAuthenticationProvider.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.plugins; import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; -import org.opensearch.dataprepper.pipeline.server.DataPrepperCoreAuthenticationProvider; +import org.opensearch.dataprepper.core.pipeline.server.DataPrepperCoreAuthenticationProvider; import com.sun.net.httpserver.Authenticator; /** diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/DataPrepperTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/DataPrepperTests.java index 3332be605f..ca3adac0ea 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/DataPrepperTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/DataPrepperTests.java @@ -13,11 +13,11 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; 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.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.server.DataPrepperServer; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorTests.java similarity index 91% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorTests.java index 158841a44a..35229a0005 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorTests.java @@ -3,8 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.acknowledgements; +package org.opensearch.dataprepper.core.acknowledgements; +import org.opensearch.dataprepper.core.acknowledgements.AcknowledgementSetMonitor; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSet; import org.opensearch.dataprepper.model.event.DefaultEventHandle; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorThreadTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorThreadTest.java similarity index 85% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorThreadTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorThreadTest.java index 301e90c02e..1b4d0af29e 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/AcknowledgementSetMonitorThreadTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/AcknowledgementSetMonitorThreadTest.java @@ -3,13 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.acknowledgements; +package org.opensearch.dataprepper.core.acknowledgements; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.acknowledgements.AcknowledgementSetMonitor; +import org.opensearch.dataprepper.core.acknowledgements.AcknowledgementSetMonitorThread; import java.time.Duration; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/CallbackTheadFactoryTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/CallbackTheadFactoryTest.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/CallbackTheadFactoryTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/CallbackTheadFactoryTest.java index 4f781cfbd3..0417df72de 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/CallbackTheadFactoryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/CallbackTheadFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.acknowledgements; +package org.opensearch.dataprepper.core.acknowledgements; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -11,6 +11,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.acknowledgements.CallbackTheadFactory; import java.util.concurrent.ThreadFactory; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetManagerTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetManagerTests.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetManagerTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetManagerTests.java index a083f5ea85..6d841bcaf8 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetManagerTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetManagerTests.java @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.acknowledgements; +package org.opensearch.dataprepper.core.acknowledgements; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager; import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.model.event.DefaultEventHandle; import org.opensearch.dataprepper.metrics.PluginMetrics; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetMetricsTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetMetricsTests.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetMetricsTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetMetricsTests.java index 650aad28e3..be1620a44b 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetMetricsTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetMetricsTests.java @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.acknowledgements; +package org.opensearch.dataprepper.core.acknowledgements; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetMetrics; import org.opensearch.dataprepper.metrics.PluginMetrics; import io.micrometer.core.instrument.Counter; import static org.mockito.Mockito.times; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetTests.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetTests.java index a3ee665adf..d9b043888a 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/DefaultAcknowledgementSetTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/DefaultAcknowledgementSetTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.acknowledgements; +package org.opensearch.dataprepper.core.acknowledgements; import org.awaitility.Awaitility; import static org.awaitility.Awaitility.await; @@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSet; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetMetrics; import org.opensearch.dataprepper.model.event.DefaultEventHandle; import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/InactiveAcknowledgementSetManagerTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/InactiveAcknowledgementSetManagerTests.java similarity index 84% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/InactiveAcknowledgementSetManagerTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/InactiveAcknowledgementSetManagerTests.java index 8a0a4d2ffd..09c655a3c0 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/acknowledgements/InactiveAcknowledgementSetManagerTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/acknowledgements/InactiveAcknowledgementSetManagerTests.java @@ -3,10 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.acknowledgements; +package org.opensearch.dataprepper.core.acknowledgements; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.acknowledgements.InactiveAcknowledgementSetManager; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerAppConfigTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerAppConfigTest.java similarity index 85% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerAppConfigTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerAppConfigTest.java index a4f952d189..f6b4f1ff5f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerAppConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerAppConfigTest.java @@ -3,16 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.breaker; +package org.opensearch.dataprepper.core.breaker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.breaker.CircuitBreakerAppConfig; +import org.opensearch.dataprepper.core.breaker.HeapCircuitBreaker; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.parser.model.CircuitBreakerConfig; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.parser.model.HeapCircuitBreakerConfig; +import org.opensearch.dataprepper.core.parser.model.CircuitBreakerConfig; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.HeapCircuitBreakerConfig; import java.time.Duration; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerIT.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerIT.java similarity index 89% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerIT.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerIT.java index 44c32b4f4d..e61ba9c404 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerIT.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerIT.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.breaker; +package org.opensearch.dataprepper.core.breaker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -13,11 +13,13 @@ import org.junit.jupiter.params.provider.CsvSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.breaker.CircuitBreakerAppConfig; +import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager; import org.opensearch.dataprepper.model.breaker.CircuitBreaker; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.parser.model.CircuitBreakerConfig; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.parser.model.HeapCircuitBreakerConfig; +import org.opensearch.dataprepper.core.parser.model.CircuitBreakerConfig; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.HeapCircuitBreakerConfig; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import java.time.Duration; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerManagerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerManagerTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerManagerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerManagerTest.java index e92bf39e61..f64db19234 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/CircuitBreakerManagerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/CircuitBreakerManagerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.breaker; +package org.opensearch.dataprepper.core.breaker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -13,6 +13,8 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager; +import org.opensearch.dataprepper.core.breaker.InnerCircuitBreaker; import org.opensearch.dataprepper.model.breaker.CircuitBreaker; import java.util.Collections; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/HeapCircuitBreakerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/HeapCircuitBreakerTest.java similarity index 97% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/HeapCircuitBreakerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/HeapCircuitBreakerTest.java index 64dbbd69ff..fb089211a0 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/breaker/HeapCircuitBreakerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/breaker/HeapCircuitBreakerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.breaker; +package org.opensearch.dataprepper.core.breaker; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -14,8 +14,9 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.breaker.HeapCircuitBreaker; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.parser.model.HeapCircuitBreakerConfig; +import org.opensearch.dataprepper.core.parser.model.HeapCircuitBreakerConfig; import java.lang.management.MemoryMXBean; import java.lang.management.MemoryUsage; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/logging/SensitiveArgumentMaskingConverterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/logging/SensitiveArgumentMaskingConverterTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/logging/SensitiveArgumentMaskingConverterTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/logging/SensitiveArgumentMaskingConverterTest.java index e62228641d..2d977d6da9 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/logging/SensitiveArgumentMaskingConverterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/logging/SensitiveArgumentMaskingConverterTest.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.commons.lang3.RandomStringUtils; import org.apache.logging.log4j.core.LogEvent; @@ -15,6 +15,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.logging.SensitiveArgumentMaskingConverter; import org.slf4j.Marker; import java.util.stream.Stream; @@ -26,7 +27,7 @@ import static org.mockito.Mockito.when; import static org.opensearch.dataprepper.logging.DataPrepperMarkers.EVENT; import static org.opensearch.dataprepper.logging.DataPrepperMarkers.SENSITIVE; -import static org.opensearch.dataprepper.logging.SensitiveArgumentMaskingConverter.MASK_PATTERN; +import static org.opensearch.dataprepper.core.logging.SensitiveArgumentMaskingConverter.MASK_PATTERN; @ExtendWith(MockitoExtension.class) class SensitiveArgumentMaskingConverterTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFLoggingMeterRegistryTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistryTest.java similarity index 99% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFLoggingMeterRegistryTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistryTest.java index 66a2ca57a5..63dd6d0ee8 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFLoggingMeterRegistryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.meter; +package org.opensearch.dataprepper.core.meter; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -21,6 +21,8 @@ import io.micrometer.core.instrument.TimeGauge; import io.micrometer.core.instrument.Timer; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.meter.EMFLoggingMeterRegistry; +import org.opensearch.dataprepper.core.meter.EMFLoggingRegistryConfig; import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider; import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger; import software.amazon.cloudwatchlogs.emf.model.DimensionSet; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFLoggingRegistryConfigTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingRegistryConfigTest.java similarity index 79% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFLoggingRegistryConfigTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingRegistryConfigTest.java index 8e9003d9ad..dc691de2f8 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFLoggingRegistryConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingRegistryConfigTest.java @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.meter; +package org.opensearch.dataprepper.core.meter; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.meter.EMFLoggingRegistryConfig; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFMetricUtilsTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFMetricUtilsTest.java similarity index 95% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFMetricUtilsTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFMetricUtilsTest.java index 590a5e9b40..0a8d8b9c18 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/EMFMetricUtilsTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFMetricUtilsTest.java @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.meter; +package org.opensearch.dataprepper.core.meter; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.meter.EMFMetricUtils; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/JvmMemoryAggregateMetricsTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/JvmMemoryAggregateMetricsTest.java similarity index 90% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/JvmMemoryAggregateMetricsTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/JvmMemoryAggregateMetricsTest.java index b1cd8e7657..a56db918d3 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/meter/JvmMemoryAggregateMetricsTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/JvmMemoryAggregateMetricsTest.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.Meter; import io.micrometer.core.instrument.MeterRegistry; @@ -15,6 +15,7 @@ import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.meter.JvmMemoryAggregateMetrics; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; @@ -26,8 +27,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyString; import static org.mockito.Mockito.mockStatic; -import static org.opensearch.dataprepper.meter.JvmMemoryAggregateMetrics.AREA_TAG_NAME; -import static org.opensearch.dataprepper.meter.JvmMemoryAggregateMetrics.JVM_MEMORY_USED; +import static org.opensearch.dataprepper.core.meter.JvmMemoryAggregateMetrics.AREA_TAG_NAME; +import static org.opensearch.dataprepper.core.meter.JvmMemoryAggregateMetrics.JVM_MEMORY_USED; @ExtendWith(MockitoExtension.class) class JvmMemoryAggregateMetricsTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/CircuitBreakingBufferTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/CircuitBreakingBufferTest.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/CircuitBreakingBufferTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/CircuitBreakingBufferTest.java index a1c2f796f5..98351c1ebf 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/CircuitBreakingBufferTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/CircuitBreakingBufferTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser; +package org.opensearch.dataprepper.core.parser; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -14,6 +14,7 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.parser.CircuitBreakingBuffer; import org.opensearch.dataprepper.model.breaker.CircuitBreaker; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.buffer.Buffer; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/DataFlowComponentTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/DataFlowComponentTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/DataFlowComponentTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/DataFlowComponentTest.java index 524258d3c2..31d45e4048 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/DataFlowComponentTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/DataFlowComponentTest.java @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser; +package org.opensearch.dataprepper.core.parser; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; import java.util.Collections; import java.util.Set; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/MultiBufferDecoratorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/MultiBufferDecoratorTest.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/MultiBufferDecoratorTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/MultiBufferDecoratorTest.java index 896268fcf4..0ec74d3a01 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/MultiBufferDecoratorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/MultiBufferDecoratorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser; +package org.opensearch.dataprepper.core.parser; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.parser.MultiBufferDecorator; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.buffer.Buffer; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/PipelineTransformerTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/PipelineTransformerTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java index bcddc49b94..a28a265826 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/PipelineTransformerTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser; +package org.opensearch.dataprepper.core.parser; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.AfterEach; @@ -19,9 +19,11 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.TestDataProvider; -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.core.parser.CircuitBreakingBuffer; +import org.opensearch.dataprepper.core.parser.PipelineTransformer; import org.opensearch.dataprepper.model.breaker.CircuitBreaker; import org.opensearch.dataprepper.model.buffer.Buffer; import org.opensearch.dataprepper.model.configuration.PipelineModel; @@ -30,16 +32,16 @@ import org.opensearch.dataprepper.model.event.EventFactory; import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.model.record.Record; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderReceiveBuffer; -import org.opensearch.dataprepper.pipeline.Pipeline; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer; +import org.opensearch.dataprepper.core.pipeline.Pipeline; import org.opensearch.dataprepper.pipeline.parser.PipelineConfigurationFileReader; import org.opensearch.dataprepper.pipeline.parser.PipelinesDataflowModelParser; -import org.opensearch.dataprepper.pipeline.router.RouterFactory; +import org.opensearch.dataprepper.core.pipeline.router.RouterFactory; import org.opensearch.dataprepper.plugin.DefaultPluginFactory; -import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; import org.opensearch.dataprepper.validation.PluginError; import org.opensearch.dataprepper.validation.PluginErrorCollector; import org.opensearch.dataprepper.validation.PluginErrorsHandler; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/CustomTagsMeterFilterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilterTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/CustomTagsMeterFilterTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilterTest.java index d98cc9135b..c3801e73a7 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/CustomTagsMeterFilterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilterTest.java @@ -3,13 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Tags; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opensearch.dataprepper.core.parser.config.CustomTagsMeterFilter; +import org.opensearch.dataprepper.core.parser.config.MetricTagFilter; import java.util.List; import java.util.Map; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/DataPrepperAppConfigurationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/DataPrepperAppConfigurationTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/DataPrepperAppConfigurationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/DataPrepperAppConfigurationTest.java index e7ab52df2e..d0ea3692f3 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/DataPrepperAppConfigurationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/DataPrepperAppConfigurationTest.java @@ -3,15 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.TestDataProvider; +import org.opensearch.dataprepper.core.parser.config.DataPrepperAppConfiguration; +import org.opensearch.dataprepper.core.parser.config.FileStructurePathProvider; import org.opensearch.dataprepper.model.configuration.PluginModel; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import java.io.File; import java.io.IOException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/MetricTagFilterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricTagFilterTest.java similarity index 88% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/MetricTagFilterTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricTagFilterTest.java index 8b42db1091..13ca10f6f1 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/MetricTagFilterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricTagFilterTest.java @@ -3,11 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.parser.config.MetricTagFilter; import java.util.Map; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/MetricsConfigTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricsConfigTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/MetricsConfigTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricsConfigTest.java index fd9ed7038a..1b0574a628 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/MetricsConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricsConfigTest.java @@ -3,17 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; import io.micrometer.core.instrument.Metrics; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.opensearch.dataprepper.DataPrepper; -import org.opensearch.dataprepper.meter.EMFLoggingMeterRegistry; +import org.opensearch.dataprepper.core.meter.EMFLoggingMeterRegistry; +import org.opensearch.dataprepper.core.parser.config.MetricsConfig; import org.opensearch.dataprepper.metrics.MetricNames; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.parser.model.MetricRegistryType; -import org.opensearch.dataprepper.pipeline.server.CloudWatchMeterRegistryProvider; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.MetricRegistryType; +import org.opensearch.dataprepper.core.pipeline.server.CloudWatchMeterRegistryProvider; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import io.micrometer.cloudwatch2.CloudWatchMeterRegistry; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/PipelineParserConfigurationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfigurationTest.java similarity index 79% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/PipelineParserConfigurationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfigurationTest.java index ab657dfc94..54e1f827ad 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/config/PipelineParserConfigurationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfigurationTest.java @@ -3,22 +3,23 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.config; +package org.opensearch.dataprepper.core.parser.config; -import org.opensearch.dataprepper.breaker.CircuitBreakerManager; +import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager; +import org.opensearch.dataprepper.core.parser.config.PipelineParserConfiguration; import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; import org.opensearch.dataprepper.model.plugin.PluginFactory; -import org.opensearch.dataprepper.parser.PipelineTransformer; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.PipelineTransformer; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; -import org.opensearch.dataprepper.pipeline.router.RouterFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.pipeline.router.RouterFactory; import org.opensearch.dataprepper.model.event.EventFactory; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; -import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; import org.opensearch.dataprepper.validation.PluginErrorCollector; import org.opensearch.dataprepper.validation.PluginErrorsHandler; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/DataPrepperConfigurationTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfigurationTests.java similarity index 97% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/DataPrepperConfigurationTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfigurationTests.java index e0fe6a7d6e..01833f6757 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/DataPrepperConfigurationTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfigurationTests.java @@ -3,12 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.model; +package org.opensearch.dataprepper.core.parser.model; import org.opensearch.dataprepper.TestDataProvider; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.MetricRegistryType; import org.opensearch.dataprepper.model.types.ByteCount; import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ObjectMapper; @@ -21,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.opensearch.dataprepper.pipeline.PipelineShutdownOption; +import org.opensearch.dataprepper.core.pipeline.PipelineShutdownOption; import java.io.File; import java.io.IOException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/HeapCircuitBreakerConfigTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/model/HeapCircuitBreakerConfigTest.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/HeapCircuitBreakerConfigTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/model/HeapCircuitBreakerConfigTest.java index 8db9044210..c6d45bfa65 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/HeapCircuitBreakerConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/model/HeapCircuitBreakerConfigTest.java @@ -3,13 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.parser.model; +package org.opensearch.dataprepper.core.parser.model; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.parser.model.HeapCircuitBreakerConfig; import org.opensearch.dataprepper.model.types.ByteCount; import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/DefaultPeerForwarderProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/DefaultPeerForwarderProviderTest.java similarity index 90% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/DefaultPeerForwarderProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/DefaultPeerForwarderProviderTest.java index 4c1c36482c..beb0ff9e58 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/DefaultPeerForwarderProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/DefaultPeerForwarderProviderTest.java @@ -3,8 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; - +package org.opensearch.dataprepper.core.peerforwarder; + +import org.opensearch.dataprepper.core.peerforwarder.DefaultPeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.LocalPeerForwarder; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarder; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderClientFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer; +import org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; @@ -14,8 +23,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.model.processor.Processor; -import org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient; -import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; +import org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; import java.util.Collections; import java.util.List; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/ForwardingAuthenticationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/ForwardingAuthenticationTest.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/ForwardingAuthenticationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/ForwardingAuthenticationTest.java index 06b6c090b6..58f4a7700f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/ForwardingAuthenticationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/ForwardingAuthenticationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsSource; import org.junit.jupiter.params.provider.EnumSource; +import org.opensearch.dataprepper.core.peerforwarder.ForwardingAuthentication; import java.util.UUID; import java.util.stream.Stream; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/HashRingTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/HashRingTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/HashRingTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/HashRingTest.java index cb2c6ac22d..d0f41ea3cb 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/HashRingTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/HashRingTest.java @@ -3,14 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import org.opensearch.dataprepper.peerforwarder.discovery.PeerListProvider; +import org.opensearch.dataprepper.core.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider; import java.util.Arrays; import java.util.Collections; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/LocalPeerForwarderTest.java similarity index 91% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/LocalPeerForwarderTest.java index e533b8067f..f943f3d60a 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/LocalPeerForwarderTest.java @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; +import org.opensearch.dataprepper.core.peerforwarder.LocalPeerForwarder; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerClientPoolTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerClientPoolTest.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerClientPoolTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerClientPoolTest.java index ad9896824e..798bd5ca4e 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerClientPoolTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerClientPoolTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.linecorp.armeria.client.WebClient; import org.junit.jupiter.api.Assertions; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigIT.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigIT.java similarity index 80% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigIT.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigIT.java index a1db33f7d7..e8f4abb551 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigIT.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigIT.java @@ -3,21 +3,23 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.junit.jupiter.api.Test; -import org.opensearch.dataprepper.acknowledgements.DefaultAcknowledgementSetManager; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager; import org.opensearch.dataprepper.core.event.EventFactoryApplicationContextMarker; -import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderAppConfig; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration.DEFAULT_CERTIFICATE_FILE_PATH; -import static org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration.DEFAULT_PRIVATE_KEY_FILE_PATH; +import static org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration.DEFAULT_CERTIFICATE_FILE_PATH; +import static org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration.DEFAULT_PRIVATE_KEY_FILE_PATH; class PeerForwarderAppConfigIT { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigTest.java similarity index 81% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigTest.java index 5c5944d0e2..599c3af657 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderAppConfigTest.java @@ -3,12 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.peerforwarder.PeerClientPool; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderAppConfig; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderClientFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; -import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactoryTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderClientFactoryTest.java similarity index 89% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactoryTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderClientFactoryTest.java index ed357c0a73..fec8e07646 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactoryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderClientFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.hamcrest.core.IsInstanceOf; import org.junit.jupiter.api.BeforeEach; @@ -15,9 +15,14 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.peerforwarder.ForwardingAuthentication; +import org.opensearch.dataprepper.core.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.PeerClientPool; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderClientFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; -import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; import org.opensearch.dataprepper.plugins.certificate.model.Certificate; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderConfigurationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderConfigurationTest.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderConfigurationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderConfigurationTest.java index 4c6d22609b..cf7c3b5b64 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderConfigurationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderConfigurationTest.java @@ -3,12 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; -import static org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration.DEFAULT_DRAIN_TIMEOUT; +import static org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration.DEFAULT_DRAIN_TIMEOUT; import org.opensearch.dataprepper.TestDataProvider; -import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; +import org.opensearch.dataprepper.core.peerforwarder.ForwardingAuthentication; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,8 +30,8 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration.DEFAULT_FORWARDING_BATCH_TIMEOUT; -import static org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration.DEFAULT_PRIVATE_KEY_FILE_PATH; +import static org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration.DEFAULT_FORWARDING_BATCH_TIMEOUT; +import static org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration.DEFAULT_PRIVATE_KEY_FILE_PATH; class PeerForwarderConfigurationTest { private static SimpleModule simpleModule = new SimpleModule().addDeserializer(Duration.class, new DataPrepperDurationDeserializer()); diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBufferTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderReceiveBufferTest.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBufferTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderReceiveBufferTest.java index 15555776d6..1d80ea8755 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBufferTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarderReceiveBufferTest.java @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.buffer.SizeOverflowException; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder_ClientServerIT.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarder_ClientServerIT.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder_ClientServerIT.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarder_ClientServerIT.java index f706cb97d7..275df076d1 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder_ClientServerIT.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwarder_ClientServerIT.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.fasterxml.jackson.databind.ObjectMapper; import com.linecorp.armeria.client.UnprocessedRequestException; @@ -17,24 +17,31 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opensearch.dataprepper.core.peerforwarder.DefaultPeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.ForwardingAuthentication; +import org.opensearch.dataprepper.core.peerforwarder.PeerClientPool; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderClientFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.processor.Processor; -import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; -import org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient; -import org.opensearch.dataprepper.peerforwarder.codec.PeerForwarderCodecAppConfig; -import org.opensearch.dataprepper.peerforwarder.codec.JacksonPeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.codec.JavaPeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.codec.PeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; -import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderHttpServerProvider; -import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderHttpService; -import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderServer; -import org.opensearch.dataprepper.peerforwarder.server.RemotePeerForwarderServer; -import org.opensearch.dataprepper.peerforwarder.server.ResponseHandler; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodecAppConfig; +import org.opensearch.dataprepper.core.peerforwarder.codec.JacksonPeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.codec.JavaPeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DiscoveryMode; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpServerProvider; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpService; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderServer; +import org.opensearch.dataprepper.core.peerforwarder.server.RemotePeerForwarderServer; +import org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import javax.net.ssl.SSLHandshakeException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessingDecoratorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwardingProcessingDecoratorTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessingDecoratorTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwardingProcessingDecoratorTest.java index 7a85033842..625549870f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessingDecoratorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/PeerForwardingProcessingDecoratorTest.java @@ -3,8 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; +import org.opensearch.dataprepper.core.peerforwarder.LocalPeerForwarder; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwardingProcessorDecorator; +import org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding; import org.opensearch.dataprepper.model.processor.Processor; @@ -19,8 +23,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.lenient; -import org.opensearch.dataprepper.peerforwarder.exception.EmptyPeerForwarderPluginIdentificationKeysException; -import org.opensearch.dataprepper.peerforwarder.exception.UnsupportedPeerForwarderPluginException; +import org.opensearch.dataprepper.core.peerforwarder.exception.EmptyPeerForwarderPluginIdentificationKeysException; +import org.opensearch.dataprepper.core.peerforwarder.exception.UnsupportedPeerForwarderPluginException; import java.util.ArrayList; import java.util.Collection; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/RemotePeerForwarderTest.java similarity index 95% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/RemotePeerForwarderTest.java index 64c16ff82b..13cfd56030 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/RemotePeerForwarderTest.java @@ -3,10 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder; +package org.opensearch.dataprepper.core.peerforwarder; import com.linecorp.armeria.common.AggregatedHttpResponse; import com.linecorp.armeria.common.HttpStatus; +import org.opensearch.dataprepper.core.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer; +import org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.JacksonEvent; @@ -19,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient; +import org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient; import java.time.Duration; import java.time.temporal.ChronoUnit; @@ -52,14 +55,14 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.RECORDS_ACTUALLY_PROCESSED_LOCALLY; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.RECORDS_FAILED_FORWARDING; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.RECORDS_SUCCESSFULLY_FORWARDED; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.RECORDS_TO_BE_FORWARDED; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.RECORDS_TO_BE_PROCESSED_LOCALLY; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.RECORDS_MISSING_IDENTIFICATION_KEYS; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.REQUESTS_FAILED; -import static org.opensearch.dataprepper.peerforwarder.RemotePeerForwarder.REQUESTS_SUCCESSFUL; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.RECORDS_ACTUALLY_PROCESSED_LOCALLY; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.RECORDS_FAILED_FORWARDING; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.RECORDS_SUCCESSFULLY_FORWARDED; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.RECORDS_TO_BE_FORWARDED; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.RECORDS_TO_BE_PROCESSED_LOCALLY; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.RECORDS_MISSING_IDENTIFICATION_KEYS; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.REQUESTS_FAILED; +import static org.opensearch.dataprepper.core.peerforwarder.RemotePeerForwarder.REQUESTS_SUCCESSFUL; import org.apache.commons.lang3.RandomStringUtils; @ExtendWith(MockitoExtension.class) diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/certificate/CertificateProviderFactoryTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/certificate/CertificateProviderFactoryTest.java similarity index 92% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/certificate/CertificateProviderFactoryTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/certificate/CertificateProviderFactoryTest.java index f3cec46608..1ae009b6fb 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/certificate/CertificateProviderFactoryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/certificate/CertificateProviderFactoryTest.java @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.certificate; +package org.opensearch.dataprepper.core.peerforwarder.certificate; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; import org.opensearch.dataprepper.plugins.certificate.acm.ACMCertificateProvider; import org.opensearch.dataprepper.plugins.certificate.file.FileCertificateProvider; @@ -14,7 +15,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/client/PeerForwarderClientTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/client/PeerForwarderClientTest.java similarity index 90% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/client/PeerForwarderClientTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/client/PeerForwarderClientTest.java index e2af4431e0..6fbcaecedc 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/client/PeerForwarderClientTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/client/PeerForwarderClientTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.client; +package org.opensearch.dataprepper.core.peerforwarder.client; import com.linecorp.armeria.common.AggregatedHttpResponse; import com.linecorp.armeria.common.HttpResponse; @@ -11,6 +11,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.JacksonEvent; @@ -31,11 +32,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.PeerClientPool; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderClientFactory; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.codec.PeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.PeerClientPool; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderClientFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; import java.io.IOException; import java.io.OutputStream; @@ -59,9 +60,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration.DEFAULT_PEER_FORWARDING_URI; -import static org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient.REQUESTS; -import static org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient.CLIENT_REQUEST_FORWARDING_LATENCY; +import static org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration.DEFAULT_PEER_FORWARDING_URI; +import static org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient.REQUESTS; +import static org.opensearch.dataprepper.core.peerforwarder.client.PeerForwarderClient.CLIENT_REQUEST_FORWARDING_LATENCY; @ExtendWith(MockitoExtension.class) class PeerForwarderClientTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/JacksonPeerForwarderCodecTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/JacksonPeerForwarderCodecTest.java similarity index 91% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/JacksonPeerForwarderCodecTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/JacksonPeerForwarderCodecTest.java index 15cb99e828..de0832d202 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/JacksonPeerForwarderCodecTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/JacksonPeerForwarderCodecTest.java @@ -3,16 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.peerforwarder.codec.JacksonPeerForwarderCodec; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.model.log.JacksonLog; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; -import org.opensearch.dataprepper.peerforwarder.model.WireEvents; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.model.WireEvents; import java.io.IOException; import java.util.ArrayList; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/JavaPeerForwarderCodecTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/JavaPeerForwarderCodecTest.java similarity index 95% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/JavaPeerForwarderCodecTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/JavaPeerForwarderCodecTest.java index bd0b26e05f..5c2f50bba5 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/JavaPeerForwarderCodecTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/JavaPeerForwarderCodecTest.java @@ -3,16 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.peerforwarder.codec.JavaPeerForwarderCodec; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.InternalEventHandle; import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.model.log.JacksonLog; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; import java.io.IOException; import java.io.InvalidClassException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/LoggingObjectInputFilterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/LoggingObjectInputFilterTest.java similarity index 92% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/LoggingObjectInputFilterTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/LoggingObjectInputFilterTest.java index c68c89c23c..78c1df3b71 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/LoggingObjectInputFilterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/LoggingObjectInputFilterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -11,6 +11,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.peerforwarder.codec.LoggingObjectInputFilter; import java.io.ObjectInputFilter; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodecAppConfig_SerializationFilterIT.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodecAppConfig_SerializationFilterIT.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodecAppConfig_SerializationFilterIT.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodecAppConfig_SerializationFilterIT.java index f9390f899c..7aacb13953 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/codec/PeerForwarderCodecAppConfig_SerializationFilterIT.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/codec/PeerForwarderCodecAppConfig_SerializationFilterIT.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.codec; +package org.opensearch.dataprepper.core.peerforwarder.codec; import com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; @@ -17,6 +17,8 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.peerforwarder.codec.JavaPeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodecAppConfig; import org.opensearch.dataprepper.model.document.JacksonDocument; import org.opensearch.dataprepper.model.event.DefaultEventMetadata; import org.opensearch.dataprepper.model.event.Event; @@ -30,8 +32,8 @@ import org.opensearch.dataprepper.model.metric.JacksonSummary; import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; import org.opensearch.dataprepper.model.trace.JacksonSpan; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; import org.reflections.Reflections; import org.reflections.util.ConfigurationBuilder; @@ -88,7 +90,7 @@ * 2) Classes which Data Prepper knows should be registered can be deserialized. * 3) Classes which Data Prepper should be able to deserialized are included in test #2. * Note that these tests use the {@link ObjectInputStream} directly. This is because using the - * {@link org.opensearch.dataprepper.peerforwarder.codec.JavaPeerForwarderCodec} will throw class casting exceptions, + * {@link JavaPeerForwarderCodec} will throw class casting exceptions, * but we want to be sure the exception comes from the filter, not the cast. */ @ExtendWith(MockitoExtension.class) diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java similarity index 92% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java index dd08d5a6c8..51595bfc1a 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -12,8 +12,10 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsSource; +import org.opensearch.dataprepper.core.peerforwarder.discovery.AwsCloudMapPeerListProvider; +import org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import software.amazon.awssdk.regions.Region; import java.util.Map; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java similarity index 99% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java index 67429e27ef..8a7eddeeb4 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.retry.Backoff; @@ -17,6 +17,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.InOrder; +import org.opensearch.dataprepper.core.peerforwarder.discovery.AwsCloudMapPeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryAsyncClient; import software.amazon.awssdk.services.servicediscovery.model.DiscoverInstancesRequest; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProviderCreationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProviderCreationTest.java similarity index 91% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProviderCreationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProviderCreationTest.java index c3c8d13763..deaa5cb95a 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProviderCreationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProviderCreationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroupBuilder; @@ -14,8 +14,10 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DnsPeerListProvider; +import org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import java.util.concurrent.CompletableFuture; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProviderTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProviderTest.java index 3bdee15368..9f8e26b2e5 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/DnsPeerListProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/DnsPeerListProviderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; @@ -13,8 +13,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.peerforwarder.discovery.DnsPeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.HashRing; import java.util.Arrays; import java.util.Collections; @@ -31,7 +32,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.opensearch.dataprepper.peerforwarder.discovery.PeerListProvider.PEER_ENDPOINTS; +import static org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider.PEER_ENDPOINTS; @ExtendWith(MockitoExtension.class) public class DnsPeerListProviderTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/LocalPeerListProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/LocalPeerListProviderTest.java similarity index 84% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/LocalPeerListProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/LocalPeerListProviderTest.java index d7826fd2ac..7094e0a435 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/LocalPeerListProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/LocalPeerListProviderTest.java @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import org.junit.jupiter.api.Test; -import org.opensearch.dataprepper.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.discovery.LocalPeerListProvider; import java.util.Collections; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProviderCreationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProviderCreationTest.java similarity index 87% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProviderCreationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProviderCreationTest.java index 50758e3767..a0e98e5aef 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProviderCreationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProviderCreationTest.java @@ -3,12 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider; +import org.opensearch.dataprepper.core.peerforwarder.discovery.StaticPeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import java.util.Arrays; import java.util.Collections; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProviderTest.java similarity index 90% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProviderTest.java index 589329b108..a5aacb592f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/discovery/StaticPeerListProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/discovery/StaticPeerListProviderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.discovery; +package org.opensearch.dataprepper.core.peerforwarder.discovery; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -11,8 +11,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.peerforwarder.discovery.StaticPeerListProvider; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.HashRing; +import org.opensearch.dataprepper.core.peerforwarder.HashRing; import java.util.Arrays; import java.util.Collections; @@ -27,7 +28,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; -import static org.opensearch.dataprepper.peerforwarder.discovery.PeerListProvider.PEER_ENDPOINTS; +import static org.opensearch.dataprepper.core.peerforwarder.discovery.PeerListProvider.PEER_ENDPOINTS; @ExtendWith(MockitoExtension.class) public class StaticPeerListProviderTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysExceptionTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysExceptionTest.java similarity index 81% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysExceptionTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysExceptionTest.java index c9b50d07a7..7c3d267776 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysExceptionTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysExceptionTest.java @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.exception; +package org.opensearch.dataprepper.core.peerforwarder.exception; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.peerforwarder.exception.EmptyPeerForwarderPluginIdentificationKeysException; import java.util.UUID; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java similarity index 92% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java index 27ce1259ac..7d5d1e2a4e 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.exception; +package org.opensearch.dataprepper.core.peerforwarder.exception; import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/NoOpPeerForwarderServerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/NoOpPeerForwarderServerTest.java similarity index 79% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/NoOpPeerForwarderServerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/NoOpPeerForwarderServerTest.java index a68534cc47..2267dfb250 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/NoOpPeerForwarderServerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/NoOpPeerForwarderServerTest.java @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.peerforwarder.server.NoOpPeerForwarderServer; class NoOpPeerForwarderServerTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServerProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServerProviderTest.java similarity index 75% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServerProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServerProviderTest.java index 148a4c3dbe..33687d409b 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServerProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServerProviderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import com.linecorp.armeria.server.Server; import org.junit.jupiter.api.Assertions; @@ -11,8 +11,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.certificate.CertificateProviderFactory; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpServerProvider; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpService; import static org.mockito.Mockito.when; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServiceTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServiceTest.java similarity index 89% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServiceTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServiceTest.java index 9256c047e3..d6ecca855c 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderHttpServiceTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderHttpServiceTest.java @@ -3,11 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import io.micrometer.core.instrument.Counter; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpService; +import org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.buffer.SizeOverflowException; import org.opensearch.dataprepper.model.event.Event; @@ -27,12 +29,12 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderReceiveBuffer; -import org.opensearch.dataprepper.peerforwarder.codec.PeerForwarderCodec; -import org.opensearch.dataprepper.peerforwarder.model.PeerForwardingEvents; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderReceiveBuffer; +import org.opensearch.dataprepper.core.peerforwarder.codec.PeerForwarderCodec; +import org.opensearch.dataprepper.core.peerforwarder.model.PeerForwardingEvents; import java.io.IOException; import java.util.ArrayList; @@ -49,8 +51,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static org.opensearch.dataprepper.peerforwarder.server.PeerForwarderHttpService.RECORDS_RECEIVED_FROM_PEERS; -import static org.opensearch.dataprepper.peerforwarder.server.PeerForwarderHttpService.SERVER_REQUEST_PROCESSING_LATENCY; +import static org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpService.RECORDS_RECEIVED_FROM_PEERS; +import static org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpService.SERVER_REQUEST_PROCESSING_LATENCY; @ExtendWith(MockitoExtension.class) class PeerForwarderHttpServiceTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServerProxyTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServerProxyTest.java similarity index 89% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServerProxyTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServerProxyTest.java index 5b5cab8570..3a5b6f0f2a 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/PeerForwarderServerProxyTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/PeerForwarderServerProxyTest.java @@ -3,15 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import com.linecorp.armeria.server.Server; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderProvider; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderHttpServerProvider; +import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderServerProxy; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/RemotePeerForwarderServerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/RemotePeerForwarderServerTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/RemotePeerForwarderServerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/RemotePeerForwarderServerTest.java index 505895dd7e..21011c7e84 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/RemotePeerForwarderServerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/RemotePeerForwarderServerTest.java @@ -3,14 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import com.linecorp.armeria.server.Server; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.PeerForwarderConfiguration; +import org.opensearch.dataprepper.core.peerforwarder.server.RemotePeerForwarderServer; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/ResponseHandlerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/ResponseHandlerTest.java similarity index 91% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/ResponseHandlerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/ResponseHandlerTest.java index 0b78bc8abf..af90ed5fcb 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/server/ResponseHandlerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/peerforwarder/server/ResponseHandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.peerforwarder.server; +package org.opensearch.dataprepper.core.peerforwarder.server; import com.fasterxml.jackson.core.JsonProcessingException; import com.linecorp.armeria.common.AggregatedHttpResponse; @@ -16,6 +16,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.buffer.SizeOverflowException; @@ -27,10 +28,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static org.opensearch.dataprepper.peerforwarder.server.ResponseHandler.BAD_REQUESTS; -import static org.opensearch.dataprepper.peerforwarder.server.ResponseHandler.REQUESTS_TOO_LARGE; -import static org.opensearch.dataprepper.peerforwarder.server.ResponseHandler.REQUESTS_UNPROCESSABLE; -import static org.opensearch.dataprepper.peerforwarder.server.ResponseHandler.REQUEST_TIMEOUTS; +import static org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler.BAD_REQUESTS; +import static org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler.REQUESTS_TOO_LARGE; +import static org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler.REQUESTS_UNPROCESSABLE; +import static org.opensearch.dataprepper.core.peerforwarder.server.ResponseHandler.REQUEST_TIMEOUTS; @ExtendWith(MockitoExtension.class) class ResponseHandlerTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineConnectorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineConnectorTest.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineConnectorTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineConnectorTest.java index e2af218c25..45a0251977 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineConnectorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineConnectorTest.java @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; +import org.opensearch.dataprepper.core.pipeline.PipelineConnector; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.buffer.Buffer; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownAppConfigTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownAppConfigTest.java similarity index 80% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownAppConfigTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownAppConfigTest.java index 9d400c9b4d..ecb1c30126 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownAppConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownAppConfigTest.java @@ -3,13 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.pipeline.Pipeline; +import org.opensearch.dataprepper.core.pipeline.PipelineShutdownAppConfig; +import org.opensearch.dataprepper.core.pipeline.PipelineShutdownOption; import java.util.Map; import java.util.function.Predicate; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownOptionTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownOptionTest.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownOptionTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownOptionTest.java index 1d8c52fd22..12564000f6 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownOptionTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownOptionTest.java @@ -3,12 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; +import org.opensearch.dataprepper.core.pipeline.Pipeline; +import org.opensearch.dataprepper.core.pipeline.PipelineShutdownOption; import java.util.Collections; import java.util.Map; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownTest.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownTest.java index ca7d2bf1bd..8dbe9782ac 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineShutdownTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineShutdownTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -11,6 +11,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.DataPrepperShutdownOptions; +import org.opensearch.dataprepper.core.pipeline.PipelineShutdown; import org.opensearch.dataprepper.model.buffer.Buffer; import java.time.Clock; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineTests.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineTests.java index 66300969c0..f015ff94b5 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/PipelineTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -25,18 +25,18 @@ import org.opensearch.dataprepper.model.source.coordinator.UsesSourceCoordination; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.UsesEnhancedSourceCoordination; -import org.opensearch.dataprepper.parser.DataFlowComponent; -import org.opensearch.dataprepper.pipeline.common.FutureHelper; -import org.opensearch.dataprepper.pipeline.common.TestProcessor; -import org.opensearch.dataprepper.pipeline.router.Router; -import org.opensearch.dataprepper.pipeline.router.RouterCopyRecordStrategy; -import org.opensearch.dataprepper.pipeline.router.RouterGetRecordStrategy; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelper; +import org.opensearch.dataprepper.core.pipeline.common.TestProcessor; +import org.opensearch.dataprepper.core.pipeline.router.Router; +import org.opensearch.dataprepper.core.pipeline.router.RouterCopyRecordStrategy; +import org.opensearch.dataprepper.core.pipeline.router.RouterGetRecordStrategy; import org.opensearch.dataprepper.plugins.test.TestSink; import org.opensearch.dataprepper.plugins.test.TestSource; import org.opensearch.dataprepper.plugins.TestSourceWithCoordination; import org.opensearch.dataprepper.plugins.TestSourceWithEnhancedCoordination; import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer; -import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; import java.time.Duration; import java.time.Instant; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/ProcessWorkerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/ProcessWorkerTest.java similarity index 97% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/ProcessWorkerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/ProcessWorkerTest.java index 455da07a93..73a27575f3 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/ProcessWorkerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/ProcessWorkerTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.pipeline; +package org.opensearch.dataprepper.core.pipeline; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -6,6 +6,8 @@ import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.pipeline.Pipeline; +import org.opensearch.dataprepper.core.pipeline.ProcessWorker; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet; import org.opensearch.dataprepper.model.buffer.Buffer; @@ -16,8 +18,8 @@ import org.opensearch.dataprepper.model.processor.Processor; import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.source.Source; -import org.opensearch.dataprepper.pipeline.common.FutureHelper; -import org.opensearch.dataprepper.pipeline.common.FutureHelperResult; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelper; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelperResult; import java.time.Duration; import java.util.ArrayList; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperResultTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperResultTest.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperResultTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperResultTest.java index bbda2d2e9e..210aba419a 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperResultTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperResultTest.java @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; import org.junit.Before; import org.junit.Test; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelperResult; import java.util.ArrayList; import java.util.Collections; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperTest.java similarity index 89% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperTest.java index ba8a9714de..106be961ee 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/FutureHelperTest.java @@ -3,13 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelper; +import org.opensearch.dataprepper.core.pipeline.common.FutureHelperResult; import java.util.Arrays; import java.util.concurrent.ExecutionException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadPoolExecutorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadPoolExecutorTest.java similarity index 90% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadPoolExecutorTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadPoolExecutorTest.java index c7c35fb6f8..c962427a9e 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/PipelineThreadPoolExecutorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/PipelineThreadPoolExecutorTest.java @@ -3,14 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; -import org.opensearch.dataprepper.pipeline.Pipeline; +import org.opensearch.dataprepper.core.pipeline.Pipeline; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.pipeline.common.PipelineThreadFactory; +import org.opensearch.dataprepper.core.pipeline.common.PipelineThreadPoolExecutor; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/TestProcessor.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/TestProcessor.java similarity index 94% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/TestProcessor.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/TestProcessor.java index 19c8ea525b..f0ae429bb9 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/TestProcessor.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/common/TestProcessor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.common; +package org.opensearch.dataprepper.core.pipeline.common; import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; import org.opensearch.dataprepper.model.annotations.SingleThread; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/DataFlowComponentRouterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/DataFlowComponentRouterTest.java similarity index 97% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/DataFlowComponentRouterTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/DataFlowComponentRouterTest.java index 1ea74afe70..6e6c0045dd 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/DataFlowComponentRouterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/DataFlowComponentRouterTest.java @@ -3,8 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; +import org.opensearch.dataprepper.core.pipeline.router.DataFlowComponentRouter; +import org.opensearch.dataprepper.core.pipeline.router.RouterGetRecordStrategy; import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -12,7 +14,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; import java.util.ArrayList; import java.util.Collection; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouteEventEvaluatorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouteEventEvaluatorTest.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouteEventEvaluatorTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouteEventEvaluatorTest.java index b0198e4285..c7ff30e304 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouteEventEvaluatorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouteEventEvaluatorTest.java @@ -3,8 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; +import org.opensearch.dataprepper.core.pipeline.router.RouteEventEvaluator; import org.opensearch.dataprepper.model.configuration.ConditionalRoute; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterCopyRecordStrategyTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterCopyRecordStrategyTests.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterCopyRecordStrategyTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterCopyRecordStrategyTests.java index c971cd5b8d..807a434436 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterCopyRecordStrategyTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterCopyRecordStrategyTests.java @@ -3,16 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; +import org.opensearch.dataprepper.core.pipeline.router.RouterCopyRecordStrategy; import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.parser.DataFlowComponent; -import org.opensearch.dataprepper.pipeline.PipelineConnector; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.pipeline.PipelineConnector; import java.util.ArrayList; import java.util.Collection; @@ -21,7 +22,6 @@ import java.util.Iterator; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterFactoryTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterFactoryTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterFactoryTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterFactoryTest.java index 739367fa60..fa3ca03de7 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterFactoryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterFactoryTest.java @@ -3,8 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; +import org.opensearch.dataprepper.core.pipeline.router.Router; +import org.opensearch.dataprepper.core.pipeline.router.RouterFactory; import org.opensearch.dataprepper.model.configuration.ConditionalRoute; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterTest.java similarity index 97% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterTest.java index b602df85b2..5826577561 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/router/RouterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/router/RouterTest.java @@ -3,8 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.router; +package org.opensearch.dataprepper.core.pipeline.router; +import org.opensearch.dataprepper.core.pipeline.router.DataFlowComponentRouter; +import org.opensearch.dataprepper.core.pipeline.router.RouteEventEvaluator; +import org.opensearch.dataprepper.core.pipeline.router.Router; +import org.opensearch.dataprepper.core.pipeline.router.RouterGetRecordStrategy; import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -12,7 +16,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.parser.DataFlowComponent; +import org.opensearch.dataprepper.core.parser.DataFlowComponent; import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.event.EventHandle; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/CloudWatchMeterRegistryProviderTest.java similarity index 90% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/CloudWatchMeterRegistryProviderTest.java index 9dc744981b..7498c74e35 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/CloudWatchMeterRegistryProviderTest.java @@ -3,13 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import io.micrometer.cloudwatch2.CloudWatchMeterRegistry; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.opensearch.dataprepper.core.pipeline.server.CloudWatchMeterRegistryProvider; import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/DataPrepperServerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperServerTest.java similarity index 92% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/DataPrepperServerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperServerTest.java index 35c392ca8a..eb9346c495 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/DataPrepperServerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/DataPrepperServerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.Authenticator; import com.sun.net.httpserver.HttpContext; @@ -16,6 +16,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.pipeline.server.DataPrepperServer; +import org.opensearch.dataprepper.core.pipeline.server.GetPipelinesHandler; +import org.opensearch.dataprepper.core.pipeline.server.HttpServerProvider; +import org.opensearch.dataprepper.core.pipeline.server.ListPipelinesHandler; +import org.opensearch.dataprepper.core.pipeline.server.PrometheusMetricsHandler; +import org.opensearch.dataprepper.core.pipeline.server.ShutdownHandler; import java.net.InetSocketAddress; import java.util.concurrent.ExecutorService; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/GetPipelinesHandlerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/GetPipelinesHandlerTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/GetPipelinesHandlerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/GetPipelinesHandlerTest.java index 8f0d2b5d1e..c0c9119b02 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/GetPipelinesHandlerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/GetPipelinesHandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; @@ -13,12 +13,13 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.pipeline.server.GetPipelinesHandler; import org.opensearch.dataprepper.model.configuration.DataPrepperVersion; import org.opensearch.dataprepper.model.configuration.PipelineModel; import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.model.configuration.SinkModel; -import org.opensearch.dataprepper.pipeline.PipelinesProvider; +import org.opensearch.dataprepper.core.pipeline.PipelinesProvider; import javax.ws.rs.HttpMethod; import java.io.IOException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/HttpServerProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/HttpServerProviderTest.java similarity index 95% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/HttpServerProviderTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/HttpServerProviderTest.java index 6efe35e3a0..7b1bf9d807 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/HttpServerProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/HttpServerProviderTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpsConfigurator; import com.sun.net.httpserver.HttpsServer; @@ -14,6 +14,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.pipeline.server.HttpServerProvider; import java.io.IOException; import java.net.DatagramSocket; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/ListPipelinesHandlerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ListPipelinesHandlerTest.java similarity index 95% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/ListPipelinesHandlerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ListPipelinesHandlerTest.java index 5ea1dd867c..ce6624de3f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/ListPipelinesHandlerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ListPipelinesHandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; @@ -13,8 +13,9 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.pipeline.Pipeline; -import org.opensearch.dataprepper.pipeline.PipelinesProvider; +import org.opensearch.dataprepper.core.pipeline.Pipeline; +import org.opensearch.dataprepper.core.pipeline.PipelinesProvider; +import org.opensearch.dataprepper.core.pipeline.server.ListPipelinesHandler; import javax.ws.rs.HttpMethod; import java.io.IOException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/PrometheusMetricsHandlerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/PrometheusMetricsHandlerTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/PrometheusMetricsHandlerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/PrometheusMetricsHandlerTest.java index 8d10db77f2..e6f800155f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/PrometheusMetricsHandlerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/PrometheusMetricsHandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; @@ -15,6 +15,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.pipeline.server.PrometheusMetricsHandler; import javax.ws.rs.HttpMethod; import java.io.IOException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/ShutdownHandlerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandlerTest.java similarity index 97% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/ShutdownHandlerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandlerTest.java index 0d36d05b1d..69cc20d7dc 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/ShutdownHandlerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; @@ -19,6 +19,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.DataPrepper; import org.opensearch.dataprepper.DataPrepperShutdownOptions; +import org.opensearch.dataprepper.core.pipeline.server.ShutdownHandler; import javax.ws.rs.HttpMethod; import java.io.IOException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/SslUtilTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/SslUtilTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/SslUtilTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/SslUtilTest.java index d99e06e361..ccb5b0bee1 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/SslUtilTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/SslUtilTest.java @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server; +package org.opensearch.dataprepper.core.pipeline.server; import org.junit.Test; +import org.opensearch.dataprepper.core.pipeline.server.SslUtil; import javax.net.ssl.SSLContext; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/config/DataPrepperServerConfigurationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfigurationTest.java similarity index 91% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/config/DataPrepperServerConfigurationTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfigurationTest.java index c628b68527..033d0f86ec 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/server/config/DataPrepperServerConfigurationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfigurationTest.java @@ -3,16 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.pipeline.server.config; +package org.opensearch.dataprepper.core.pipeline.server.config; import org.opensearch.dataprepper.DataPrepper; +import org.opensearch.dataprepper.core.pipeline.server.config.DataPrepperServerConfiguration; 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.pipeline.PipelinesProvider; -import org.opensearch.dataprepper.pipeline.server.DataPrepperCoreAuthenticationProvider; -import org.opensearch.dataprepper.pipeline.server.ListPipelinesHandler; -import org.opensearch.dataprepper.pipeline.server.ShutdownHandler; +import org.opensearch.dataprepper.core.pipeline.PipelinesProvider; +import org.opensearch.dataprepper.core.pipeline.server.DataPrepperCoreAuthenticationProvider; +import org.opensearch.dataprepper.core.pipeline.server.ListPipelinesHandler; +import org.opensearch.dataprepper.core.pipeline.server.ShutdownHandler; import com.sun.net.httpserver.Authenticator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/LeaseBasedSourceCoordinatorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/LeaseBasedSourceCoordinatorTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/LeaseBasedSourceCoordinatorTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/LeaseBasedSourceCoordinatorTest.java index 965a0c8786..5b93b0ca5f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/LeaseBasedSourceCoordinatorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/LeaseBasedSourceCoordinatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination; +package org.opensearch.dataprepper.core.sourcecoordination; import io.micrometer.core.instrument.Counter; import org.junit.jupiter.api.BeforeEach; @@ -15,6 +15,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.source.SourceCoordinationStore; import org.opensearch.dataprepper.model.source.coordinator.PartitionIdentifier; @@ -26,7 +27,7 @@ import org.opensearch.dataprepper.model.source.coordinator.exceptions.PartitionNotOwnedException; import org.opensearch.dataprepper.model.source.coordinator.exceptions.PartitionUpdateException; import org.opensearch.dataprepper.model.source.coordinator.exceptions.UninitializedSourceCoordinatorException; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import org.opensearch.dataprepper.test.helper.ReflectivelySetField; import java.net.InetAddress; @@ -56,23 +57,23 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.DEFAULT_LEASE_TIMEOUT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.FORCE_SUPPLIER_AFTER_DURATION; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.GLOBAL_STATE_SOURCE_PARTITION_KEY_FOR_CREATING_PARTITIONS; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.GLOBAL_STATE_TYPE; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.NO_PARTITIONS_ACQUIRED_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_ACQUIRED_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_CLOSED_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_COMPLETED_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_DELETED; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_CREATED_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_CREATION_SUPPLIER_INVOCATION_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_NOT_FOUND_ERROR_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_NOT_OWNED_ERROR_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_OWNERSHIP_GIVEN_UP_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_TYPE; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_UPDATE_ERROR_COUNT; -import static org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator.SAVE_PROGRESS_STATE_INVOCATION_SUCCESS_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.DEFAULT_LEASE_TIMEOUT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.FORCE_SUPPLIER_AFTER_DURATION; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.GLOBAL_STATE_SOURCE_PARTITION_KEY_FOR_CREATING_PARTITIONS; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.GLOBAL_STATE_TYPE; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.NO_PARTITIONS_ACQUIRED_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_ACQUIRED_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_CLOSED_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_COMPLETED_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITIONS_DELETED; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_CREATED_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_CREATION_SUPPLIER_INVOCATION_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_NOT_FOUND_ERROR_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_NOT_OWNED_ERROR_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_OWNERSHIP_GIVEN_UP_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_TYPE; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.PARTITION_UPDATE_ERROR_COUNT; +import static org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator.SAVE_PROGRESS_STATE_INVOCATION_SUCCESS_COUNT; @ExtendWith(MockitoExtension.class) public class LeaseBasedSourceCoordinatorTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/PartitionManagerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/PartitionManagerTest.java similarity index 93% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/PartitionManagerTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/PartitionManagerTest.java index 7d0065f45a..1f93c5dc84 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/PartitionManagerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/PartitionManagerTest.java @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination; +package org.opensearch.dataprepper.core.sourcecoordination; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.sourcecoordination.PartitionManager; import org.opensearch.dataprepper.model.source.coordinator.SourcePartition; import java.util.Optional; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorFactoryTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorFactoryTest.java similarity index 96% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorFactoryTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorFactoryTest.java index 2e6d39dfd1..f478891ae2 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/SourceCoordinatorFactoryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/SourceCoordinatorFactoryTest.java @@ -3,19 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination; +package org.opensearch.dataprepper.core.sourcecoordination; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.model.source.SourceCoordinationStore; import org.opensearch.dataprepper.model.source.coordinator.SourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import java.util.Optional; import java.util.UUID; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinatorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinatorTest.java similarity index 97% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinatorTest.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinatorTest.java index 6608811945..ad4efa5dab 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinatorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/sourcecoordination/enhanced/EnhancedLeaseBasedSourceCoordinatorTest.java @@ -3,19 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.sourcecoordination.enhanced; +package org.opensearch.dataprepper.core.sourcecoordination.enhanced; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.sourcecoordination.enhanced.EnhancedLeaseBasedSourceCoordinator; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.source.SourceCoordinationStore; import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStatus; import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import java.time.Duration; import java.util.Optional; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProviderTest.java index c850807b91..8c85403c57 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/HttpBasicDataPrepperCoreAuthenticationProviderTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins; -import org.opensearch.dataprepper.pipeline.server.HttpBasicAuthenticationConfig; +import org.opensearch.dataprepper.core.pipeline.server.HttpBasicAuthenticationConfig; import com.sun.net.httpserver.Authenticator; import com.sun.net.httpserver.BasicAuthenticator; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSourceWithEnhancedCoordination.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSourceWithEnhancedCoordination.java index 1dd4625274..0e2b7faf4f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSourceWithEnhancedCoordination.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSourceWithEnhancedCoordination.java @@ -13,7 +13,7 @@ import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; import org.opensearch.dataprepper.model.source.coordinator.enhanced.UsesEnhancedSourceCoordination; -import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactoryTest; +import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactoryTest; import java.util.Iterator; import java.util.List; diff --git a/data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_with_reset.yaml b/data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_with_reset.yaml deleted file mode 100644 index d020ea2c57..0000000000 --- a/data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_with_reset.yaml +++ /dev/null @@ -1,2 +0,0 @@ -usage: 24b -reset: 3s \ No newline at end of file diff --git a/data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_without_reset.yaml b/data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_without_reset.yaml deleted file mode 100644 index e3fd6d2159..0000000000 --- a/data-prepper-core/src/test/resources/org/opensearch/dataprepper/parser/model/heap_without_reset.yaml +++ /dev/null @@ -1 +0,0 @@ -usage: 24b \ No newline at end of file diff --git a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgs.java b/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgs.java index db08f9959e..eb091acc31 100644 --- a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgs.java +++ b/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgs.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper; import org.opensearch.dataprepper.logstash.LogstashConfigConverter; -import org.opensearch.dataprepper.parser.config.FileStructurePathProvider; +import org.opensearch.dataprepper.core.parser.config.FileStructurePathProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgumentConfiguration.java b/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgumentConfiguration.java index 38c71cdb2b..a3433af865 100644 --- a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgumentConfiguration.java +++ b/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgumentConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper; -import org.opensearch.dataprepper.parser.config.DataPrepperAppConfiguration; +import org.opensearch.dataprepper.core.parser.config.DataPrepperAppConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; diff --git a/data-prepper-plugins/geoip-processor/src/test/java/org/opensearch/dataprepper/plugins/geoip/extension/GeoIpServiceConfigTest.java b/data-prepper-plugins/geoip-processor/src/test/java/org/opensearch/dataprepper/plugins/geoip/extension/GeoIpServiceConfigTest.java index b8d28392db..3c53c0cd66 100644 --- a/data-prepper-plugins/geoip-processor/src/test/java/org/opensearch/dataprepper/plugins/geoip/extension/GeoIpServiceConfigTest.java +++ b/data-prepper-plugins/geoip-processor/src/test/java/org/opensearch/dataprepper/plugins/geoip/extension/GeoIpServiceConfigTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import software.amazon.awssdk.regions.Region; import java.io.File; diff --git a/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceJsonTypeIT.java b/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceJsonTypeIT.java index 53eeefdf25..cad838eac8 100644 --- a/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceJsonTypeIT.java +++ b/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceJsonTypeIT.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.opensearch.dataprepper.acknowledgements.DefaultAcknowledgementSetManager; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager; import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.model.buffer.Buffer; diff --git a/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslPlainTextIT.java b/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslPlainTextIT.java index 7f8e4aa436..b64c97aa5d 100644 --- a/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslPlainTextIT.java +++ b/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslPlainTextIT.java @@ -20,7 +20,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.metrics.PluginMetrics; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.model.buffer.Buffer; diff --git a/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslScramIT.java b/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslScramIT.java index 022ab7d2ce..f4b3001615 100644 --- a/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslScramIT.java +++ b/data-prepper-plugins/kafka-plugins/src/integrationTest/java/org/opensearch/dataprepper/plugins/kafka/source/KafkaSourceSaslScramIT.java @@ -20,7 +20,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.metrics.PluginMetrics; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.model.buffer.Buffer; diff --git a/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/consumer/KafkaCustomConsumerTest.java b/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/consumer/KafkaCustomConsumerTest.java index ddc8d06144..8f0052afb5 100644 --- a/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/consumer/KafkaCustomConsumerTest.java +++ b/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/consumer/KafkaCustomConsumerTest.java @@ -24,7 +24,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import org.opensearch.dataprepper.acknowledgements.DefaultAcknowledgementSetManager; +import org.opensearch.dataprepper.core.acknowledgements.DefaultAcknowledgementSetManager; import org.opensearch.dataprepper.model.CheckpointState; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.model.buffer.Buffer; diff --git a/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/extension/KafkaClusterConfigTest.java b/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/extension/KafkaClusterConfigTest.java index bd71634a7a..bc1b31e215 100644 --- a/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/extension/KafkaClusterConfigTest.java +++ b/data-prepper-plugins/kafka-plugins/src/test/java/org/opensearch/dataprepper/plugins/kafka/extension/KafkaClusterConfigTest.java @@ -12,7 +12,7 @@ import org.opensearch.dataprepper.model.types.ByteCount; import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import org.opensearch.dataprepper.plugins.kafka.configuration.AwsIamAuthConfig; import org.opensearch.dataprepper.plugins.kafka.configuration.EncryptionType; import org.opensearch.dataprepper.plugins.kafka.configuration.MskBrokerConnectionType; diff --git a/data-prepper-plugins/kinesis-source/src/test/java/org/opensearch/dataprepper/plugins/kinesis/extension/KinesisLeaseConfigTest.java b/data-prepper-plugins/kinesis-source/src/test/java/org/opensearch/dataprepper/plugins/kinesis/extension/KinesisLeaseConfigTest.java index 30194a9659..311e33cc9c 100644 --- a/data-prepper-plugins/kinesis-source/src/test/java/org/opensearch/dataprepper/plugins/kinesis/extension/KinesisLeaseConfigTest.java +++ b/data-prepper-plugins/kinesis-source/src/test/java/org/opensearch/dataprepper/plugins/kinesis/extension/KinesisLeaseConfigTest.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.model.types.ByteCount; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; +import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/S3ScanObjectWorkerIT.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/S3ScanObjectWorkerIT.java index cebd91daea..af444f962f 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/S3ScanObjectWorkerIT.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/S3ScanObjectWorkerIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.params.provider.ValueSource; 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.metrics.PluginMetrics; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.model.buffer.Buffer; @@ -32,7 +32,7 @@ import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.source.SourceCoordinationStore; import org.opensearch.dataprepper.model.source.coordinator.SourceCoordinator; -import org.opensearch.dataprepper.parser.model.SourceCoordinationConfig; +import org.opensearch.dataprepper.core.parser.model.SourceCoordinationConfig; import org.opensearch.dataprepper.plugins.codec.CompressionOption; import org.opensearch.dataprepper.plugins.source.s3.configuration.S3ScanBucketOption; import org.opensearch.dataprepper.plugins.source.s3.configuration.S3ScanScanOptions; @@ -42,7 +42,7 @@ import org.opensearch.dataprepper.plugins.source.s3.configuration.S3SelectSerializationFormatOption; import org.opensearch.dataprepper.plugins.source.s3.ownership.BucketOwnerProvider; import org.opensearch.dataprepper.plugins.sourcecoordinator.inmemory.InMemorySourceCoordinationStore; -import org.opensearch.dataprepper.sourcecoordination.LeaseBasedSourceCoordinator; +import org.opensearch.dataprepper.core.sourcecoordination.LeaseBasedSourceCoordinator; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3AsyncClient; import software.amazon.awssdk.services.s3.S3Client; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/SqsWorkerIT.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/SqsWorkerIT.java index c6c94c27c6..21475930ec 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/SqsWorkerIT.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/s3/SqsWorkerIT.java @@ -18,7 +18,7 @@ import org.mockito.ArgumentCaptor; 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.metrics.PluginMetrics; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; From 06a5006269aa2fb8fbddd5fb08b8914004381fb9 Mon Sep 17 00:00:00 2001 From: Santhosh Gandhe <1909520+san81@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:18:10 -0700 Subject: [PATCH 2/6] core package introduced in the data-prepper-parser module Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com> --- .../dataprepper/plugin/DefaultPluginFactoryIT.java | 6 +++--- .../org/opensearch/dataprepper/plugins/ExtensionsIT.java | 6 +++--- .../dataprepper/core/parser/PipelineTransformer.java | 6 +++--- .../core/parser/config/PipelineParserConfiguration.java | 4 ++-- .../dataprepper/core/parser/PipelineTransformerTests.java | 8 +++----- .../parser/config/PipelineParserConfigurationTest.java | 5 ++--- .../{ => core}/validation/LoggingPluginErrorsHandler.java | 2 +- .../dataprepper/{ => core}/validation/PluginError.java | 2 +- .../{ => core}/validation/PluginErrorCollector.java | 2 +- .../{ => core}/validation/PluginErrorsHandler.java | 2 +- .../validation/LoggingPluginErrorsHandlerTest.java | 4 +++- .../{ => core}/validation/PluginErrorCollectorTest.java | 4 +++- .../{ => core}/validation/PluginErrorTest.java | 3 ++- .../opensearch/dataprepper/plugin/ExtensionLoader.java | 6 +++--- .../dataprepper/plugin/ExtensionLoaderTest.java | 6 +++--- 15 files changed, 34 insertions(+), 32 deletions(-) rename data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/{ => core}/validation/LoggingPluginErrorsHandler.java (94%) rename data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/{ => core}/validation/PluginError.java (96%) rename data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/{ => core}/validation/PluginErrorCollector.java (86%) rename data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/{ => core}/validation/PluginErrorsHandler.java (73%) rename data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/{ => core}/validation/LoggingPluginErrorsHandlerTest.java (88%) rename data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/{ => core}/validation/PluginErrorCollectorTest.java (78%) rename data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/{ => core}/validation/PluginErrorTest.java (95%) diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java index e413813766..d97ce7e760 100644 --- a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java +++ b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java @@ -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/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java index c10a4745e5..4d79a15088 100644 --- a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java +++ b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/ExtensionsIT.java @@ -31,9 +31,9 @@ import org.opensearch.dataprepper.plugin.TestPluggableInterface; import org.opensearch.dataprepper.plugins.test.TestExtension; import org.opensearch.dataprepper.core.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.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/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java index 71b034aac2..f36d74ce86 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/PipelineTransformer.java @@ -32,9 +32,9 @@ 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.validation.PluginError; -import org.opensearch.dataprepper.validation.PluginErrorCollector; -import org.opensearch.dataprepper.validation.PluginErrorsHandler; +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; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfiguration.java index 1c3521abe0..3c80bb5bac 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfiguration.java @@ -21,8 +21,8 @@ import org.opensearch.dataprepper.pipeline.parser.transformer.PipelineConfigurationTransformer; import org.opensearch.dataprepper.core.pipeline.router.RouterFactory; import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; -import org.opensearch.dataprepper.validation.PluginErrorCollector; -import org.opensearch.dataprepper.validation.PluginErrorsHandler; +import org.opensearch.dataprepper.core.validation.PluginErrorCollector; +import org.opensearch.dataprepper.core.validation.PluginErrorsHandler; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java index a28a265826..00e1e6ea74 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/PipelineTransformerTests.java @@ -22,8 +22,6 @@ 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.core.parser.CircuitBreakingBuffer; -import org.opensearch.dataprepper.core.parser.PipelineTransformer; import org.opensearch.dataprepper.model.breaker.CircuitBreaker; import org.opensearch.dataprepper.model.buffer.Buffer; import org.opensearch.dataprepper.model.configuration.PipelineModel; @@ -42,9 +40,9 @@ import org.opensearch.dataprepper.core.pipeline.router.RouterFactory; import org.opensearch.dataprepper.plugin.DefaultPluginFactory; import org.opensearch.dataprepper.core.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.validation.PluginError; +import org.opensearch.dataprepper.core.validation.PluginErrorCollector; +import org.opensearch.dataprepper.core.validation.PluginErrorsHandler; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import java.time.Duration; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfigurationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfigurationTest.java index 54e1f827ad..2090f30bb0 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfigurationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/PipelineParserConfigurationTest.java @@ -6,7 +6,6 @@ package org.opensearch.dataprepper.core.parser.config; import org.opensearch.dataprepper.core.breaker.CircuitBreakerManager; -import org.opensearch.dataprepper.core.parser.config.PipelineParserConfiguration; import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.core.parser.PipelineTransformer; @@ -20,8 +19,8 @@ import org.opensearch.dataprepper.model.event.EventFactory; import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager; import org.opensearch.dataprepper.core.sourcecoordination.SourceCoordinatorFactory; -import org.opensearch.dataprepper.validation.PluginErrorCollector; -import org.opensearch.dataprepper.validation.PluginErrorsHandler; +import org.opensearch.dataprepper.core.validation.PluginErrorCollector; +import org.opensearch.dataprepper.core.validation.PluginErrorsHandler; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/LoggingPluginErrorsHandler.java b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/LoggingPluginErrorsHandler.java similarity index 94% rename from data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/LoggingPluginErrorsHandler.java rename to data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/LoggingPluginErrorsHandler.java index 879f18823e..e4a35d2f3d 100644 --- a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/LoggingPluginErrorsHandler.java +++ b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/LoggingPluginErrorsHandler.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.validation; +package org.opensearch.dataprepper.core.validation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginError.java b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginError.java similarity index 96% rename from data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginError.java rename to data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginError.java index 50a130c4f4..09a965542d 100644 --- a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginError.java +++ b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginError.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.validation; +package org.opensearch.dataprepper.core.validation; import lombok.Builder; import lombok.Getter; diff --git a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginErrorCollector.java b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginErrorCollector.java similarity index 86% rename from data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginErrorCollector.java rename to data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginErrorCollector.java index 62b6654c0b..f0172a646b 100644 --- a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginErrorCollector.java +++ b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginErrorCollector.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.validation; +package org.opensearch.dataprepper.core.validation; import lombok.Getter; diff --git a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginErrorsHandler.java b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginErrorsHandler.java similarity index 73% rename from data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginErrorsHandler.java rename to data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginErrorsHandler.java index 3417ff5bfa..97ad4db400 100644 --- a/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/validation/PluginErrorsHandler.java +++ b/data-prepper-pipeline-parser/src/main/java/org/opensearch/dataprepper/core/validation/PluginErrorsHandler.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.validation; +package org.opensearch.dataprepper.core.validation; import java.util.Collection; diff --git a/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/LoggingPluginErrorsHandlerTest.java b/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/LoggingPluginErrorsHandlerTest.java similarity index 88% rename from data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/LoggingPluginErrorsHandlerTest.java rename to data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/LoggingPluginErrorsHandlerTest.java index f4b8fbbec5..4747cae171 100644 --- a/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/LoggingPluginErrorsHandlerTest.java +++ b/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/LoggingPluginErrorsHandlerTest.java @@ -1,7 +1,9 @@ -package org.opensearch.dataprepper.validation; +package org.opensearch.dataprepper.core.validation; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; +import org.opensearch.dataprepper.core.validation.LoggingPluginErrorsHandler; +import org.opensearch.dataprepper.core.validation.PluginError; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/PluginErrorCollectorTest.java b/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/PluginErrorCollectorTest.java similarity index 78% rename from data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/PluginErrorCollectorTest.java rename to data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/PluginErrorCollectorTest.java index d0b5fbd8b2..6c49dbd50b 100644 --- a/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/PluginErrorCollectorTest.java +++ b/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/PluginErrorCollectorTest.java @@ -1,6 +1,8 @@ -package org.opensearch.dataprepper.validation; +package org.opensearch.dataprepper.core.validation; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.validation.PluginError; +import org.opensearch.dataprepper.core.validation.PluginErrorCollector; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/PluginErrorTest.java b/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/PluginErrorTest.java similarity index 95% rename from data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/PluginErrorTest.java rename to data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/PluginErrorTest.java index c02dde376c..c3b0d4f708 100644 --- a/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/validation/PluginErrorTest.java +++ b/data-prepper-pipeline-parser/src/test/java/org/opensearch/dataprepper/core/validation/PluginErrorTest.java @@ -1,6 +1,7 @@ -package org.opensearch.dataprepper.validation; +package org.opensearch.dataprepper.core.validation; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.validation.PluginError; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/ExtensionLoader.java b/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/ExtensionLoader.java index bd895f6e51..fb44a3b6a0 100644 --- a/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/ExtensionLoader.java +++ b/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/ExtensionLoader.java @@ -10,9 +10,9 @@ import org.opensearch.dataprepper.model.plugin.ExtensionPlugin; import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException; import org.opensearch.dataprepper.model.plugin.InvalidPluginDefinitionException; -import org.opensearch.dataprepper.validation.PluginError; -import org.opensearch.dataprepper.validation.PluginErrorCollector; -import org.opensearch.dataprepper.validation.PluginErrorsHandler; +import org.opensearch.dataprepper.core.validation.PluginError; +import org.opensearch.dataprepper.core.validation.PluginErrorCollector; +import org.opensearch.dataprepper.core.validation.PluginErrorsHandler; import javax.inject.Inject; import javax.inject.Named; diff --git a/data-prepper-plugin-framework/src/test/java/org/opensearch/dataprepper/plugin/ExtensionLoaderTest.java b/data-prepper-plugin-framework/src/test/java/org/opensearch/dataprepper/plugin/ExtensionLoaderTest.java index bf46579377..7370c6dd8f 100644 --- a/data-prepper-plugin-framework/src/test/java/org/opensearch/dataprepper/plugin/ExtensionLoaderTest.java +++ b/data-prepper-plugin-framework/src/test/java/org/opensearch/dataprepper/plugin/ExtensionLoaderTest.java @@ -24,9 +24,9 @@ import org.opensearch.dataprepper.model.plugin.InvalidPluginDefinitionException; import org.opensearch.dataprepper.plugins.test.TestExtensionConfig; import org.opensearch.dataprepper.plugins.test.TestExtensionWithConfig; -import org.opensearch.dataprepper.validation.PluginError; -import org.opensearch.dataprepper.validation.PluginErrorCollector; -import org.opensearch.dataprepper.validation.PluginErrorsHandler; +import org.opensearch.dataprepper.core.validation.PluginError; +import org.opensearch.dataprepper.core.validation.PluginErrorCollector; +import org.opensearch.dataprepper.core.validation.PluginErrorsHandler; import java.util.ArrayList; import java.util.Collection; From f24dc82391928b5861d8e7777c0a06e878bf6745 Mon Sep 17 00:00:00 2001 From: Santhosh Gandhe <1909520+san81@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:38:07 -0700 Subject: [PATCH 3/6] core package introduced in the data-prepper-main module Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com> --- .../test/framework/DataPrepperTestRunner.java | 2 +- .../opensearch/dataprepper/AbstractContextManager.java | 9 +++++++-- .../opensearch/dataprepper/{ => core}/DataPrepper.java | 4 +++- .../core/parser/config/CustomTagsMeterFilter.java | 2 +- .../core/pipeline/server/ShutdownHandler.java | 2 +- .../server/config/DataPrepperServerConfiguration.java | 2 +- .../dataprepper/AbstractContextManagerTest.java | 1 + .../dataprepper/{ => core}/DataPrepperTests.java | 3 ++- .../core/parser/config/CustomTagsMeterFilterTest.java | 4 +--- .../core/parser/config/MetricsConfigTest.java | 3 +-- .../core/pipeline/server/ShutdownHandlerTest.java | 3 +-- .../config/DataPrepperServerConfigurationTest.java | 3 +-- .../org/opensearch/dataprepper/DataPrepperExecute.java | 1 + .../dataprepper/{ => core}/DataPrepperArgs.java | 2 +- .../{ => core}/DataPrepperArgumentConfiguration.java | 2 +- .../org/opensearch/dataprepper/ContextManagerTest.java | 1 + .../org/opensearch/dataprepper/DataPrepperArgsTest.java | 1 + .../DataPrepperArgumentConfigurationTest.java | 2 ++ 18 files changed, 28 insertions(+), 19 deletions(-) rename data-prepper-core/src/main/java/org/opensearch/dataprepper/{ => core}/DataPrepper.java (97%) rename data-prepper-core/src/test/java/org/opensearch/dataprepper/{ => core}/DataPrepperTests.java (98%) rename data-prepper-main/src/main/java/org/opensearch/dataprepper/{ => core}/DataPrepperArgs.java (99%) rename data-prepper-main/src/main/java/org/opensearch/dataprepper/{ => core}/DataPrepperArgumentConfiguration.java (96%) diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java index bf0a39e694..6f38971d47 100644 --- a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java +++ b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/test/framework/DataPrepperTestRunner.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.test.framework; import org.opensearch.dataprepper.AbstractContextManager; -import org.opensearch.dataprepper.DataPrepper; +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; 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 index e2cb80bbe6..5125267e8f 100644 --- 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/data-prepper-core/src/main/java/org/opensearch/dataprepper/DataPrepper.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/DataPrepper.java similarity index 97% rename from data-prepper-core/src/main/java/org/opensearch/dataprepper/DataPrepper.java rename to data-prepper-core/src/main/java/org/opensearch/dataprepper/core/DataPrepper.java index 3a31ca123b..d83173b19f 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/DataPrepper.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/DataPrepper.java @@ -3,9 +3,11 @@ * 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.core.parser.PipelineTransformer; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilter.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilter.java index 224fa30a8d..720343b40b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilter.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilter.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.opensearch.dataprepper.DataPrepper.getServiceNameForMetrics; +import static org.opensearch.dataprepper.core.DataPrepper.getServiceNameForMetrics; import static org.opensearch.dataprepper.metrics.MetricNames.DELIMITER; import static org.opensearch.dataprepper.metrics.MetricNames.SERVICE_NAME; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandler.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandler.java index aa90b7efe7..d6ab63f197 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandler.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandler.java @@ -9,7 +9,7 @@ import com.sun.net.httpserver.HttpHandler; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; -import org.opensearch.dataprepper.DataPrepper; +import org.opensearch.dataprepper.core.DataPrepper; import org.opensearch.dataprepper.DataPrepperShutdownOptions; import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationParser; import org.slf4j.Logger; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfiguration.java index de6739adf4..6fdcda2214 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.core.pipeline.server.config; -import org.opensearch.dataprepper.DataPrepper; +import org.opensearch.dataprepper.core.DataPrepper; import org.opensearch.dataprepper.core.pipeline.PipelinesProvider; import org.opensearch.dataprepper.core.pipeline.server.DataPrepperCoreAuthenticationProvider; import org.opensearch.dataprepper.core.pipeline.server.ShutdownHandler; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/AbstractContextManagerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/AbstractContextManagerTest.java index 38fbfdcf2e..96e2ba2201 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/AbstractContextManagerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/AbstractContextManagerTest.java @@ -11,6 +11,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.MockedConstruction; +import org.opensearch.dataprepper.core.DataPrepper; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import java.util.ArrayList; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/DataPrepperTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/DataPrepperTests.java similarity index 98% rename from data-prepper-core/src/test/java/org/opensearch/dataprepper/DataPrepperTests.java rename to data-prepper-core/src/test/java/org/opensearch/dataprepper/core/DataPrepperTests.java index ca3adac0ea..dfda2111a9 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/DataPrepperTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/DataPrepperTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper; +package org.opensearch.dataprepper.core; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; @@ -12,6 +12,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.DataPrepperShutdownOptions; import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.core.parser.PipelineTransformer; import org.opensearch.dataprepper.core.peerforwarder.server.PeerForwarderServer; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilterTest.java index c3801e73a7..e0e7208935 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/CustomTagsMeterFilterTest.java @@ -10,8 +10,6 @@ import io.micrometer.core.instrument.Tags; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.opensearch.dataprepper.core.parser.config.CustomTagsMeterFilter; -import org.opensearch.dataprepper.core.parser.config.MetricTagFilter; import java.util.List; import java.util.Map; @@ -21,7 +19,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; -import static org.opensearch.dataprepper.DataPrepper.getServiceNameForMetrics; +import static org.opensearch.dataprepper.core.DataPrepper.getServiceNameForMetrics; import static org.opensearch.dataprepper.metrics.MetricNames.SERVICE_NAME; class CustomTagsMeterFilterTest { diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricsConfigTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricsConfigTest.java index 1b0574a628..31c0bf19d1 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricsConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/parser/config/MetricsConfigTest.java @@ -8,9 +8,8 @@ import io.micrometer.core.instrument.Metrics; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.opensearch.dataprepper.DataPrepper; +import org.opensearch.dataprepper.core.DataPrepper; import org.opensearch.dataprepper.core.meter.EMFLoggingMeterRegistry; -import org.opensearch.dataprepper.core.parser.config.MetricsConfig; import org.opensearch.dataprepper.metrics.MetricNames; import org.opensearch.dataprepper.core.parser.model.DataPrepperConfiguration; import org.opensearch.dataprepper.core.parser.model.MetricRegistryType; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandlerTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandlerTest.java index 69cc20d7dc..494c84522b 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandlerTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/ShutdownHandlerTest.java @@ -17,9 +17,8 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.DataPrepper; +import org.opensearch.dataprepper.core.DataPrepper; import org.opensearch.dataprepper.DataPrepperShutdownOptions; -import org.opensearch.dataprepper.core.pipeline.server.ShutdownHandler; import javax.ws.rs.HttpMethod; import java.io.IOException; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfigurationTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfigurationTest.java index 033d0f86ec..39157a216e 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfigurationTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/core/pipeline/server/config/DataPrepperServerConfigurationTest.java @@ -5,8 +5,7 @@ package org.opensearch.dataprepper.core.pipeline.server.config; -import org.opensearch.dataprepper.DataPrepper; -import org.opensearch.dataprepper.core.pipeline.server.config.DataPrepperServerConfiguration; +import org.opensearch.dataprepper.core.DataPrepper; import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.opensearch.dataprepper.model.plugin.PluginFactory; diff --git a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperExecute.java b/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperExecute.java index 254c366820..88a931dfd3 100644 --- a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperExecute.java +++ b/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperExecute.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.ComponentScan; diff --git a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgs.java b/data-prepper-main/src/main/java/org/opensearch/dataprepper/core/DataPrepperArgs.java similarity index 99% rename from data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgs.java rename to data-prepper-main/src/main/java/org/opensearch/dataprepper/core/DataPrepperArgs.java index eb091acc31..04d77e5941 100644 --- a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgs.java +++ b/data-prepper-main/src/main/java/org/opensearch/dataprepper/core/DataPrepperArgs.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper; +package org.opensearch.dataprepper.core; import org.opensearch.dataprepper.logstash.LogstashConfigConverter; import org.opensearch.dataprepper.core.parser.config.FileStructurePathProvider; diff --git a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgumentConfiguration.java b/data-prepper-main/src/main/java/org/opensearch/dataprepper/core/DataPrepperArgumentConfiguration.java similarity index 96% rename from data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgumentConfiguration.java rename to data-prepper-main/src/main/java/org/opensearch/dataprepper/core/DataPrepperArgumentConfiguration.java index a3433af865..dd7c252743 100644 --- a/data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperArgumentConfiguration.java +++ b/data-prepper-main/src/main/java/org/opensearch/dataprepper/core/DataPrepperArgumentConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper; +package org.opensearch.dataprepper.core; import org.opensearch.dataprepper.core.parser.config.DataPrepperAppConfiguration; import org.slf4j.Logger; diff --git a/data-prepper-main/src/test/java/org/opensearch/dataprepper/ContextManagerTest.java b/data-prepper-main/src/test/java/org/opensearch/dataprepper/ContextManagerTest.java index 3f7f1aa88f..e62beaca59 100644 --- a/data-prepper-main/src/test/java/org/opensearch/dataprepper/ContextManagerTest.java +++ b/data-prepper-main/src/test/java/org/opensearch/dataprepper/ContextManagerTest.java @@ -6,6 +6,7 @@ package org.opensearch.dataprepper; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.DataPrepper; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgsTest.java b/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgsTest.java index 3ec637e6a7..1ff2aef4d6 100644 --- a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgsTest.java +++ b/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgsTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.core.DataPrepperArgs; import java.nio.file.Paths; diff --git a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgumentConfigurationTest.java b/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgumentConfigurationTest.java index d927964b28..eae122e30c 100644 --- a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgumentConfigurationTest.java +++ b/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgumentConfigurationTest.java @@ -6,6 +6,8 @@ package org.opensearch.dataprepper; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.core.DataPrepperArgs; +import org.opensearch.dataprepper.core.DataPrepperArgumentConfiguration; import org.springframework.core.env.Environment; import static org.hamcrest.MatcherAssert.assertThat; From ad3bc0ad3031f726c33a546a5dd683e98d6597b5 Mon Sep 17 00:00:00 2001 From: Santhosh Gandhe <1909520+san81@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:53:28 -0700 Subject: [PATCH 4/6] corresponding test classes moved Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com> --- .../dataprepper/{ => core}/DataPrepperArgsTest.java | 3 +-- .../{ => core}/DataPrepperArgumentConfigurationTest.java | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) rename data-prepper-main/src/test/java/org/opensearch/dataprepper/{ => core}/DataPrepperArgsTest.java (97%) rename data-prepper-main/src/test/java/org/opensearch/dataprepper/{ => core}/DataPrepperArgumentConfigurationTest.java (93%) diff --git a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgsTest.java b/data-prepper-main/src/test/java/org/opensearch/dataprepper/core/DataPrepperArgsTest.java similarity index 97% rename from data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgsTest.java rename to data-prepper-main/src/test/java/org/opensearch/dataprepper/core/DataPrepperArgsTest.java index 1ff2aef4d6..1049f3280e 100644 --- a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgsTest.java +++ b/data-prepper-main/src/test/java/org/opensearch/dataprepper/core/DataPrepperArgsTest.java @@ -3,12 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper; +package org.opensearch.dataprepper.core; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.dataprepper.core.DataPrepperArgs; import java.nio.file.Paths; diff --git a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgumentConfigurationTest.java b/data-prepper-main/src/test/java/org/opensearch/dataprepper/core/DataPrepperArgumentConfigurationTest.java similarity index 93% rename from data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgumentConfigurationTest.java rename to data-prepper-main/src/test/java/org/opensearch/dataprepper/core/DataPrepperArgumentConfigurationTest.java index eae122e30c..30cd8d6d33 100644 --- a/data-prepper-main/src/test/java/org/opensearch/dataprepper/DataPrepperArgumentConfigurationTest.java +++ b/data-prepper-main/src/test/java/org/opensearch/dataprepper/core/DataPrepperArgumentConfigurationTest.java @@ -3,11 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper; +package org.opensearch.dataprepper.core; import org.junit.jupiter.api.Test; -import org.opensearch.dataprepper.core.DataPrepperArgs; -import org.opensearch.dataprepper.core.DataPrepperArgumentConfiguration; import org.springframework.core.env.Environment; import static org.hamcrest.MatcherAssert.assertThat; From 5dffee44a8340def0f6e87a8182bd5f6629d8813 Mon Sep 17 00:00:00 2001 From: Santhosh Gandhe <1909520+san81@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:24:15 -0700 Subject: [PATCH 5/6] moved the resource files to their corresponding location Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com> --- .../dataprepper/core/parser/model/heap_with_reset.yaml | 2 ++ .../dataprepper/core/parser/model/heap_without_reset.yaml | 1 + 2 files changed, 3 insertions(+) create mode 100644 data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_with_reset.yaml create mode 100644 data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_without_reset.yaml diff --git a/data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_with_reset.yaml b/data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_with_reset.yaml new file mode 100644 index 0000000000..d020ea2c57 --- /dev/null +++ b/data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_with_reset.yaml @@ -0,0 +1,2 @@ +usage: 24b +reset: 3s \ No newline at end of file diff --git a/data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_without_reset.yaml b/data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_without_reset.yaml new file mode 100644 index 0000000000..e3fd6d2159 --- /dev/null +++ b/data-prepper-core/src/test/resources/org/opensearch/dataprepper/core/parser/model/heap_without_reset.yaml @@ -0,0 +1 @@ +usage: 24b \ No newline at end of file From add408628bfa48c0edd68bbc360dc598c70700ba Mon Sep 17 00:00:00 2001 From: Santhosh Gandhe <1909520+san81@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:46:29 -0700 Subject: [PATCH 6/6] removing changes unrelated to this branch Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com> --- .../dataprepper/model/configuration/DataPrepperVersion.java | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/DataPrepperVersion.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/DataPrepperVersion.java index 7bf0e90da6..f8e996f8d1 100644 --- a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/DataPrepperVersion.java +++ b/data-prepper-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/gradle.properties b/gradle.properties index 823b5c8578..d62bb0cc08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,5 +5,5 @@ # ATTENTION: If you are changing the version, please change the DataPrepperVersion whenever the major or minor version changes. # See: https://github.com/opensearch-project/data-prepper/blob/main/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/DataPrepperVersion.java#L9 -version=2.11.0-SNAPSHOT +version=2.10.0-SNAPSHOT org.gradle.jvmargs=-Xmx2048M