From f9c91f1850dec3ebda4bac53cb0ad68f36afe7b3 Mon Sep 17 00:00:00 2001 From: David Venable Date: Wed, 28 Sep 2022 21:37:57 -0500 Subject: [PATCH] Updates data-prepper-api to the org.opensearch.dataprepper package. Signed-off-by: David Venable --- .../expression/ExpressionEvaluator.java | 2 +- .../dataprepper/metrics/MetricNames.java | 2 +- .../dataprepper/metrics/PluginMetrics.java | 4 +-- .../dataprepper/model/CheckpointState.java | 2 +- .../model/annotations/DataPrepperPlugin.java | 12 ++++---- .../DataPrepperPluginConstructor.java | 2 +- .../model/annotations/SingleThread.java | 2 +- .../model/buffer/AbstractBuffer.java | 12 ++++---- .../dataprepper/model/buffer/Buffer.java | 6 ++-- .../model/buffer/SizeOverflowException.java | 2 +- .../model/configuration/ConditionalRoute.java | 2 +- .../configuration/PipelineDescription.java | 2 +- .../model/configuration/PipelineModel.java | 2 +- .../configuration/PipelinesDataFlowModel.java | 2 +- .../model/configuration/PluginModel.java | 2 +- .../model/configuration/PluginSetting.java | 2 +- .../model/configuration/SinkModel.java | 2 +- .../model/event/DefaultEventMetadata.java | 2 +- .../dataprepper/model/event/Event.java | 10 +++---- .../model/event/EventMetadata.java | 2 +- .../dataprepper/model/event/EventType.java | 2 +- .../dataprepper/model/event/JacksonEvent.java | 2 +- .../dataprepper/model/log/JacksonLog.java | 6 ++-- .../dataprepper/model/log/Log.java | 4 +-- .../dataprepper/model/metric/Bucket.java | 2 +- .../model/metric/DefaultBucket.java | 2 +- .../model/metric/DefaultQuantile.java | 2 +- .../dataprepper/model/metric/Gauge.java | 2 +- .../dataprepper/model/metric/Histogram.java | 2 +- .../model/metric/JacksonGauge.java | 4 +-- .../model/metric/JacksonHistogram.java | 4 +-- .../model/metric/JacksonMetric.java | 4 +-- .../dataprepper/model/metric/JacksonSum.java | 4 +-- .../model/metric/JacksonSummary.java | 4 +-- .../dataprepper/model/metric/Metric.java | 4 +-- .../model/metric/ParameterValidator.java | 2 +- .../dataprepper/model/metric/Quantile.java | 2 +- .../dataprepper/model/metric/Sum.java | 2 +- .../dataprepper/model/metric/Summary.java | 2 +- .../peerforwarder/RequiresPeerForwarding.java | 4 +-- .../InvalidPluginConfigurationException.java | 2 +- .../InvalidPluginDefinitionException.java | 2 +- .../model/plugin/NoPluginFoundException.java | 2 +- .../model/plugin/PluginFactory.java | 4 +-- .../plugin/PluginInvocationException.java | 2 +- .../model/processor/AbstractProcessor.java | 10 +++---- .../model/processor/Processor.java | 4 +-- .../dataprepper/model/record/Record.java | 2 +- .../model/record/RecordMetadata.java | 2 +- .../dataprepper/model/sink/AbstractSink.java | 10 +++---- .../dataprepper/model/sink/Sink.java | 4 +-- .../dataprepper/model/source/Source.java | 6 ++-- .../dataprepper/model/trace/DefaultLink.java | 2 +- .../model/trace/DefaultSpanEvent.java | 2 +- .../model/trace/DefaultTraceGroupFields.java | 2 +- .../dataprepper/model/trace/JacksonSpan.java | 6 ++-- .../dataprepper/model/trace/Link.java | 2 +- .../dataprepper/model/trace/Span.java | 8 +++--- .../dataprepper/model/trace/SpanEvent.java | 2 +- .../model/trace/TraceGroupFields.java | 2 +- .../processor/state/ProcessorState.java | 2 +- .../dataprepper/metrics/MetricsTestUtil.java | 2 +- .../metrics/PluginMetricsTest.java | 4 +-- .../model/CheckpointStateTest.java | 2 +- .../model/buffer/AbstractBufferTest.java | 22 +++++++-------- .../configuration/ConditionalRouteTest.java | 2 +- .../configuration/PipelineModelTest.java | 2 +- .../PipelinesDataFlowModelTest.java | 2 +- .../model/configuration/PluginModelTests.java | 2 +- .../configuration/PluginSettingsTests.java | 2 +- .../model/configuration/SinkModelTest.java | 2 +- .../model/event/DefaultEventMetadataTest.java | 2 +- .../model/event/EventTypeTest.java | 2 +- .../model/event/JacksonEventTest.java | 2 +- .../dataprepper/model/event/TestObject.java | 2 +- .../dataprepper/model/log/JacksonLogTest.java | 8 +++--- .../model/metric/JacksonGaugeTest.java | 4 +-- .../model/metric/JacksonHistogramTest.java | 2 +- .../model/metric/JacksonSumTest.java | 2 +- .../model/metric/JacksonSummaryTest.java | 2 +- ...validPluginConfigurationExceptionTest.java | 2 +- .../InvalidPluginDefinitionExceptionTest.java | 2 +- .../plugin/NoPluginFoundExceptionTest.java | 2 +- .../plugin/PluginInvocationExceptionTest.java | 2 +- .../processor/AbstractProcessorTest.java | 12 ++++---- .../dataprepper/model/record/RecordTests.java | 4 +-- .../model/sink/AbstractSinkTest.java | 10 +++---- .../model/trace/DefaultLinkTest.java | 4 +-- .../model/trace/DefaultSpanEventTest.java | 4 +-- .../trace/DefaultTraceGroupFieldsTest.java | 4 +-- .../model/trace/JacksonSpanTest.java | 4 +-- .../conditional_route_invalid_just_value.yaml | 0 .../conditional_route_invalid_non_string.yaml | 0 .../conditional_route_invalid_object.yaml | 0 .../configuration/conditional_route_list.yaml | 0 .../conditional_route_single.yaml | 0 .../configuration/plugin_model_empty.yaml | 0 .../plugin_model_not_present.yaml | 0 .../configuration/plugin_model_null.yaml | 0 .../model/configuration/sink_plugin.yaml | 0 .../opensearch/dataprepper/DataPrepper.java | 2 +- .../PipelineConfigurationValidator.java | 2 +- .../dataprepper/parser/PipelineParser.java | 18 ++++++------ .../config/DataPrepperAppConfiguration.java | 2 +- .../parser/config/MetricsConfig.java | 2 +- .../config/PipelineParserConfiguration.java | 2 +- .../model/DataPrepperConfiguration.java | 2 +- .../parser/model/PipelineConfiguration.java | 8 +++--- .../parser/model/RoutedPluginSetting.java | 2 +- .../peerforwarder/LocalPeerForwarder.java | 4 +-- .../peerforwarder/PeerForwarder.java | 4 +-- .../peerforwarder/PeerForwarderAppConfig.java | 2 +- .../PeerForwarderClientFactory.java | 2 +- .../peerforwarder/PeerForwarderProvider.java | 6 ++-- .../PeerForwarderReceiveBuffer.java | 10 +++---- .../PeerForwardingProcessorDecorator.java | 8 +++--- .../peerforwarder/RemotePeerForwarder.java | 8 +++--- .../client/PeerForwarderClient.java | 6 ++-- .../AwsCloudMapPeerListProvider.java | 4 +-- .../discovery/DiscoveryMode.java | 2 +- .../discovery/DnsPeerListProvider.java | 4 +-- .../discovery/LocalPeerListProvider.java | 2 +- .../discovery/StaticPeerListProvider.java | 4 +-- ...rderPluginIdentificationKeysException.java | 2 +- ...supportedPeerForwarderPluginException.java | 2 +- .../peerforwarder/model/WireEvent.java | 2 +- .../server/PeerForwarderHttpService.java | 10 +++---- .../peerforwarder/server/ResponseHandler.java | 4 +-- .../dataprepper/pipeline/Pipeline.java | 10 +++---- .../pipeline/PipelineConnector.java | 8 +++--- .../dataprepper/pipeline/ProcessWorker.java | 8 +++--- .../DataPrepperServerConfiguration.java | 6 ++-- .../plugin/ClasspathPluginProvider.java | 2 +- .../plugin/DefaultPluginFactory.java | 8 +++--- .../plugin/PluginArgumentsContext.java | 10 +++---- .../plugin/PluginConfigurationConverter.java | 6 ++-- .../dataprepper/plugin/PluginCreator.java | 8 +++--- .../dataprepper/plugin/PluginProvider.java | 2 +- ...DataPrepperCoreAuthenticationProvider.java | 4 +-- .../plugins/MultiBufferDecorator.java | 6 ++-- ...DataPrepperCoreAuthenticationProvider.java | 2 +- .../dataprepper/DataPrepperTests.java | 2 +- .../dataprepper/TestDataProvider.java | 6 ++-- .../parser/PipelineParserTests.java | 8 +++--- .../DataPrepperAppConfigurationTest.java | 2 +- .../parser/config/MetricsConfigTest.java | 2 +- .../PipelineParserConfigurationTest.java | 2 +- .../model/PipelineConfigurationTests.java | 8 +++--- .../peerforwarder/LocalPeerForwarderTest.java | 4 +-- .../PeerForwarderAppConfigTest.java | 4 +-- .../PeerForwarderClientFactoryTest.java | 15 +++++----- .../PeerForwarderProviderTest.java | 6 ++-- .../PeerForwarderReceiveBufferTest.java | 6 ++-- .../PeerForwarder_ClientServerIT.java | 10 +++---- ...PeerForwardingProcessingDecoratorTest.java | 8 +++--- .../RemotePeerForwarderTest.java | 10 +++---- .../client/PeerForwarderClientTest.java | 10 +++---- ...sCloudMapPeerListProviderCreationTest.java | 4 +-- .../AwsCloudMapPeerListProviderTest.java | 2 +- .../DnsPeerListProviderCreationTest.java | 4 +-- .../discovery/DnsPeerListProviderTest.java | 6 ++-- .../StaticPeerListProviderCreationTest.java | 6 ++-- .../discovery/StaticPeerListProviderTest.java | 6 ++-- ...ortedPeerForwarderPluginExceptionTest.java | 2 +- .../server/PeerForwarderHttpServiceTest.java | 12 ++++---- .../server/ResponseHandlerTest.java | 8 +++--- .../pipeline/PipelineConnectorTest.java | 4 +-- .../dataprepper/pipeline/PipelineTests.java | 12 ++++---- .../pipeline/common/TestProcessor.java | 10 +++---- .../DataPrepperServerConfigurationTest.java | 6 ++-- .../plugin/ClasspathPluginProviderTest.java | 6 ++-- .../plugin/DefaultPluginFactoryIT.java | 4 +-- .../plugin/DefaultPluginFactoryTest.java | 6 ++-- .../plugin/PluginArgumentsContextTest.java | 10 +++---- .../PluginConfigurationConverterTest.java | 4 +-- .../dataprepper/plugin/PluginCreatorTest.java | 8 +++--- .../plugins/MultiBufferDecoratorTest.java | 12 ++++---- .../dataprepper/plugins/TestPlugin.java | 4 +-- .../plugins/TestSingleThreadSource.java | 10 +++---- .../dataprepper/plugins/TestSink.java | 6 ++-- .../dataprepper/plugins/TestSource.java | 8 +++--- .../ConditionalExpressionEvaluator.java | 6 ++-- .../expression/ParseTreeCoercionService.java | 2 +- .../expression/ParseTreeEvaluator.java | 2 +- .../ParseTreeEvaluatorListener.java | 2 +- .../ConditionalExpressionEvaluatorIT.java | 4 +-- .../ConditionalExpressionEvaluatorTest.java | 2 +- .../ParseTreeCoercionServiceTest.java | 2 +- .../ParseTreeEvaluatorListenerTest.java | 4 +-- .../expression/ParseTreeEvaluatorTest.java | 2 +- .../logstash/LogstashConfigConverter.java | 4 +-- ...bstractLogstashPluginAttributesMapper.java | 2 +- ...okLogstashPluginAttributeMapperHelper.java | 2 +- .../logstash/mapping/LogstashMapper.java | 6 ++-- .../LogstashPluginAttributesMapper.java | 2 +- .../mapping/LogstashPluginMapper.java | 2 +- .../mapping/mutate/AbstractConversion.java | 2 +- .../logstash/mapping/mutate/MutateMapper.java | 2 +- .../mapping/mutate/SubMutateAction.java | 2 +- .../logstash/LogstashConfigConverterIT.java | 2 +- ...actLogstashPluginAttributesMapperTest.java | 2 +- .../mapping/AttributesMapperCreatorTest.java | 2 +- ...CsvLogstashPluginAttributesMapperTest.java | 2 +- ...ateLogstashPluginAttributesMapperTest.java | 2 +- ...ultLogstashPluginAttributesMapperTest.java | 2 +- ...rokLogstashPluginAttributesMapperTest.java | 2 +- .../logstash/mapping/LogstashMapperTest.java | 2 +- .../mapping/LogstashPluginMapperTest.java | 2 +- .../OpenSearchPluginAttributesMapperTest.java | 2 +- .../logstash/mapping/TestDataProvider.java | 4 +-- .../processor/aggregate/AggregateAction.java | 2 +- .../aggregate/AggregateActionResponse.java | 2 +- .../AggregateActionSynchronizer.java | 4 +-- .../AggregateIdentificationKeysHasher.java | 2 +- .../aggregate/AggregateProcessor.java | 22 +++++++-------- .../aggregate/AggregateProcessorConfig.java | 2 +- .../actions/PutAllAggregateAction.java | 6 ++-- .../RemoveDuplicatesAggregateAction.java | 4 +-- .../AggregateActionResponseTest.java | 4 +-- .../AggregateActionSynchronizerTest.java | 4 +-- ...AggregateIdentificationKeysHasherTest.java | 4 +-- .../aggregate/AggregateProcessorIT.java | 14 +++++----- .../aggregate/AggregateProcessorTest.java | 16 +++++------ .../actions/PutAllAggregateActionTest.java | 4 +-- .../RemoveDuplicatesAggregateActionTest.java | 4 +-- .../GrpcBasicAuthenticationProvider.java | 4 +-- ...asicArmeriaHttpAuthenticationProvider.java | 4 +-- ...atedArmeriaHttpAuthenticationProvider.java | 2 +- ...thenticatedGrpcAuthenticationProvider.java | 2 +- .../buffer/blockingbuffer/BlockingBuffer.java | 14 +++++----- .../blockingbuffer/BlockingBufferTests.java | 8 +++--- .../plugins/prepper/NoOpPrepper.java | 8 +++--- .../plugins/prepper/StringPrepper.java | 14 +++++----- .../dataprepper/plugins/sink/FileSink.java | 10 +++---- .../dataprepper/plugins/sink/StdOutSink.java | 10 +++---- .../plugins/source/RandomStringSource.java | 12 ++++---- .../plugins/source/StdInSource.java | 14 +++++----- .../plugins/source/file/FileSource.java | 16 +++++------ .../plugins/buffer/TestBuffer.java | 12 ++++---- .../plugins/prepper/StringPrepperTests.java | 6 ++-- .../prepper/state/ProcessorStateTest.java | 2 +- .../plugins/sink/FileSinkTests.java | 6 ++-- .../plugins/sink/StdOutSinkTests.java | 6 ++-- .../source/RandomStringSourceTests.java | 4 +-- .../plugins/source/StdInSourceTests.java | 8 +++--- .../plugins/source/file/FileSourceTests.java | 14 +++++----- .../plugins/processor/csv/CsvProcessor.java | 14 +++++----- .../plugins/processor/csv/CsvProcessorIT.java | 6 ++-- .../processor/csv/CsvProcessorTest.java | 8 +++--- .../plugins/processor/date/DateProcessor.java | 14 +++++----- .../processor/date/DateProcessorTests.java | 8 +++--- .../processor/drop/DropEventsProcessor.java | 16 +++++------ .../drop/DropEventsWhenCondition.java | 4 +-- .../drop/HandleFailedEventsOption.java | 2 +- .../drop/DropEventsProcessorTests.java | 8 +++--- .../drop/DropEventsWhenConditionTest.java | 2 +- .../plugins/prepper/grok/GrokPrepper.java | 14 +++++----- .../prepper/grok/GrokPrepperConfig.java | 2 +- .../prepper/grok/GrokPrepperConfigTests.java | 2 +- .../plugins/prepper/grok/GrokPrepperIT.java | 6 ++-- .../prepper/grok/GrokPrepperTests.java | 10 +++---- .../plugins/source/loghttp/HTTPSource.java | 20 ++++++------- .../source/loghttp/HTTPSourceConfig.java | 2 +- .../source/loghttp/LogHTTPService.java | 10 +++---- .../loghttp/LogThrottlingRejectHandler.java | 2 +- .../loghttp/RequestExceptionHandler.java | 4 +-- .../source/loghttp/HTTPSourceTest.java | 18 ++++++------ .../source/loghttp/LogHTTPServiceTest.java | 8 +++--- .../LogThrottlingRejectHandlerTest.java | 2 +- .../loghttp/RequestExceptionHandlerTest.java | 4 +-- .../processor/keyvalue/KeyValueProcessor.java | 14 +++++----- .../keyvalue/KeyValueProcessorTests.java | 8 +++--- .../loggenerator/LogGeneratorSource.java | 20 ++++++------- .../LogGeneratorSourceConfig.java | 2 +- .../source/loggenerator/LogTypeGenerator.java | 2 +- .../CommonApacheLogTypeGenerator.java | 6 ++-- .../logtypes/VpcFlowLogTypeGenerator.java | 6 ++-- .../loggenerator/LogGeneratorSourceTest.java | 14 +++++----- .../prepper/state/MapDbPrepperState.java | 2 +- .../mutateevent/AddEntryProcessor.java | 14 +++++----- .../mutateevent/CopyValueProcessor.java | 14 +++++----- .../mutateevent/DeleteEntryProcessor.java | 14 +++++----- .../mutateevent/RenameKeyProcessor.java | 14 +++++----- .../mutateevent/AddEntryProcessorTests.java | 8 +++--- .../mutateevent/CopyValueProcessorTests.java | 8 +++--- .../DeleteEntryProcessorTests.java | 8 +++--- .../mutateevent/RenameKeyProcessorTests.java | 8 +++--- .../mutatestring/AbstractStringProcessor.java | 10 +++---- .../LowercaseStringProcessor.java | 10 +++---- .../mutatestring/SplitStringProcessor.java | 10 +++---- .../SubstituteStringProcessor.java | 10 +++---- .../mutatestring/TrimStringProcessor.java | 10 +++---- .../UppercaseStringProcessor.java | 10 +++---- .../LowercaseStringProcessorTests.java | 8 +++--- .../SplitStringProcessorTests.java | 8 +++--- .../SubstituteStringProcessorTests.java | 8 +++--- .../TrimStringProcessorTests.java | 8 +++--- .../UppercaseStringProcessorTests.java | 8 +++--- .../sink/opensearch/OpenSearchSinkIT.java | 14 +++++----- .../sink/opensearch/BulkRetryStrategy.java | 2 +- .../opensearch/ConnectionConfiguration.java | 2 +- .../sink/opensearch/OpenSearchSink.java | 12 ++++---- .../OpenSearchSinkConfiguration.java | 2 +- .../sink/opensearch/RetryConfiguration.java | 2 +- .../opensearch/index/IndexConfiguration.java | 2 +- .../opensearch/BulkRetryStrategyTests.java | 8 +++--- .../ConnectionConfigurationTests.java | 2 +- .../OpenSearchSinkConfigurationTests.java | 2 +- .../opensearch/RetryConfigurationTests.java | 2 +- .../index/IndexConfigurationTests.java | 2 +- .../otelmetrics/OTelMetricsProtoHelper.java | 8 +++--- .../otelmetrics/OTelMetricsRawProcessor.java | 28 +++++++++---------- .../otelmetrics/MetricsPluginGaugeTest.java | 6 ++-- .../MetricsPluginHistogramTest.java | 10 +++---- .../otelmetrics/MetricsPluginSumTest.java | 8 +++--- .../otelmetrics/MetricsPluginSummaryTest.java | 8 +++--- .../OTelMetricsProtoHelperTest.java | 2 +- .../otelmetrics/OTelMetricsGrpcService.java | 6 ++-- .../source/otelmetrics/OTelMetricsSource.java | 18 ++++++------ .../otelmetrics/OTelMetricsSourceConfig.java | 2 +- .../OTelMetricsGrpcServiceTest.java | 8 +++--- .../otelmetrics/OTelMetricsSourceTest.java | 10 +++---- .../OtelMetricsSourceConfigTests.java | 2 +- .../CertificateProviderFactoryTest.java | 2 +- .../plugins/otel/codec/OTelProtoCodec.java | 18 ++++++------ .../otel/codec/OTelProtoCodecTest.java | 16 +++++------ .../OTelTraceGroupProcessor.java | 16 +++++------ .../OTelTraceGroupProcessorConfig.java | 2 +- .../oteltracegroup/model/TraceGroup.java | 4 +-- .../OTelTraceGroupProcessorConfigTests.java | 2 +- .../OTelTraceGroupProcessorTests.java | 14 +++++----- .../oteltrace/OTelTraceRawProcessor.java | 14 +++++----- .../processor/oteltrace/model/SpanSet.java | 2 +- .../processor/oteltrace/model/TraceGroup.java | 4 +-- .../oteltrace/OTelTraceRawProcessorTest.java | 14 +++++----- .../oteltrace/OTelTraceGrpcService.java | 10 +++---- .../source/oteltrace/OTelTraceSource.java | 18 ++++++------ .../oteltrace/OTelTraceSourceConfig.java | 2 +- .../oteltrace/OTelTraceGrpcServiceTest.java | 12 ++++---- .../source/oteltrace/OTelTraceSourceTest.java | 10 +++---- .../oteltrace/OtelTraceSourceConfigTests.java | 2 +- .../CertificateProviderFactoryTest.java | 2 +- .../parsejson/ParseJsonProcessor.java | 16 +++++------ .../parsejson/ParseJsonProcessorTest.java | 8 +++--- .../prepper/peerforwarder/PeerForwarder.java | 14 +++++----- .../peerforwarder/PeerForwarderConfig.java | 2 +- .../peerforwarder/PeerForwarderUtils.java | 2 +- .../AwsCloudMapPeerListProvider.java | 4 +-- .../discovery/DiscoveryMode.java | 4 +-- .../discovery/DnsPeerListProvider.java | 4 +-- .../discovery/PeerListProviderFactory.java | 4 +-- .../discovery/StaticPeerListProvider.java | 4 +-- .../PeerForwarderConfigTest.java | 2 +- .../peerforwarder/PeerForwarderTest.java | 16 +++++------ .../AwsCloudMapPeerListProviderTest.java | 2 +- ...wsCloudMapPeerListProvider_CreateTest.java | 4 +-- .../discovery/DnsPeerListProviderTest.java | 8 +++--- .../DnsPeerListProvider_CreateTest.java | 4 +-- .../PeerListProviderFactoryTest.java | 4 +-- .../discovery/StaticPeerListProviderTest.java | 8 +++--- .../StaticPeerListProvider_CreateTest.java | 4 +-- .../plugins/source/CsvRecordsGenerator.java | 2 +- .../plugins/source/JsonRecordsGenerator.java | 2 +- .../NewlineDelimitedRecordsGenerator.java | 2 +- .../plugins/source/RecordsGenerator.java | 2 +- .../plugins/source/S3ObjectWorkerIT.java | 8 +++--- .../plugins/source/SqsWorkerIT.java | 2 +- .../plugins/source/BufferAccumulator.java | 4 +-- .../plugins/source/EventMetadataModifier.java | 2 +- .../plugins/source/S3ObjectWorker.java | 8 +++--- .../dataprepper/plugins/source/S3Service.java | 8 +++--- .../dataprepper/plugins/source/S3Source.java | 20 ++++++------- .../plugins/source/S3SourceConfig.java | 2 +- .../plugins/source/SqsService.java | 2 +- .../dataprepper/plugins/source/SqsWorker.java | 2 +- .../plugins/source/codec/Codec.java | 4 +-- .../plugins/source/codec/CsvCodec.java | 10 +++---- .../plugins/source/codec/JsonCodec.java | 10 +++---- .../source/codec/NewlineDelimitedCodec.java | 10 +++---- .../plugins/source/BufferAccumulatorTest.java | 4 +-- .../source/EventMetadataModifierTest.java | 2 +- .../plugins/source/S3ObjectWorkerTest.java | 8 +++--- .../plugins/source/S3SourceTest.java | 6 ++-- .../plugins/source/SqsWorkerTest.java | 2 +- .../plugins/source/codec/CsvCodecTest.java | 6 ++-- .../plugins/source/codec/JsonCodecTest.java | 6 ++-- .../codec/NewlineDelimitedCodecTest.java | 6 ++-- .../prepper/ServiceMapStatefulPrepper.java | 20 ++++++------- .../ServiceMapStatefulPrepperTest.java | 10 +++---- .../plugins/prepper/ServiceMapTestUtils.java | 14 +++++----- .../TracePeerForwarderProcessor.java | 16 +++++------ .../TracePeerForwarderProcessorTest.java | 6 ++-- .../trace/EndToEndRawSpanTest.java | 2 +- 393 files changed, 1122 insertions(+), 1123 deletions(-) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/metrics/MetricNames.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/metrics/PluginMetrics.java (96%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/CheckpointState.java (92%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/annotations/DataPrepperPlugin.java (78%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/annotations/DataPrepperPluginConstructor.java (94%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/annotations/SingleThread.java (90%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/buffer/AbstractBuffer.java (95%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/buffer/Buffer.java (92%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/buffer/SizeOverflowException.java (87%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/ConditionalRoute.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PipelineDescription.java (91%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PipelineModel.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PipelinesDataFlowModel.java (94%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PluginModel.java (99%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PluginSetting.java (99%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/SinkModel.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/event/DefaultEventMetadata.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/event/Event.java (81%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/event/EventMetadata.java (94%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/event/EventType.java (94%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/event/JacksonEvent.java (99%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/log/JacksonLog.java (87%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/log/Log.java (76%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/Bucket.java (91%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/DefaultBucket.java (93%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/DefaultQuantile.java (92%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/Gauge.java (86%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/Histogram.java (96%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonGauge.java (95%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonHistogram.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonMetric.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonSum.java (97%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonSummary.java (97%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/Metric.java (95%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/ParameterValidator.java (95%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/Quantile.java (89%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/Sum.java (92%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/metric/Summary.java (94%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/peerforwarder/RequiresPeerForwarding.java (64%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/InvalidPluginConfigurationException.java (88%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/InvalidPluginDefinitionException.java (92%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/NoPluginFoundException.java (87%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/PluginFactory.java (93%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/PluginInvocationException.java (89%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/processor/AbstractProcessor.java (89%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/processor/Processor.java (92%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/record/Record.java (94%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/record/RecordMetadata.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/sink/AbstractSink.java (82%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/sink/Sink.java (85%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/source/Source.java (78%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/DefaultLink.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/DefaultSpanEvent.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/DefaultTraceGroupFields.java (97%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/JacksonSpan.java (98%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/Link.java (95%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/Span.java (92%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/SpanEvent.java (94%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/model/trace/TraceGroupFields.java (93%) rename data-prepper-api/src/main/java/{com/amazon => org/opensearch}/dataprepper/processor/state/ProcessorState.java (97%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/metrics/MetricsTestUtil.java (97%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/metrics/PluginMetricsTest.java (97%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/CheckpointStateTest.java (92%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/buffer/AbstractBufferTest.java (97%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/ConditionalRouteTest.java (98%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PipelineModelTest.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PipelinesDataFlowModelTest.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PluginModelTests.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/PluginSettingsTests.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/configuration/SinkModelTest.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/event/DefaultEventMetadataTest.java (98%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/event/EventTypeTest.java (95%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/event/JacksonEventTest.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/event/TestObject.java (89%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/log/JacksonLogTest.java (86%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonGaugeTest.java (97%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonHistogramTest.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonSumTest.java (98%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/metric/JacksonSummaryTest.java (99%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java (93%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/InvalidPluginDefinitionExceptionTest.java (97%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/NoPluginFoundExceptionTest.java (93%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/plugin/PluginInvocationExceptionTest.java (95%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/processor/AbstractProcessorTest.java (94%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/record/RecordTests.java (96%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/sink/AbstractSinkTest.java (90%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/trace/DefaultLinkTest.java (98%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/trace/DefaultSpanEventTest.java (98%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/trace/DefaultTraceGroupFieldsTest.java (97%) rename data-prepper-api/src/test/java/{com/amazon => org/opensearch}/dataprepper/model/trace/JacksonSpanTest.java (99%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/conditional_route_invalid_just_value.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/conditional_route_invalid_non_string.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/conditional_route_invalid_object.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/conditional_route_list.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/conditional_route_single.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/plugin_model_empty.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/plugin_model_not_present.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/plugin_model_null.yaml (100%) rename data-prepper-api/src/test/resources/{com/amazon => org/opensearch}/dataprepper/model/configuration/sink_plugin.yaml (100%) diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/expression/ExpressionEvaluator.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/expression/ExpressionEvaluator.java index 87c96596fd..dd19e78821 100644 --- a/data-prepper-api/src/main/java/org/opensearch/dataprepper/expression/ExpressionEvaluator.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/expression/ExpressionEvaluator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; /** * @since 1.3 diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/metrics/MetricNames.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/metrics/MetricNames.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/metrics/MetricNames.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/metrics/MetricNames.java index 3e95817340..3f54ba2cc7 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/metrics/MetricNames.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/metrics/MetricNames.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.metrics; +package org.opensearch.dataprepper.metrics; public class MetricNames { private MetricNames() {} diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/metrics/PluginMetrics.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/metrics/PluginMetrics.java similarity index 96% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/metrics/PluginMetrics.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/metrics/PluginMetrics.java index 8d56637e7a..9a90ff1dc1 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/metrics/PluginMetrics.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/metrics/PluginMetrics.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.metrics; +package org.opensearch.dataprepper.metrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import java.util.StringJoiner; import java.util.function.ToDoubleFunction; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/CheckpointState.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/CheckpointState.java similarity index 92% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/CheckpointState.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/CheckpointState.java index 6c1d25a609..08313a270e 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/CheckpointState.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/CheckpointState.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model; +package org.opensearch.dataprepper.model; /** * CheckpointState keeps track of a summary of records processed by a data-prepper worker thread. diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/DataPrepperPlugin.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/DataPrepperPlugin.java similarity index 78% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/DataPrepperPlugin.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/DataPrepperPlugin.java index 15ad5fc82f..4131a1d7f9 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/DataPrepperPlugin.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/DataPrepperPlugin.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.annotations; +package org.opensearch.dataprepper.model.annotations; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -15,10 +15,10 @@ /** * Annotates a Data Prepper plugin. This can be a pipeline component such - * as {@link com.amazon.dataprepper.model.source.Source}, - * {@link com.amazon.dataprepper.model.buffer.Buffer}, - * {@link com.amazon.dataprepper.model.processor.Processor}, or - * {@link com.amazon.dataprepper.model.sink.Sink}. It can also be another + * as {@link org.opensearch.dataprepper.model.source.Source}, + * {@link org.opensearch.dataprepper.model.buffer.Buffer}, + * {@link org.opensearch.dataprepper.model.processor.Processor}, or + * {@link org.opensearch.dataprepper.model.sink.Sink}. It can also be another * plugin-supported class. *

* The value provided in the {@link #name()} attribute determines the name of diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/DataPrepperPluginConstructor.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/DataPrepperPluginConstructor.java similarity index 94% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/DataPrepperPluginConstructor.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/DataPrepperPluginConstructor.java index 8906d4c84d..380ee6a12e 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/DataPrepperPluginConstructor.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/DataPrepperPluginConstructor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.annotations; +package org.opensearch.dataprepper.model.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/SingleThread.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/SingleThread.java similarity index 90% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/SingleThread.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/SingleThread.java index d5650499c4..21f0311872 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/annotations/SingleThread.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/SingleThread.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.annotations; +package org.opensearch.dataprepper.model.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/AbstractBuffer.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/AbstractBuffer.java similarity index 95% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/AbstractBuffer.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/AbstractBuffer.java index e9a3f12d4c..4e9d8a6f24 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/AbstractBuffer.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/AbstractBuffer.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.buffer; +package org.opensearch.dataprepper.model.buffer; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Timer; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/Buffer.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/Buffer.java similarity index 92% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/Buffer.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/Buffer.java index 361c286598..911a41fdce 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/Buffer.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/Buffer.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.buffer; +package org.opensearch.dataprepper.model.buffer; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; import java.util.Collection; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/SizeOverflowException.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/SizeOverflowException.java similarity index 87% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/SizeOverflowException.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/SizeOverflowException.java index 653a03e964..ee5bbc4929 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/buffer/SizeOverflowException.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/SizeOverflowException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.buffer; +package org.opensearch.dataprepper.model.buffer; /** * Thrown to indicate the size of the data to be written into the {@link Buffer} is diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/ConditionalRoute.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/ConditionalRoute.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/ConditionalRoute.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/ConditionalRoute.java index 59c2f21fe3..9dbc7bcc26 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/ConditionalRoute.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/ConditionalRoute.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.core.JacksonException; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineDescription.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelineDescription.java similarity index 91% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineDescription.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelineDescription.java index aac8bf5d67..2be9b5e82c 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineDescription.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelineDescription.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; /** * Model that should be provided to plugins to provide certain details about the pipeline they belong to diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineModel.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelineModel.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineModel.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelineModel.java index fe40946906..f21188bbf8 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelineModel.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelineModel.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModel.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelinesDataFlowModel.java similarity index 94% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModel.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelinesDataFlowModel.java index 9ca93e5c4c..b597928dc6 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModel.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PipelinesDataFlowModel.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PluginModel.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PluginModel.java similarity index 99% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PluginModel.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PluginModel.java index 9901d59890..d8b2b41054 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PluginModel.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PluginModel.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PluginSetting.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PluginSetting.java similarity index 99% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PluginSetting.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PluginSetting.java index 61a4320744..0d298f4e87 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/PluginSetting.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/PluginSetting.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import java.util.Collections; import java.util.List; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/SinkModel.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/SinkModel.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/SinkModel.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/SinkModel.java index ee2f04a40a..fe01b4730c 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/configuration/SinkModel.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/configuration/SinkModel.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/DefaultEventMetadata.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/DefaultEventMetadata.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/DefaultEventMetadata.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/DefaultEventMetadata.java index e3a3c92c4a..a1a98da355 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/DefaultEventMetadata.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/DefaultEventMetadata.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import com.google.common.collect.ImmutableMap; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/Event.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/Event.java similarity index 81% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/Event.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/Event.java index ca525cd338..f717c53fb4 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/Event.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/Event.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import java.util.List; import java.util.Map; @@ -12,10 +12,10 @@ * All data flowing through Data Prepper will be represented as events. An event is the base representation of data. * An event can be defined as a collection of key-value pairs and the following interface represents the contract with this model. *

- * Data Prepper will be migrating away from the original use of {@link com.amazon.dataprepper.model.record.Record}s. - * Internal interfaces for {@link com.amazon.dataprepper.model.processor.Processor}, {@link com.amazon.dataprepper.model.buffer.Buffer}, - * {@link com.amazon.dataprepper.model.sink.Sink} and {@link com.amazon.dataprepper.model.source.Source} will be extended to support - * the new internal model. The use of {@link com.amazon.dataprepper.model.record.Record}s will be deprecated in 2.0. + * Data Prepper will be migrating away from the original use of {@link org.opensearch.dataprepper.model.record.Record}s. + * Internal interfaces for {@link org.opensearch.dataprepper.model.processor.Processor}, {@link org.opensearch.dataprepper.model.buffer.Buffer}, + * {@link org.opensearch.dataprepper.model.sink.Sink} and {@link org.opensearch.dataprepper.model.source.Source} will be extended to support + * the new internal model. The use of {@link org.opensearch.dataprepper.model.record.Record}s will be deprecated in 2.0. *

* @since 1.2 */ diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/EventMetadata.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/EventMetadata.java similarity index 94% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/EventMetadata.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/EventMetadata.java index 100b73bb86..e05bbace56 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/EventMetadata.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/EventMetadata.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import java.time.Instant; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/EventType.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/EventType.java similarity index 94% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/EventType.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/EventType.java index e6fb325137..f616ffd68e 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/EventType.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/EventType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import java.util.Arrays; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/JacksonEvent.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java similarity index 99% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/JacksonEvent.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java index 26ab6570e3..2d9321c08c 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/event/JacksonEvent.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import com.fasterxml.jackson.core.JsonPointer; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/log/JacksonLog.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/JacksonLog.java similarity index 87% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/log/JacksonLog.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/JacksonLog.java index 1c20931d6c..d05ebd90e4 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/log/JacksonLog.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/JacksonLog.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.log; +package org.opensearch.dataprepper.model.log; -import com.amazon.dataprepper.model.event.EventType; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.event.JacksonEvent; import static com.google.common.base.Preconditions.checkArgument; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/log/Log.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/Log.java similarity index 76% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/log/Log.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/Log.java index 393cc4e7d0..bc442ed5c7 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/log/Log.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/Log.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.log; +package org.opensearch.dataprepper.model.log; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; /** * A log event in Data Prepper represents a single log line. A log event does not require any specific keys allowing this event type to diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Bucket.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Bucket.java similarity index 91% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Bucket.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Bucket.java index 547cf3f91e..6d044bf5ce 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Bucket.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Bucket.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; /** * Represents a bucket of a {@link Histogram}. diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/DefaultBucket.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/DefaultBucket.java similarity index 93% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/DefaultBucket.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/DefaultBucket.java index 9aa6525a97..c572b95aa4 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/DefaultBucket.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/DefaultBucket.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; /** * The default implementation of {@link Bucket}, measurement within a {@link Histogram} diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/DefaultQuantile.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/DefaultQuantile.java similarity index 92% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/DefaultQuantile.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/DefaultQuantile.java index e7f5e918af..650327860e 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/DefaultQuantile.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/DefaultQuantile.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; /** * The default implementation of {@link Quantile}, measurement within a {@link Summary} diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Gauge.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Gauge.java similarity index 86% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Gauge.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Gauge.java index 91946c425b..0b03c84b56 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Gauge.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Gauge.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; /** * A gauge event in Data Prepper represents a metric event. diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Histogram.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Histogram.java similarity index 96% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Histogram.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Histogram.java index e7855aecca..a71f5338e6 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Histogram.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Histogram.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; import java.util.List; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonGauge.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonGauge.java similarity index 95% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonGauge.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonGauge.java index 69f2957108..3eba02fd8d 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonGauge.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonGauge.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; -import com.amazon.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.event.EventType; import java.util.ArrayList; import java.util.Arrays; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonHistogram.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonHistogram.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonHistogram.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonHistogram.java index 019adb932c..3ccc810fbf 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonHistogram.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonHistogram.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; -import com.amazon.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.event.EventType; import java.util.ArrayList; import java.util.Arrays; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonMetric.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonMetric.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonMetric.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonMetric.java index cb9dce8f52..775d4e7976 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonMetric.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonMetric.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.JacksonEvent; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonSum.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonSum.java similarity index 97% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonSum.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonSum.java index fa8dc5fb0a..da4b8a9eef 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonSum.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonSum.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; -import com.amazon.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.event.EventType; import java.util.ArrayList; import java.util.Arrays; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonSummary.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonSummary.java similarity index 97% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonSummary.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonSummary.java index 16f3b906fe..7928794e08 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/JacksonSummary.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonSummary.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; -import com.amazon.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.event.EventType; import java.util.Arrays; import java.util.Collections; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Metric.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Metric.java similarity index 95% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Metric.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Metric.java index 1a4515493d..f4a885148c 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Metric.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Metric.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/ParameterValidator.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/ParameterValidator.java similarity index 95% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/ParameterValidator.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/ParameterValidator.java index 1ab0c6e991..0fd00ae7a1 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/ParameterValidator.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/ParameterValidator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; import java.util.List; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Quantile.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Quantile.java similarity index 89% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Quantile.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Quantile.java index 47e7e1ff07..229e10566d 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Quantile.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Quantile.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; /** * Represents a quantile of a {@link Summary}. diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Sum.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Sum.java similarity index 92% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Sum.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Sum.java index 52c29bfe1e..df8640d88f 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Sum.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Sum.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; /** * A sum event in Data Prepper representing a metric event. diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Summary.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Summary.java similarity index 94% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Summary.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Summary.java index 3b0390ff8e..5e72164ba2 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/metric/Summary.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/Summary.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; import java.util.List; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/peerforwarder/RequiresPeerForwarding.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/peerforwarder/RequiresPeerForwarding.java similarity index 64% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/peerforwarder/RequiresPeerForwarding.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/peerforwarder/RequiresPeerForwarding.java index af83ce0d33..2e46e89cdb 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/peerforwarder/RequiresPeerForwarding.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/peerforwarder/RequiresPeerForwarding.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.peerforwarder; +package org.opensearch.dataprepper.model.peerforwarder; import java.util.Collection; /** - * An interface that a {@link com.amazon.dataprepper.model.processor.Processor} will implement which must have peer forwarding prior to processing events. + * An interface that a {@link org.opensearch.dataprepper.model.processor.Processor} will implement which must have peer forwarding prior to processing events. * @since 2.0 */ public interface RequiresPeerForwarding { diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/InvalidPluginConfigurationException.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationException.java similarity index 88% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/InvalidPluginConfigurationException.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationException.java index 354aff721e..312260fa95 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/InvalidPluginConfigurationException.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; /** * This exception is thrown when a plugin in configured with an invalid diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/InvalidPluginDefinitionException.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/InvalidPluginDefinitionException.java similarity index 92% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/InvalidPluginDefinitionException.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/InvalidPluginDefinitionException.java index f46bbd0ca2..c1a26b295e 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/InvalidPluginDefinitionException.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/InvalidPluginDefinitionException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; /** * This exception indicates that a plugin has an invalid definition. This diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/NoPluginFoundException.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/NoPluginFoundException.java similarity index 87% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/NoPluginFoundException.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/NoPluginFoundException.java index 30a10acb1e..92ebc8caf7 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/NoPluginFoundException.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/NoPluginFoundException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; /** * An exception representing that Data Prepper was unable to diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/PluginFactory.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/PluginFactory.java similarity index 93% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/PluginFactory.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/PluginFactory.java index 36073205f2..87f0abfc30 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/PluginFactory.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/PluginFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import java.util.List; import java.util.function.Function; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/PluginInvocationException.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/PluginInvocationException.java similarity index 89% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/PluginInvocationException.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/PluginInvocationException.java index 8f914c95c2..e2e61e23a8 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/plugin/PluginInvocationException.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/PluginInvocationException.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; /** * An exception thrown when a plugin class invocation fails. This may happen diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/processor/AbstractProcessor.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/processor/AbstractProcessor.java similarity index 89% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/processor/AbstractProcessor.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/processor/AbstractProcessor.java index 9687758004..704ee15038 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/processor/AbstractProcessor.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/processor/AbstractProcessor.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.processor; +package org.opensearch.dataprepper.model.processor; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Timer; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/processor/Processor.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/processor/Processor.java similarity index 92% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/processor/Processor.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/processor/Processor.java index 4d94ae47c2..551aed3d01 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/processor/Processor.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/processor/Processor.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.processor; +package org.opensearch.dataprepper.model.processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/Record.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/record/Record.java similarity index 94% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/Record.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/record/Record.java index d8edbac277..a5bb6e8704 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/Record.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/record/Record.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.record; +package org.opensearch.dataprepper.model.record; /** * Data Prepper record - represents the fundamental data unit of TI, the idea is to encapsulate different diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/RecordMetadata.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/record/RecordMetadata.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/RecordMetadata.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/record/RecordMetadata.java index 782c463251..706c3f7cc4 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/record/RecordMetadata.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/record/RecordMetadata.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.record; +package org.opensearch.dataprepper.model.record; import com.google.common.collect.ImmutableMap; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/sink/AbstractSink.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/sink/AbstractSink.java similarity index 82% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/sink/AbstractSink.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/sink/AbstractSink.java index e61ed6b044..9f9762ed12 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/sink/AbstractSink.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/sink/AbstractSink.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.sink; +package org.opensearch.dataprepper.model.sink; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Timer; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/sink/Sink.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/sink/Sink.java similarity index 85% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/sink/Sink.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/sink/Sink.java index 54d5549c3f..a88d037a28 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/sink/Sink.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/sink/Sink.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.sink; +package org.opensearch.dataprepper.model.sink; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/source/Source.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/source/Source.java similarity index 78% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/source/Source.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/source/Source.java index 5ea36d1d13..b5d994c063 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/source/Source.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/source/Source.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.source; +package org.opensearch.dataprepper.model.source; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; /** * Data Prepper source interface. Source acts as receiver of the events that flow diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultLink.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultLink.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultLink.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultLink.java index 24500f1d65..b674e29706 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultLink.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultLink.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; import java.util.HashMap; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultSpanEvent.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultSpanEvent.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultSpanEvent.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultSpanEvent.java index ff27f3b52c..7973b92389 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultSpanEvent.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultSpanEvent.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; import java.util.HashMap; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultTraceGroupFields.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultTraceGroupFields.java similarity index 97% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultTraceGroupFields.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultTraceGroupFields.java index 64c16a352e..57e47174e4 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/DefaultTraceGroupFields.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/DefaultTraceGroupFields.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; /** * The default implementation of {@link TraceGroupFields}, the attributes associated with an entire trace. diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/JacksonSpan.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/JacksonSpan.java similarity index 98% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/JacksonSpan.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/JacksonSpan.java index b36d47e97e..e84fc39a2e 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/JacksonSpan.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/JacksonSpan.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; -import com.amazon.dataprepper.model.event.EventType; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.event.JacksonEvent; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/Link.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/Link.java similarity index 95% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/Link.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/Link.java index 6db794457c..527712eaf3 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/Link.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/Link.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/Span.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/Span.java similarity index 92% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/Span.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/Span.java index 3d189a094d..1bbed6a467 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/Span.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/Span.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import java.util.List; import java.util.Map; @@ -127,7 +127,7 @@ public interface Span extends Event { Long getDurationInNanos(); /** - * Gets the {@link com.amazon.dataprepper.model.trace.TraceGroupFields} for this span. + * Gets the {@link org.opensearch.dataprepper.model.trace.TraceGroupFields} for this span. * @return traceGroupFields * @since 1.2 */ @@ -148,7 +148,7 @@ public interface Span extends Event { void setTraceGroup(String traceGroup); /** - * Sets the {@link com.amazon.dataprepper.model.trace.TraceGroupFields} for this span. + * Sets the {@link org.opensearch.dataprepper.model.trace.TraceGroupFields} for this span. * @param traceGroupFields trace group related fields * @since 1.3 */ diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/SpanEvent.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/SpanEvent.java similarity index 94% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/SpanEvent.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/SpanEvent.java index e3c6dd704c..432bfe271c 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/SpanEvent.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/SpanEvent.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; import java.util.Map; diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/TraceGroupFields.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/TraceGroupFields.java similarity index 93% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/TraceGroupFields.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/TraceGroupFields.java index 1842375b37..3703881c98 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/model/trace/TraceGroupFields.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/TraceGroupFields.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; /** * Represents the attributes associated with an entire trace. diff --git a/data-prepper-api/src/main/java/com/amazon/dataprepper/processor/state/ProcessorState.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/processor/state/ProcessorState.java similarity index 97% rename from data-prepper-api/src/main/java/com/amazon/dataprepper/processor/state/ProcessorState.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/processor/state/ProcessorState.java index 99a28acb08..cc984dddbc 100644 --- a/data-prepper-api/src/main/java/com/amazon/dataprepper/processor/state/ProcessorState.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/processor/state/ProcessorState.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.processor.state; +package org.opensearch.dataprepper.processor.state; import java.util.List; import java.util.Map; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/metrics/MetricsTestUtil.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/metrics/MetricsTestUtil.java similarity index 97% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/metrics/MetricsTestUtil.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/metrics/MetricsTestUtil.java index fc29b30c32..7963f5d3f6 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/metrics/MetricsTestUtil.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/metrics/MetricsTestUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.metrics; +package org.opensearch.dataprepper.metrics; import java.util.List; import java.util.stream.Collectors; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/metrics/PluginMetricsTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/metrics/PluginMetricsTest.java similarity index 97% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/metrics/PluginMetricsTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/metrics/PluginMetricsTest.java index f0c4f75772..6a7ba3dd32 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/metrics/PluginMetricsTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/metrics/PluginMetricsTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.metrics; +package org.opensearch.dataprepper.metrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Metrics; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/CheckpointStateTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/CheckpointStateTest.java similarity index 92% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/CheckpointStateTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/CheckpointStateTest.java index 8bc7bbc072..e1e08ad8e6 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/CheckpointStateTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/CheckpointStateTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model; +package org.opensearch.dataprepper.model; import org.junit.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/buffer/AbstractBufferTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/buffer/AbstractBufferTest.java similarity index 97% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/buffer/AbstractBufferTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/buffer/AbstractBufferTest.java index 3054ab4550..0cd76ea083 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/buffer/AbstractBufferTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/buffer/AbstractBufferTest.java @@ -3,13 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.buffer; +package org.opensearch.dataprepper.model.buffer; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.model.record.Record; +import io.micrometer.core.instrument.Measurement; +import io.micrometer.core.instrument.Statistic; +import org.junit.Assert; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; import java.util.AbstractMap; import java.util.ArrayList; @@ -24,11 +29,6 @@ import java.util.StringJoiner; import java.util.UUID; import java.util.concurrent.TimeoutException; -import io.micrometer.core.instrument.Measurement; -import io.micrometer.core.instrument.Statistic; -import org.junit.Assert; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; public class AbstractBufferTest { private static final String BUFFER_NAME = "testBuffer"; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/ConditionalRouteTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/ConditionalRouteTest.java similarity index 98% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/ConditionalRouteTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/ConditionalRouteTest.java index 7f128b05e2..7253f1b46d 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/ConditionalRouteTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/ConditionalRouteTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelineModelTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PipelineModelTest.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelineModelTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PipelineModelTest.java index 8876b01711..e6a53b3496 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelineModelTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PipelineModelTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModelTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PipelinesDataFlowModelTest.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModelTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PipelinesDataFlowModelTest.java index 11e4f81d68..046238f258 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PipelinesDataFlowModelTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PipelinesDataFlowModelTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PluginModelTests.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PluginModelTests.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PluginModelTests.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PluginModelTests.java index c50458b6d3..69501944ec 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PluginModelTests.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PluginModelTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonParseException; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PluginSettingsTests.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PluginSettingsTests.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PluginSettingsTests.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PluginSettingsTests.java index 8eae00ac05..85cd5a6bd6 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/PluginSettingsTests.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/PluginSettingsTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.google.common.collect.ImmutableMap; import org.junit.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/SinkModelTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/SinkModelTest.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/SinkModelTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/SinkModelTest.java index 02aea788a6..24f6ac6f76 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/configuration/SinkModelTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/configuration/SinkModelTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.configuration; +package org.opensearch.dataprepper.model.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/DefaultEventMetadataTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/DefaultEventMetadataTest.java similarity index 98% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/DefaultEventMetadataTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/DefaultEventMetadataTest.java index 7b92eb6453..aed6bc5a90 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/DefaultEventMetadataTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/DefaultEventMetadataTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/EventTypeTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/EventTypeTest.java similarity index 95% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/EventTypeTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/EventTypeTest.java index 12fcb14e01..a26c13d5cc 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/EventTypeTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/EventTypeTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/JacksonEventTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/JacksonEventTest.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/JacksonEventTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/JacksonEventTest.java index ac8a58cd61..97615889eb 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/JacksonEventTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/JacksonEventTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/TestObject.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/TestObject.java similarity index 89% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/TestObject.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/TestObject.java index 44355a343e..793bc761ec 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/event/TestObject.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/TestObject.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.event; +package org.opensearch.dataprepper.model.event; public class TestObject { private String field1; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/log/JacksonLogTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/log/JacksonLogTest.java similarity index 86% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/log/JacksonLogTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/log/JacksonLogTest.java index f4b37013ee..26e2fde71a 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/log/JacksonLogTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/log/JacksonLogTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.log; +package org.opensearch.dataprepper.model.log; -import com.amazon.dataprepper.model.event.DefaultEventMetadata; -import com.amazon.dataprepper.model.event.EventMetadata; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.DefaultEventMetadata; +import org.opensearch.dataprepper.model.event.EventMetadata; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonGaugeTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonGaugeTest.java similarity index 97% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonGaugeTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonGaugeTest.java index f226f2e6a1..cedb55edba 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonGaugeTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonGaugeTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; -import com.amazon.dataprepper.model.event.TestObject; +import org.opensearch.dataprepper.model.event.TestObject; import com.google.common.collect.ImmutableMap; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonHistogramTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonHistogramTest.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonHistogramTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonHistogramTest.java index 008b4463d0..75ca77d322 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonHistogramTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonHistogramTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonSumTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonSumTest.java similarity index 98% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonSumTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonSumTest.java index 799ef0822b..fdc9c6536b 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonSumTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonSumTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonSummaryTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonSummaryTest.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonSummaryTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonSummaryTest.java index d0ea19ae62..e5d1e04dce 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/metric/JacksonSummaryTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/metric/JacksonSummaryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.metric; +package org.opensearch.dataprepper.model.metric; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java similarity index 93% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java index c26c121127..9877e1b166 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/InvalidPluginDefinitionExceptionTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/InvalidPluginDefinitionExceptionTest.java similarity index 97% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/InvalidPluginDefinitionExceptionTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/InvalidPluginDefinitionExceptionTest.java index 24802fe87d..7a423e608c 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/InvalidPluginDefinitionExceptionTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/InvalidPluginDefinitionExceptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/NoPluginFoundExceptionTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/NoPluginFoundExceptionTest.java similarity index 93% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/NoPluginFoundExceptionTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/NoPluginFoundExceptionTest.java index f5ef418d70..d7070b28e3 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/NoPluginFoundExceptionTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/NoPluginFoundExceptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/PluginInvocationExceptionTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/PluginInvocationExceptionTest.java similarity index 95% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/PluginInvocationExceptionTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/PluginInvocationExceptionTest.java index afbc8005e7..067c9cd74f 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/plugin/PluginInvocationExceptionTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/PluginInvocationExceptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.plugin; +package org.opensearch.dataprepper.model.plugin; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/processor/AbstractProcessorTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/processor/AbstractProcessorTest.java similarity index 94% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/processor/AbstractProcessorTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/processor/AbstractProcessorTest.java index 30fe975f0b..fc8beadd9f 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/processor/AbstractProcessorTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/processor/AbstractProcessorTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.processor; +package org.opensearch.dataprepper.model.processor; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Measurement; import io.micrometer.core.instrument.Statistic; import org.junit.jupiter.api.Assertions; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/record/RecordTests.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/record/RecordTests.java similarity index 96% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/record/RecordTests.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/record/RecordTests.java index e7fb791e90..c2d1d7daa6 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/record/RecordTests.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/record/RecordTests.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.record; +package org.opensearch.dataprepper.model.record; import org.junit.Test; import java.util.HashMap; import java.util.Map; -import static com.amazon.dataprepper.model.record.RecordMetadata.RECORD_TYPE; +import static org.opensearch.dataprepper.model.record.RecordMetadata.RECORD_TYPE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/sink/AbstractSinkTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/sink/AbstractSinkTest.java similarity index 90% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/sink/AbstractSinkTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/sink/AbstractSinkTest.java index 90c810c442..cb46c68287 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/sink/AbstractSinkTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/sink/AbstractSinkTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.sink; +package org.opensearch.dataprepper.model.sink; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.model.record.Record; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultLinkTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultLinkTest.java similarity index 98% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultLinkTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultLinkTest.java index 336053ccf0..fe013dd859 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultLinkTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultLinkTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; -import com.amazon.dataprepper.model.event.TestObject; +import org.opensearch.dataprepper.model.event.TestObject; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultSpanEventTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultSpanEventTest.java similarity index 98% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultSpanEventTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultSpanEventTest.java index d4c9daf15f..cc8749b002 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultSpanEventTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultSpanEventTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; -import com.amazon.dataprepper.model.event.TestObject; +import org.opensearch.dataprepper.model.event.TestObject; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultTraceGroupFieldsTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultTraceGroupFieldsTest.java similarity index 97% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultTraceGroupFieldsTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultTraceGroupFieldsTest.java index 776454ef37..983ade1e19 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/DefaultTraceGroupFieldsTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/DefaultTraceGroupFieldsTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; -import com.amazon.dataprepper.model.event.TestObject; +import org.opensearch.dataprepper.model.event.TestObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/JacksonSpanTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/JacksonSpanTest.java similarity index 99% rename from data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/JacksonSpanTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/JacksonSpanTest.java index 497d266655..0c21b2bace 100644 --- a/data-prepper-api/src/test/java/com/amazon/dataprepper/model/trace/JacksonSpanTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/JacksonSpanTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.amazon.dataprepper.model.trace; +package org.opensearch.dataprepper.model.trace; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.JacksonEvent; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_invalid_just_value.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_invalid_just_value.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_invalid_just_value.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_invalid_just_value.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_invalid_non_string.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_invalid_non_string.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_invalid_non_string.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_invalid_non_string.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_invalid_object.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_invalid_object.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_invalid_object.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_invalid_object.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_list.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_list.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_list.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_list.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_single.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_single.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/conditional_route_single.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/conditional_route_single.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/plugin_model_empty.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/plugin_model_empty.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/plugin_model_empty.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/plugin_model_empty.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/plugin_model_not_present.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/plugin_model_not_present.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/plugin_model_not_present.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/plugin_model_not_present.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/plugin_model_null.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/plugin_model_null.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/plugin_model_null.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/plugin_model_null.yaml diff --git a/data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/sink_plugin.yaml b/data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/sink_plugin.yaml similarity index 100% rename from data-prepper-api/src/test/resources/com/amazon/dataprepper/model/configuration/sink_plugin.yaml rename to data-prepper-api/src/test/resources/org/opensearch/dataprepper/model/configuration/sink_plugin.yaml 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 aa9ef84f44..6ae8237891 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 @@ -5,7 +5,7 @@ package org.opensearch.dataprepper; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.parser.PipelineParser; import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderServer; import org.opensearch.dataprepper.pipeline.Pipeline; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineConfigurationValidator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineConfigurationValidator.java index 7bb0f6e0d9..d008101797 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineConfigurationValidator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineConfigurationValidator.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.parser; -import com.amazon.dataprepper.model.configuration.PluginSetting; import org.apache.commons.collections.CollectionUtils; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.opensearch.dataprepper.parser.model.PipelineConfiguration; import org.opensearch.dataprepper.parser.model.RoutedPluginSetting; import org.slf4j.Logger; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineParser.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineParser.java index 7fb7d598d2..72f084fec9 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineParser.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/PipelineParser.java @@ -5,15 +5,15 @@ package org.opensearch.dataprepper.parser; -import com.amazon.dataprepper.model.annotations.SingleThread; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PipelinesDataFlowModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.sink.Sink; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.annotations.SingleThread; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.source.Source; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; 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/parser/config/DataPrepperAppConfiguration.java index 2d0034de39..a3b0707aef 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/parser/config/DataPrepperAppConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.parser.config; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.parser.DataPrepperDurationDeserializer; import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; import com.fasterxml.jackson.databind.module.SimpleModule; 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/parser/config/MetricsConfig.java index 0d2e66942b..804a36ff45 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/parser/config/MetricsConfig.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import static org.opensearch.dataprepper.DataPrepper.getServiceNameForMetrics; -import static com.amazon.dataprepper.metrics.MetricNames.SERVICE_NAME; +import static org.opensearch.dataprepper.metrics.MetricNames.SERVICE_NAME; @Configuration public class MetricsConfig { 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/parser/config/PipelineParserConfiguration.java index c814f91775..b5f9a95f8b 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/parser/config/PipelineParserConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.parser.config; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; import org.opensearch.dataprepper.parser.PipelineParser; import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider; 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/parser/model/DataPrepperConfiguration.java index cacb82793b..c65764c490 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/parser/model/DataPrepperConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.parser.model; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/PipelineConfiguration.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/PipelineConfiguration.java index 930aad17ef..67554df633 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/PipelineConfiguration.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/PipelineConfiguration.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.parser.model; -import com.amazon.dataprepper.model.configuration.PipelineModel; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.configuration.SinkModel; +import org.opensearch.dataprepper.model.configuration.PipelineModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.SinkModel; import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer; import java.util.Collections; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/RoutedPluginSetting.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/RoutedPluginSetting.java index b6eda2f0d4..85240bdc4e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/RoutedPluginSetting.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/parser/model/RoutedPluginSetting.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.parser.model; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import java.util.Collection; import java.util.Map; 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/peerforwarder/LocalPeerForwarder.java index 4206b60d9e..87d1514671 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarder.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarder.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.Collections; 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/peerforwarder/PeerForwarder.java index f866001ccf..4cef5d774c 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; 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/peerforwarder/PeerForwarderAppConfig.java index e7c9349059..83bd235984 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfig.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfig.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.linecorp.armeria.server.Server; +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; 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/peerforwarder/PeerForwarderClientFactory.java index 26db686deb..73600469a2 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactory.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; +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; 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/peerforwarder/PeerForwarderProvider.java index fc8b9a7be1..4402b9737e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProvider.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.peerforwarder.client.PeerForwarderClient; import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; 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/peerforwarder/PeerForwarderReceiveBuffer.java index ddbec3442e..dec7ae0c62 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBuffer.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBuffer.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.model.record.Record; import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +26,7 @@ import static java.lang.String.format; /** - * Buffer created for each stateful processor which implements {@link com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding} + * Buffer created for each stateful processor which implements {@link org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding} * interface. * * @since 2.0 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/peerforwarder/PeerForwardingProcessorDecorator.java index 00c51ba9f4..9f2d8d3552 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessorDecorator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessorDecorator.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +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; 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/peerforwarder/RemotePeerForwarder.java index dd651f7a96..ad7636cbfc 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarder.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarder.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +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 com.linecorp.armeria.common.AggregatedHttpResponse; 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/peerforwarder/client/PeerForwarderClient.java index d134b77457..e0fc0d6624 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/peerforwarder/client/PeerForwarderClient.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.peerforwarder.client; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.linecorp.armeria.client.UnprocessedRequestException; 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/peerforwarder/discovery/AwsCloudMapPeerListProvider.java index 3d2a583347..c8c3f79641 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/peerforwarder/discovery/AwsCloudMapPeerListProvider.java @@ -5,14 +5,14 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.DynamicEndpointGroup; import com.linecorp.armeria.client.retry.Backoff; import com.linecorp.armeria.common.CommonPools; import io.netty.channel.EventLoop; import io.netty.util.concurrent.ScheduledFuture; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; 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/peerforwarder/discovery/DiscoveryMode.java index d43a951310..30b165bf7f 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/peerforwarder/discovery/DiscoveryMode.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import java.util.Objects; 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/peerforwarder/discovery/DnsPeerListProvider.java index b97d35d563..85d73d643c 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/peerforwarder/discovery/DnsPeerListProvider.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import com.google.common.base.Preconditions; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; +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/peerforwarder/discovery/LocalPeerListProvider.java index 0f1d188915..735c5cda07 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/peerforwarder/discovery/LocalPeerListProvider.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; import com.linecorp.armeria.client.Endpoint; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import java.util.Collections; 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/peerforwarder/discovery/StaticPeerListProvider.java index 63fa469c44..4825538e1e 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/peerforwarder/discovery/StaticPeerListProvider.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import com.google.common.base.Preconditions; import com.linecorp.armeria.client.Endpoint; +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/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java index 2e7b532fe1..6fc939f5ef 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/peerforwarder/exception/EmptyPeerForwarderPluginIdentificationKeysException.java @@ -7,7 +7,7 @@ /** * This exception is thrown when processor which implements - * {@link com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding} interface returns an empty set of identification keys. + * {@link org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding} interface returns an empty set of identification keys. * * @since 2.0 */ 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/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java index 7d119530ad..b70f3be277 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/peerforwarder/exception/UnsupportedPeerForwarderPluginException.java @@ -7,7 +7,7 @@ /** * This exception is thrown when processor which doesn't implement - * {@link com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding} interface is passed to + * {@link org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding} interface is passed to * {@link org.opensearch.dataprepper.peerforwarder.PeerForwardingProcessorDecorator}. * * @since 2.0 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/peerforwarder/model/WireEvent.java index e23a87a574..c824cbff10 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/peerforwarder/model/WireEvent.java @@ -11,7 +11,7 @@ import java.util.Map; /** - * A class for {@link com.amazon.dataprepper.model.event.EventType} and JSON representation of event data used by {@link PeerForwarder} + * A class for {@link org.opensearch.dataprepper.model.event.EventType} and JSON representation of event data used by {@link PeerForwarder} * * @since 2.0 */ 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/peerforwarder/server/PeerForwarderHttpService.java index 429c519f65..0b5824dca3 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/peerforwarder/server/PeerForwarderHttpService.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.peerforwarder.server; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.DefaultEventMetadata; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +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.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.linecorp.armeria.common.AggregatedHttpRequest; 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/peerforwarder/server/ResponseHandler.java index 3dc8f23716..e48808d731 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/peerforwarder/server/ResponseHandler.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.peerforwarder.server; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; import com.linecorp.armeria.common.HttpResponse; import com.linecorp.armeria.common.HttpStatus; import com.linecorp.armeria.common.MediaType; 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/pipeline/Pipeline.java index 8a272306be..482d231049 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/Pipeline.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/Pipeline.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.pipeline; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.sink.Sink; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.source.Source; import com.google.common.base.Preconditions; import org.opensearch.dataprepper.pipeline.common.PipelineThreadFactory; import org.opensearch.dataprepper.pipeline.common.PipelineThreadPoolExecutor; 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/pipeline/PipelineConnector.java index f153ad0545..6fb839dd8b 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineConnector.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/PipelineConnector.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.pipeline; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.sink.Sink; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.source.Source; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/pipeline/ProcessWorker.java index f3324f0c8b..968c6817a5 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/ProcessWorker.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/ProcessWorker.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.pipeline; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.buffer.Buffer; +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.slf4j.Logger; 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/pipeline/server/config/DataPrepperServerConfiguration.java index 1aee643811..1fac061ea9 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/pipeline/server/config/DataPrepperServerConfiguration.java @@ -6,9 +6,9 @@ package org.opensearch.dataprepper.pipeline.server.config; import org.opensearch.dataprepper.DataPrepper; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.PluginFactory; +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.server.DataPrepperCoreAuthenticationProvider; import org.opensearch.dataprepper.pipeline.server.HttpServerProvider; import org.opensearch.dataprepper.pipeline.server.ListPipelinesHandler; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/ClasspathPluginProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/ClasspathPluginProvider.java index 0d06d44846..cba9ebe799 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/ClasspathPluginProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/ClasspathPluginProvider.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; import org.reflections.Reflections; import org.reflections.util.ConfigurationBuilder; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/DefaultPluginFactory.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/DefaultPluginFactory.java index f688ffb943..db9cd7f8da 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/DefaultPluginFactory.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/DefaultPluginFactory.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.NoPluginFoundException; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.NoPluginFoundException; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import javax.inject.Inject; import javax.inject.Named; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginArgumentsContext.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginArgumentsContext.java index 764ba25f00..4bf15c191f 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginArgumentsContext.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginArgumentsContext.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PipelineDescription; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.InvalidPluginDefinitionException; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PipelineDescription; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.InvalidPluginDefinitionException; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverter.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverter.java index efdba54c2a..72a68f2c2e 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverter.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverter.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.InvalidPluginConfigurationException; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginCreator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginCreator.java index b94280000f..9c59e02148 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginCreator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginCreator.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.InvalidPluginDefinitionException; -import com.amazon.dataprepper.model.plugin.PluginInvocationException; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.InvalidPluginDefinitionException; +import org.opensearch.dataprepper.model.plugin.PluginInvocationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginProvider.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginProvider.java index 5071969581..dd15176569 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginProvider.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugin/PluginProvider.java @@ -20,7 +20,7 @@ public interface PluginProvider { * Finds the Java class for a specific plugin. * * @param pluginType The type of plugin which is being supported. - * e.g. {@link com.amazon.dataprepper.model.sink.Sink}. + * e.g. {@link org.opensearch.dataprepper.model.sink.Sink}. * @param pluginName The name of the plugin * @param The type * @return An {@link Optional} Java class for this plugin 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 37659a5bb6..0a76e939d4 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 @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; +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 com.sun.net.httpserver.Authenticator; diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/MultiBufferDecorator.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/MultiBufferDecorator.java index abca16ff85..22cdf2a519 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/MultiBufferDecorator.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/plugins/MultiBufferDecorator.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.List; 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 a2424a8fb9..3a8b71466f 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 @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; import org.opensearch.dataprepper.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 0b42127fee..70c8d8175f 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 @@ -5,7 +5,7 @@ package org.opensearch.dataprepper; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.parser.PipelineParser; import org.opensearch.dataprepper.peerforwarder.server.PeerForwarderServer; import org.opensearch.dataprepper.pipeline.Pipeline; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/TestDataProvider.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/TestDataProvider.java index 0606a8ab64..1d9d6144ce 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/TestDataProvider.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/TestDataProvider.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.configuration.SinkModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.SinkModel; import org.opensearch.dataprepper.parser.model.PipelineConfiguration; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/PipelineParserTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/PipelineParserTests.java index 3076b24211..1332660bf3 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/PipelineParserTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/PipelineParserTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.parser; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; 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/parser/config/DataPrepperAppConfigurationTest.java index 7dd14ea1d6..6d3402d29b 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/parser/config/DataPrepperAppConfigurationTest.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.parser.config; import org.opensearch.dataprepper.TestDataProvider; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; 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/parser/config/MetricsConfigTest.java index 4e417aab9d..fd9ed7038a 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/parser/config/MetricsConfigTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.BeforeAll; import org.opensearch.dataprepper.DataPrepper; import org.opensearch.dataprepper.meter.EMFLoggingMeterRegistry; -import com.amazon.dataprepper.metrics.MetricNames; +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; 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/parser/config/PipelineParserConfigurationTest.java index 6d9ffdc99a..6b3b4c335b 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/parser/config/PipelineParserConfigurationTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.parser.config; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; 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/parser/model/PipelineConfigurationTests.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/PipelineConfigurationTests.java index b732936797..8bf1107c1a 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/PipelineConfigurationTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/parser/model/PipelineConfigurationTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.parser.model; -import com.amazon.dataprepper.model.configuration.PipelineModel; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.configuration.SinkModel; +import org.opensearch.dataprepper.model.configuration.PipelineModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.SinkModel; import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; 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/peerforwarder/LocalPeerForwarderTest.java index 3b6ac93e5a..e533b8067f 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/LocalPeerForwarderTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import org.mockito.Mock; 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/peerforwarder/PeerForwarderAppConfigTest.java index d8dfde54d4..5c5944d0e2 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderAppConfigTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration; import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; import static org.hamcrest.MatcherAssert.assertThat; 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/peerforwarder/PeerForwarderClientFactoryTest.java index 5c4f83102b..ed357c0a73 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactoryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderClientFactoryTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.hamcrest.core.IsInstanceOf; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -15,18 +15,17 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; - -import java.util.Collections; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.hamcrest.MatcherAssert.assertThat; -import org.hamcrest.core.IsInstanceOf; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.peerforwarder.certificate.CertificateProviderFactory; import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; import org.opensearch.dataprepper.plugins.certificate.model.Certificate; +import java.util.Collections; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProviderTest.java index fe182e0d06..6d81c37bf8 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderProviderTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +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; 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/peerforwarder/PeerForwarderReceiveBufferTest.java index 1ea9b00de9..d4f06b196d 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBufferTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderReceiveBufferTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; 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/peerforwarder/PeerForwarder_ClientServerIT.java index 7d91d31212..8225f77bf4 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/peerforwarder/PeerForwarder_ClientServerIT.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +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 com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.linecorp.armeria.client.UnprocessedRequestException; 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/peerforwarder/PeerForwardingProcessingDecoratorTest.java index 4d8b3d259b..b8b40affcd 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessingDecoratorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwardingProcessingDecoratorTest.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; 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/peerforwarder/RemotePeerForwarderTest.java index 4d3410d0cf..c4f975f3f8 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/peerforwarder/RemotePeerForwarderTest.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.peerforwarder; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.log.JacksonLog; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +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.model.record.Record; import com.linecorp.armeria.common.AggregatedHttpResponse; import com.linecorp.armeria.common.HttpStatus; import io.micrometer.core.instrument.Counter; 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/peerforwarder/client/PeerForwarderClientTest.java index 5ad55c4cea..c08be5582c 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/peerforwarder/client/PeerForwarderClientTest.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.peerforwarder.client; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.log.JacksonLog; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +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.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; 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/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java index 9ef1d9264e..dd08d5a6c8 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/peerforwarder/discovery/AwsCloudMapPeerListProviderCreationTest.java @@ -5,8 +5,6 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -14,6 +12,8 @@ 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.metrics.PluginMetrics; +import org.opensearch.dataprepper.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/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java index c0e8c0e1d3..0c7c23093a 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/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.retry.Backoff; import org.apache.commons.lang3.RandomStringUtils; 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/peerforwarder/discovery/DnsPeerListProviderCreationTest.java index 726916858f..c3c8d13763 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/peerforwarder/discovery/DnsPeerListProviderCreationTest.java @@ -5,8 +5,6 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroupBuilder; import org.junit.jupiter.api.BeforeEach; @@ -16,6 +14,8 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.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/peerforwarder/discovery/DnsPeerListProviderTest.java index 4845f33eaf..1083eea9f0 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/peerforwarder/discovery/DnsPeerListProviderTest.java @@ -5,9 +5,6 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.metrics.PluginMetrics; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; import io.micrometer.core.instrument.Measurement; @@ -16,6 +13,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.peerforwarder.HashRing; import java.util.Arrays; 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/peerforwarder/discovery/StaticPeerListProviderCreationTest.java index a54470f379..50758e3767 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/peerforwarder/discovery/StaticPeerListProviderCreationTest.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration; import java.util.Arrays; import java.util.Collections; @@ -16,8 +16,8 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; 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/peerforwarder/discovery/StaticPeerListProviderTest.java index 18a88c41f4..14bc836e36 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/peerforwarder/discovery/StaticPeerListProviderTest.java @@ -5,15 +5,15 @@ package org.opensearch.dataprepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.metrics.PluginMetrics; import io.micrometer.core.instrument.Measurement; 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.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.peerforwarder.HashRing; import java.util.Arrays; 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/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java index e679221cf4..27ce1259ac 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/peerforwarder/exception/UnsupportedPeerForwarderPluginExceptionTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.peerforwarder.exception; -import com.amazon.dataprepper.model.plugin.InvalidPluginConfigurationException; +import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; 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/peerforwarder/server/PeerForwarderHttpServiceTest.java index dd0657105a..eda2910a60 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/peerforwarder/server/PeerForwarderHttpServiceTest.java @@ -5,12 +5,12 @@ package org.opensearch.dataprepper.peerforwarder.server; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.log.JacksonLog; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; +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.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; 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/peerforwarder/server/ResponseHandlerTest.java index afd4e64c4a..0b78bc8abf 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/peerforwarder/server/ResponseHandlerTest.java @@ -5,8 +5,6 @@ package org.opensearch.dataprepper.peerforwarder.server; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; import com.fasterxml.jackson.core.JsonProcessingException; import com.linecorp.armeria.common.AggregatedHttpResponse; import com.linecorp.armeria.common.HttpResponse; @@ -18,19 +16,21 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; 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.REQUEST_TIMEOUTS; 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; @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/pipeline/PipelineConnectorTest.java index f8b532ff9a..fc6f9d4c2e 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineConnectorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineConnectorTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.pipeline; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; 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/pipeline/PipelineTests.java index 024a75ae23..da73cdf23d 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineTests.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineTests.java @@ -5,12 +5,12 @@ package org.opensearch.dataprepper.pipeline; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.sink.Sink; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.source.Source; import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; 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/pipeline/common/TestProcessor.java index 8b32fd80cd..19c8ea525b 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/pipeline/common/TestProcessor.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.pipeline.common; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.SingleThread; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.SingleThread; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; 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/pipeline/server/config/DataPrepperServerConfigurationTest.java index 64745db6b3..ad3a8a9dfb 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/pipeline/server/config/DataPrepperServerConfigurationTest.java @@ -6,9 +6,9 @@ package org.opensearch.dataprepper.pipeline.server.config; import org.opensearch.dataprepper.DataPrepper; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.PluginFactory; +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.server.DataPrepperCoreAuthenticationProvider; import org.opensearch.dataprepper.pipeline.server.HttpServerProvider; import org.opensearch.dataprepper.pipeline.server.ListPipelinesHandler; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/ClasspathPluginProviderTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/ClasspathPluginProviderTest.java index c857c802e5..0293fd4b93 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/ClasspathPluginProviderTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/ClasspathPluginProviderTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.sink.Sink; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.source.Source; import org.opensearch.dataprepper.plugins.TestSink; import org.opensearch.dataprepper.plugins.TestSource; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java index 81530ad369..61716c2fbe 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.InvalidPluginConfigurationException; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException; import org.opensearch.dataprepper.plugins.TestPlugin; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryTest.java index a62c249b48..ce606e54f9 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.NoPluginFoundException; -import com.amazon.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.NoPluginFoundException; +import org.opensearch.dataprepper.model.sink.Sink; import org.opensearch.dataprepper.plugins.TestSink; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginArgumentsContextTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginArgumentsContextTest.java index bc79fbca40..2c975e25e7 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginArgumentsContextTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginArgumentsContextTest.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PipelineDescription; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.InvalidPluginDefinitionException; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PipelineDescription; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.InvalidPluginDefinitionException; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverterTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverterTest.java index b4fb5c66da..5d5591f686 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverterTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginConfigurationConverterTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.InvalidPluginConfigurationException; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException; import jakarta.validation.ConstraintViolation; import jakarta.validation.Path; import jakarta.validation.Validator; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginCreatorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginCreatorTest.java index 4aea6a0ed7..a8a84ecebd 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginCreatorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugin/PluginCreatorTest.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.InvalidPluginDefinitionException; -import com.amazon.dataprepper.model.plugin.PluginInvocationException; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.plugin.InvalidPluginDefinitionException; +import org.opensearch.dataprepper.model.plugin.PluginInvocationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/MultiBufferDecoratorTest.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/MultiBufferDecoratorTest.java index a632c2a2a8..3ceda2e08e 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/MultiBufferDecoratorTest.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/MultiBufferDecoratorTest.java @@ -5,28 +5,28 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.record.Record; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; import java.util.AbstractMap; -import java.util.concurrent.TimeoutException; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Random; +import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestPlugin.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestPlugin.java index 929812de31..ec98156d79 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestPlugin.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestPlugin.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; import org.opensearch.dataprepper.plugin.TestPluggableInterface; import org.opensearch.dataprepper.plugin.TestPluginConfiguration; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSingleThreadSource.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSingleThreadSource.java index 100be835af..b73d3422a0 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSingleThreadSource.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSingleThreadSource.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.SingleThread; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.SingleThread; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; @SingleThread @DataPrepperPlugin(name = "test_sink_updated", pluginType = Source.class) diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSink.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSink.java index 062e6e56ed..34195f37ee 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSink.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSink.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.sink.Sink; import java.util.ArrayList; import java.util.Collection; diff --git a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSource.java b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSource.java index e9e2284bb1..b10a5b786b 100644 --- a/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSource.java +++ b/data-prepper-core/src/test/java/org/opensearch/dataprepper/plugins/TestSource.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; import java.util.Iterator; import java.util.List; diff --git a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluator.java b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluator.java index 27b983438c..6ad880e07f 100644 --- a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluator.java +++ b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.antlr.v4.runtime.tree.ParseTree; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; @@ -14,8 +14,8 @@ import javax.inject.Named; /** - * Public class that {@link com.amazon.dataprepper.model.processor.Processor}, - * {@link com.amazon.dataprepper.model.sink.Sink} and data-prepper-core objects can use to evaluate statements. + * Public class that {@link org.opensearch.dataprepper.model.processor.Processor}, + * {@link org.opensearch.dataprepper.model.sink.Sink} and data-prepper-core objects can use to evaluate statements. */ @Named @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) diff --git a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java index 235f55cc9c..35b009a8e0 100644 --- a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java +++ b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.antlr.v4.runtime.tree.TerminalNode; import org.opensearch.dataprepper.expression.antlr.DataPrepperExpressionParser; diff --git a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluator.java b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluator.java index db71d4d0df..01ab31bdf8 100644 --- a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluator.java +++ b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.slf4j.Logger; diff --git a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListener.java b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListener.java index a5bc2e5223..255178083c 100644 --- a/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListener.java +++ b/data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListener.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.ErrorNode; diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorIT.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorIT.java index e986ec0ecd..f6f86de8bf 100644 --- a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorIT.java +++ b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorIT.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorTest.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorTest.java index 987034fc50..ae0db9df7d 100644 --- a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorTest.java +++ b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ConditionalExpressionEvaluatorTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.antlr.v4.runtime.tree.ParseTree; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java index 410c59042e..e63ffb33a7 100644 --- a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java +++ b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.antlr.v4.runtime.Token; diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListenerTest.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListenerTest.java index 43d9bc705e..da68c43792 100644 --- a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListenerTest.java +++ b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorListenerTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.antlr.v4.runtime.tree.ErrorNode; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; diff --git a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorTest.java b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorTest.java index e0b6152bdc..f32efffd81 100644 --- a/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorTest.java +++ b/data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeEvaluatorTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.expression; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/LogstashConfigConverter.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/LogstashConfigConverter.java index f7ff034cf4..7a07fb17a5 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/LogstashConfigConverter.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/LogstashConfigConverter.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.logstash; -import com.amazon.dataprepper.model.configuration.PipelineModel; -import com.amazon.dataprepper.model.configuration.PipelinesDataFlowModel; +import org.opensearch.dataprepper.model.configuration.PipelineModel; +import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapper.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapper.java index 2747c6df2c..c7b1d6408d 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapper.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapper.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributeMapperHelper.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributeMapperHelper.java index 8b4d1863ed..a42756e298 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributeMapperHelper.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributeMapperHelper.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; import java.util.Map; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapper.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapper.java index f9724cd349..3e9f709bc3 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapper.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapper.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PipelineModel; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.SinkModel; +import org.opensearch.dataprepper.model.configuration.PipelineModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.SinkModel; import org.opensearch.dataprepper.logstash.exception.LogstashMappingException; import org.opensearch.dataprepper.logstash.model.LogstashConfiguration; import org.opensearch.dataprepper.logstash.model.LogstashPlugin; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginAttributesMapper.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginAttributesMapper.java index 52c8a13b6c..24cdcbabc2 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginAttributesMapper.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginAttributesMapper.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; import java.util.List; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapper.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapper.java index efe3c00243..c237245d16 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapper.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapper.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.opensearch.dataprepper.logstash.exception.LogstashMappingException; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/AbstractConversion.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/AbstractConversion.java index 169fea87bf..8be81d63f6 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/AbstractConversion.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/AbstractConversion.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping.mutate; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.logstash.mapping.NestedSyntaxConverter; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/MutateMapper.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/MutateMapper.java index ca83153945..8fa1422436 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/MutateMapper.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/MutateMapper.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping.mutate; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.logstash.mapping.LogstashAttributesMappings; import org.opensearch.dataprepper.logstash.mapping.LogstashPluginAttributesMapper; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; diff --git a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/SubMutateAction.java b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/SubMutateAction.java index 7cc074544c..9c931827a3 100644 --- a/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/SubMutateAction.java +++ b/data-prepper-logstash-configuration/src/main/java/org/opensearch/dataprepper/logstash/mapping/mutate/SubMutateAction.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping.mutate; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; public interface SubMutateAction { diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/LogstashConfigConverterIT.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/LogstashConfigConverterIT.java index e7cb521060..740b05d86a 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/LogstashConfigConverterIT.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/LogstashConfigConverterIT.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash; -import com.amazon.dataprepper.model.configuration.PipelinesDataFlowModel; +import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapperTest.java index ccea04c192..180a7d3fd3 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AbstractLogstashPluginAttributesMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AttributesMapperCreatorTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AttributesMapperCreatorTest.java index 22fef91f97..4756be46e7 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AttributesMapperCreatorTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/AttributesMapperCreatorTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/CsvLogstashPluginAttributesMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/CsvLogstashPluginAttributesMapperTest.java index 6bb51aa587..5a4b814a2f 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/CsvLogstashPluginAttributesMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/CsvLogstashPluginAttributesMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DateLogstashPluginAttributesMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DateLogstashPluginAttributesMapperTest.java index 63835a955d..82230f15dc 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DateLogstashPluginAttributesMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DateLogstashPluginAttributesMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.plugins.processor.date.DateProcessorConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DefaultLogstashPluginAttributesMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DefaultLogstashPluginAttributesMapperTest.java index 861dc1001c..784832211d 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DefaultLogstashPluginAttributesMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/DefaultLogstashPluginAttributesMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributesMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributesMapperTest.java index 485a10250c..a31040ecff 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributesMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/GrokLogstashPluginAttributesMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.logstash.model.LogstashAttribute; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapperTest.java index 73a44cd23d..8f38f145b7 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PipelineModel; +import org.opensearch.dataprepper.model.configuration.PipelineModel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.logstash.exception.LogstashMappingException; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapperTest.java index f60e233156..1d4eda489a 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/LogstashPluginMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.logstash.exception.LogstashMappingException; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/OpenSearchPluginAttributesMapperTest.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/OpenSearchPluginAttributesMapperTest.java index d5b19bfbc0..5ae1d4fcfb 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/OpenSearchPluginAttributesMapperTest.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/OpenSearchPluginAttributesMapperTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/TestDataProvider.java b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/TestDataProvider.java index c026307a9b..ff3271cb26 100644 --- a/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/TestDataProvider.java +++ b/data-prepper-logstash-configuration/src/test/java/org/opensearch/dataprepper/logstash/mapping/TestDataProvider.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.logstash.mapping; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.SinkModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.SinkModel; import org.opensearch.dataprepper.logstash.model.LogstashConfiguration; import org.opensearch.dataprepper.logstash.model.LogstashPlugin; import org.opensearch.dataprepper.logstash.model.LogstashPluginType; diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateAction.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateAction.java index 3d9e08632a..f1e5399d2b 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateAction.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateAction.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import java.util.Optional; diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponse.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponse.java index 0f0695b7c3..ba3006f96d 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponse.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponse.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; /** * Model class to be returned in {@link AggregateAction}. Contains the Event to be processed, which is null if no Event should be processed. diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizer.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizer.java index b7482ba99b..35b10d1f2b 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizer.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizer.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; import io.micrometer.core.instrument.Counter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasher.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasher.java index 52c346d679..c5423268ae 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasher.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasher.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import java.util.HashMap; import java.util.List; diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessor.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessor.java index 230f704dd5..12567ceb45 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessor.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessor.java @@ -5,17 +5,17 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; import java.util.Collection; diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorConfig.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorConfig.java index 4db83681bd..94a9b74253 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorConfig.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorConfig.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateAction.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateAction.java index f3174833a5..03d766214e 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateAction.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateAction.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.processor.aggregate.actions; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionInput; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionResponse; diff --git a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateAction.java b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateAction.java index d1cd993354..3d364eb0f2 100644 --- a/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateAction.java +++ b/data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateAction.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.aggregate.actions; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionInput; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionResponse; diff --git a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponseTest.java b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponseTest.java index dccfa8cccc..e77fd4c1fa 100644 --- a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponseTest.java +++ b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionResponseTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizerTest.java b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizerTest.java index 12d3046872..c0d5fb3fcb 100644 --- a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizerTest.java +++ b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateActionSynchronizerTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; import io.micrometer.core.instrument.Counter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasherTest.java b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasherTest.java index 3bd99f933a..ccc8f293e0 100644 --- a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasherTest.java +++ b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateIdentificationKeysHasherTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorIT.java b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorIT.java index 424bf88446..79975e1910 100644 --- a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorIT.java +++ b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorIT.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorTest.java b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorTest.java index e2e7cf8cb5..9695d56eaf 100644 --- a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorTest.java +++ b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorTest.java @@ -5,14 +5,14 @@ package org.opensearch.dataprepper.plugins.processor.aggregate; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Timer; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateActionTest.java b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateActionTest.java index 3eebb0b69d..44805ef6e5 100644 --- a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateActionTest.java +++ b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/PutAllAggregateActionTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.aggregate.actions; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction; diff --git a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateActionTest.java b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateActionTest.java index fd1dae6543..804d8c2e7a 100644 --- a/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateActionTest.java +++ b/data-prepper-plugins/aggregate-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/aggregate/actions/RemoveDuplicatesAggregateActionTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.aggregate.actions; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction; diff --git a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/GrpcBasicAuthenticationProvider.java b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/GrpcBasicAuthenticationProvider.java index e4bd0d48c2..e5836ca776 100644 --- a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/GrpcBasicAuthenticationProvider.java +++ b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/GrpcBasicAuthenticationProvider.java @@ -7,8 +7,8 @@ import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider; import org.opensearch.dataprepper.armeria.authentication.HttpBasicAuthenticationConfig; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; import com.linecorp.armeria.server.HttpService; import com.linecorp.armeria.server.auth.AuthService; import io.grpc.Metadata; diff --git a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicArmeriaHttpAuthenticationProvider.java b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicArmeriaHttpAuthenticationProvider.java index 5c58c22c8c..551d42bead 100644 --- a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicArmeriaHttpAuthenticationProvider.java +++ b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/HttpBasicArmeriaHttpAuthenticationProvider.java @@ -7,8 +7,8 @@ import org.opensearch.dataprepper.armeria.authentication.ArmeriaHttpAuthenticationProvider; import org.opensearch.dataprepper.armeria.authentication.HttpBasicAuthenticationConfig; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; import com.linecorp.armeria.server.HttpService; import com.linecorp.armeria.server.auth.AuthService; diff --git a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedArmeriaHttpAuthenticationProvider.java b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedArmeriaHttpAuthenticationProvider.java index 26966ff532..c9469a70f8 100644 --- a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedArmeriaHttpAuthenticationProvider.java +++ b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedArmeriaHttpAuthenticationProvider.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.plugins; import org.opensearch.dataprepper.armeria.authentication.ArmeriaHttpAuthenticationProvider; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; /** * The plugin to use for unauthenticated access to Armeria servers. It diff --git a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedGrpcAuthenticationProvider.java b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedGrpcAuthenticationProvider.java index ef268a6240..1c7567475d 100644 --- a/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedGrpcAuthenticationProvider.java +++ b/data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/plugins/UnauthenticatedGrpcAuthenticationProvider.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.plugins; import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; import io.grpc.Metadata; import io.grpc.ServerCall; import io.grpc.ServerCallHandler; diff --git a/data-prepper-plugins/blocking-buffer/src/main/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBuffer.java b/data-prepper-plugins/blocking-buffer/src/main/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBuffer.java index 7fafa67595..bb73648a04 100644 --- a/data-prepper-plugins/blocking-buffer/src/main/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBuffer.java +++ b/data-prepper-plugins/blocking-buffer/src/main/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBuffer.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.buffer.blockingbuffer; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.buffer.AbstractBuffer; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.buffer.AbstractBuffer; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/blocking-buffer/src/test/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBufferTests.java b/data-prepper-plugins/blocking-buffer/src/test/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBufferTests.java index 3746085038..5d3d449c67 100644 --- a/data-prepper-plugins/blocking-buffer/src/test/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBufferTests.java +++ b/data-prepper-plugins/blocking-buffer/src/test/java/org/opensearch/dataprepper/plugins/buffer/blockingbuffer/BlockingBufferTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.buffer.blockingbuffer; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/NoOpPrepper.java b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/NoOpPrepper.java index 358e23a80a..dbad9b86fd 100644 --- a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/NoOpPrepper.java +++ b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/NoOpPrepper.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.prepper; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; diff --git a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/StringPrepper.java b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/StringPrepper.java index fc938f7631..3e413553eb 100644 --- a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/StringPrepper.java +++ b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/prepper/StringPrepper.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.prepper; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/FileSink.java b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/FileSink.java index 92bbf5e73e..dc628c9944 100644 --- a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/FileSink.java +++ b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/FileSink.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.sink; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.sink.Sink; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/StdOutSink.java b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/StdOutSink.java index 0541706000..5c10cd2db9 100644 --- a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/StdOutSink.java +++ b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/sink/StdOutSink.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.sink; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.sink.Sink; import java.util.Collection; diff --git a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/RandomStringSource.java b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/RandomStringSource.java index 36567a38b3..085baf365e 100644 --- a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/RandomStringSource.java +++ b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/RandomStringSource.java @@ -5,12 +5,12 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.buffer.Buffer; +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.source.Source; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/StdInSource.java b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/StdInSource.java index b3365cfec2..bac92a988a 100644 --- a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/StdInSource.java +++ b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/StdInSource.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +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.source.Source; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/file/FileSource.java b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/file/FileSource.java index a3b661acd2..bce8751dfc 100644 --- a/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/file/FileSource.java +++ b/data-prepper-plugins/common/src/main/java/org/opensearch/dataprepper/plugins/source/file/FileSource.java @@ -5,14 +5,14 @@ package org.opensearch.dataprepper.plugins.source.file; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/buffer/TestBuffer.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/buffer/TestBuffer.java index 45836b2a3d..0e4377d903 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/buffer/TestBuffer.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/buffer/TestBuffer.java @@ -5,12 +5,12 @@ package org.opensearch.dataprepper.plugins.buffer; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/StringPrepperTests.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/StringPrepperTests.java index 386c164a66..dd20aed52e 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/StringPrepperTests.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/StringPrepperTests.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.prepper; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/state/ProcessorStateTest.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/state/ProcessorStateTest.java index 15f5c25d88..58cc6e1397 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/state/ProcessorStateTest.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/prepper/state/ProcessorStateTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.prepper.state; -import com.amazon.dataprepper.processor.state.ProcessorState; +import org.opensearch.dataprepper.processor.state.ProcessorState; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/FileSinkTests.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/FileSinkTests.java index 6ae49b8afa..16c457eb59 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/FileSinkTests.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/FileSinkTests.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.sink; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Assert; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/StdOutSinkTests.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/StdOutSinkTests.java index f536a4d8d6..db8bd20b83 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/StdOutSinkTests.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/sink/StdOutSinkTests.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.sink; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/RandomStringSourceTests.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/RandomStringSourceTests.java index 6ae782be6b..c12c52a9bf 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/RandomStringSourceTests.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/RandomStringSourceTests.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.buffer.TestBuffer; import org.junit.Test; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/StdInSourceTests.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/StdInSourceTests.java index b64231206b..bbfd617ffc 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/StdInSourceTests.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/StdInSourceTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.buffer.TestBuffer; import org.junit.After; import org.junit.Before; diff --git a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/file/FileSourceTests.java b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/file/FileSourceTests.java index b57146df16..4cc796e47f 100644 --- a/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/file/FileSourceTests.java +++ b/data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/source/file/FileSourceTests.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.source.file; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/data-prepper-plugins/csv-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessor.java b/data-prepper-plugins/csv-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessor.java index c26b950189..b3a04e2e58 100644 --- a/data-prepper-plugins/csv-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessor.java +++ b/data-prepper-plugins/csv-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.csv; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.databind.MappingIterator; import com.fasterxml.jackson.dataformat.csv.CsvMapper; import com.fasterxml.jackson.dataformat.csv.CsvParser; diff --git a/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorIT.java b/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorIT.java index 5eb2b5bf5a..33e54c5952 100644 --- a/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorIT.java +++ b/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorIT.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.processor.csv; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorTest.java b/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorTest.java index eadb10eb5d..fa5761b937 100644 --- a/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorTest.java +++ b/data-prepper-plugins/csv-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/csv/CsvProcessorTest.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.csv; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/date-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessor.java b/data-prepper-plugins/date-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessor.java index 50734a1640..092743ed29 100644 --- a/data-prepper-plugins/date-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessor.java +++ b/data-prepper-plugins/date-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.date; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/date-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessorTests.java b/data-prepper-plugins/date-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessorTests.java index 2e0ca2a0d2..effacb1d1c 100644 --- a/data-prepper-plugins/date-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessorTests.java +++ b/data-prepper-plugins/date-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/date/DateProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.date; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import io.micrometer.core.instrument.Counter; import org.apache.commons.lang3.LocaleUtils; import org.junit.jupiter.api.AfterEach; diff --git a/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessor.java b/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessor.java index 757b1a2c7a..cfa1368bec 100644 --- a/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessor.java +++ b/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessor.java @@ -5,14 +5,14 @@ package org.opensearch.dataprepper.plugins.processor.drop; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.annotations.SingleThread; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.annotations.SingleThread; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.expression.ExpressionEvaluator; import java.util.Collection; diff --git a/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenCondition.java b/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenCondition.java index 68221b8fea..392bde5b7a 100644 --- a/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenCondition.java +++ b/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenCondition.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.drop; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.expression.ExpressionEvaluator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +51,7 @@ public boolean isNotAlwaysTrue() { * Checks if {@link DropEventsProcessor} when condition evaluates to false using event to resolve Json Pointers * * @param event Source for resolving Json Pointers - * @return if the event should proceed to next {@link com.amazon.dataprepper.model.processor.Processor} + * @return if the event should proceed to next {@link org.opensearch.dataprepper.model.processor.Processor} */ public boolean isStatementFalseWith(final Event event) { try { diff --git a/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/HandleFailedEventsOption.java b/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/HandleFailedEventsOption.java index dd842706f4..239266dffd 100644 --- a/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/HandleFailedEventsOption.java +++ b/data-prepper-plugins/drop-events-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/drop/HandleFailedEventsOption.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.drop; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import com.fasterxml.jackson.annotation.JsonCreator; import org.slf4j.Logger; diff --git a/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessorTests.java b/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessorTests.java index d37857f695..23b577642d 100644 --- a/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessorTests.java +++ b/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.drop; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +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; diff --git a/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenConditionTest.java b/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenConditionTest.java index 628826902d..e6000b6981 100644 --- a/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenConditionTest.java +++ b/data-prepper-plugins/drop-events-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/drop/DropEventsWhenConditionTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.drop; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepper.java b/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepper.java index be0d89cdc3..8a6f4c914d 100644 --- a/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepper.java +++ b/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepper.java @@ -6,13 +6,13 @@ package org.opensearch.dataprepper.plugins.prepper.grok; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.SingleThread; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.SingleThread; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import io.krakens.grok.api.Grok; import io.krakens.grok.api.GrokCompiler; import io.krakens.grok.api.Match; diff --git a/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfig.java b/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfig.java index f78779af5a..50cc4204f2 100644 --- a/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfig.java +++ b/data-prepper-plugins/grok-prepper/src/main/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfig.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.prepper.grok; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import java.util.List; import java.util.Map; diff --git a/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfigTests.java b/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfigTests.java index f0e8fc04c6..6a4180b0c6 100644 --- a/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfigTests.java +++ b/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperConfigTests.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.prepper.grok; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperIT.java b/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperIT.java index 529956646c..62228948a7 100644 --- a/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperIT.java +++ b/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperIT.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.prepper.grok; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperTests.java b/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperTests.java index 424f01f22f..0e60f786d8 100644 --- a/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperTests.java +++ b/data-prepper-plugins/grok-prepper/src/test/java/org/opensearch/dataprepper/plugins/prepper/grok/GrokPrepperTests.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.prepper.grok; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java index 8bf5581f31..a24983f869 100644 --- a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java +++ b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java @@ -5,16 +5,16 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.log.Log; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.log.Log; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; import com.linecorp.armeria.server.HttpService; import com.linecorp.armeria.server.Server; import com.linecorp.armeria.server.ServerBuilder; diff --git a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceConfig.java b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceConfig.java index 3af8042e95..88c6806153 100644 --- a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceConfig.java +++ b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceConfig.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.micrometer.core.instrument.util.StringUtils; import jakarta.validation.constraints.AssertTrue; diff --git a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPService.java b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPService.java index cd3da77a84..14552eb526 100644 --- a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPService.java +++ b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPService.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.log.JacksonLog; -import com.amazon.dataprepper.model.log.Log; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.log.JacksonLog; +import org.opensearch.dataprepper.model.log.Log; +import org.opensearch.dataprepper.model.record.Record; import com.linecorp.armeria.common.AggregatedHttpRequest; import com.linecorp.armeria.common.HttpData; import com.linecorp.armeria.common.HttpResponse; diff --git a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandler.java b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandler.java index d836270a51..2ae46a837f 100644 --- a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandler.java +++ b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandler.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import com.linecorp.armeria.common.HttpRequest; import com.linecorp.armeria.common.HttpResponse; import com.linecorp.armeria.common.HttpStatus; diff --git a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandler.java b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandler.java index a4c0aace8b..c689baf4c6 100644 --- a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandler.java +++ b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandler.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; import com.linecorp.armeria.common.HttpResponse; import com.linecorp.armeria.common.HttpStatus; import com.linecorp.armeria.common.MediaType; diff --git a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceTest.java b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceTest.java index 843b8e1565..4575e37387 100644 --- a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceTest.java +++ b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSourceTest.java @@ -5,15 +5,15 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.CheckpointState; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.log.Log; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.CheckpointState; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.log.Log; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; import com.linecorp.armeria.client.ClientFactory; import com.linecorp.armeria.client.ResponseTimeoutException; import com.linecorp.armeria.client.WebClient; diff --git a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPServiceTest.java b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPServiceTest.java index 008b885a75..133ff63211 100644 --- a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPServiceTest.java +++ b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogHTTPServiceTest.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.log.Log; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.log.Log; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.linecorp.armeria.common.AggregatedHttpRequest; diff --git a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandlerTest.java b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandlerTest.java index e76d499875..d0b7823fd3 100644 --- a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandlerTest.java +++ b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/LogThrottlingRejectHandlerTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import com.linecorp.armeria.common.AggregatedHttpResponse; import com.linecorp.armeria.common.HttpRequest; import com.linecorp.armeria.common.HttpResponse; diff --git a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandlerTest.java b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandlerTest.java index 93278ac827..9a4294594d 100644 --- a/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandlerTest.java +++ b/data-prepper-plugins/http-source/src/test/java/org/opensearch/dataprepper/plugins/source/loghttp/RequestExceptionHandlerTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.source.loghttp; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; import com.linecorp.armeria.common.AggregatedHttpResponse; import com.linecorp.armeria.common.HttpResponse; import com.linecorp.armeria.common.HttpStatus; diff --git a/data-prepper-plugins/key-value-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java b/data-prepper-plugins/key-value-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java index ee5cad6b69..86e293c1f9 100644 --- a/data-prepper-plugins/key-value-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java +++ b/data-prepper-plugins/key-value-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.keyvalue; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/key-value-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java b/data-prepper-plugins/key-value-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java index 0cc57030b9..36610d7cbe 100644 --- a/data-prepper-plugins/key-value-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java +++ b/data-prepper-plugins/key-value-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.keyvalue; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSource.java b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSource.java index a1dd950991..abd1a9dcba 100644 --- a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSource.java +++ b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSource.java @@ -5,16 +5,16 @@ package org.opensearch.dataprepper.plugins.source.loggenerator; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceConfig.java b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceConfig.java index f33d1b7ab1..4e24b96fae 100644 --- a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceConfig.java +++ b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceConfig.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.loggenerator; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; diff --git a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogTypeGenerator.java b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogTypeGenerator.java index 1197d332f2..59a7716da6 100644 --- a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogTypeGenerator.java +++ b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogTypeGenerator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.loggenerator; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; public interface LogTypeGenerator { Event generateEvent(); diff --git a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/CommonApacheLogTypeGenerator.java b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/CommonApacheLogTypeGenerator.java index 2ed1b4ac61..1d31fd6676 100644 --- a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/CommonApacheLogTypeGenerator.java +++ b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/CommonApacheLogTypeGenerator.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.source.loggenerator.logtypes; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.log.JacksonLog; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.log.JacksonLog; import org.opensearch.dataprepper.plugins.source.loggenerator.ApacheLogFaker; import org.opensearch.dataprepper.plugins.source.loggenerator.LogTypeGenerator; diff --git a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/VpcFlowLogTypeGenerator.java b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/VpcFlowLogTypeGenerator.java index 769465b92b..f156899eec 100644 --- a/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/VpcFlowLogTypeGenerator.java +++ b/data-prepper-plugins/log-generator-source/src/main/java/org/opensearch/dataprepper/plugins/source/loggenerator/logtypes/VpcFlowLogTypeGenerator.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.source.loggenerator.logtypes; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.log.JacksonLog; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.log.JacksonLog; import org.opensearch.dataprepper.plugins.source.loggenerator.CsvLogFaker; import org.opensearch.dataprepper.plugins.source.loggenerator.LogTypeGenerator; diff --git a/data-prepper-plugins/log-generator-source/src/test/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceTest.java b/data-prepper-plugins/log-generator-source/src/test/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceTest.java index aa45d097c0..99095f9bdc 100644 --- a/data-prepper-plugins/log-generator-source/src/test/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceTest.java +++ b/data-prepper-plugins/log-generator-source/src/test/java/org/opensearch/dataprepper/plugins/source/loggenerator/LogGeneratorSourceTest.java @@ -6,13 +6,13 @@ package org.opensearch.dataprepper.plugins.source.loggenerator; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/mapdb-prepper-state/src/main/java/org/opensearch/dataprepper/plugins/prepper/state/MapDbPrepperState.java b/data-prepper-plugins/mapdb-prepper-state/src/main/java/org/opensearch/dataprepper/plugins/prepper/state/MapDbPrepperState.java index 998c9a3165..f95b809a02 100644 --- a/data-prepper-plugins/mapdb-prepper-state/src/main/java/org/opensearch/dataprepper/plugins/prepper/state/MapDbPrepperState.java +++ b/data-prepper-plugins/mapdb-prepper-state/src/main/java/org/opensearch/dataprepper/plugins/prepper/state/MapDbPrepperState.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.prepper.state; -import com.amazon.dataprepper.processor.state.ProcessorState; +import org.opensearch.dataprepper.processor.state.ProcessorState; import com.google.common.primitives.SignedBytes; import org.mapdb.BTreeMap; import org.mapdb.DBMaker; diff --git a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessor.java b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessor.java index 69f6aef9fc..f693d7813e 100644 --- a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessor.java +++ b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.List; diff --git a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessor.java b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessor.java index 412f439028..942909feac 100644 --- a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessor.java +++ b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.List; diff --git a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessor.java b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessor.java index f813cfad69..3368b26d7d 100644 --- a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessor.java +++ b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; diff --git a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessor.java b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessor.java index 110afde3c6..2fc117b38d 100644 --- a/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessor.java +++ b/data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.List; diff --git a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessorTests.java b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessorTests.java index f1483a921a..880a11d4d7 100644 --- a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessorTests.java +++ b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/AddEntryProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessorTests.java b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessorTests.java index 33e743db39..f2e3862a3e 100644 --- a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessorTests.java +++ b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/CopyValueProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessorTests.java b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessorTests.java index 25c878eb69..ae019c5bc9 100644 --- a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessorTests.java +++ b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessorTests.java b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessorTests.java index 0c011e6615..993c0de7db 100644 --- a/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessorTests.java +++ b/data-prepper-plugins/mutate-event-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutateevent/RenameKeyProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutateevent; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/AbstractStringProcessor.java b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/AbstractStringProcessor.java index 352d1ace12..49a1b8960c 100644 --- a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/AbstractStringProcessor.java +++ b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/AbstractStringProcessor.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.List; diff --git a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessor.java b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessor.java index eb094c9a38..b76e922c61 100644 --- a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessor.java +++ b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessor.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.Processor; import java.util.Locale; diff --git a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessor.java b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessor.java index 1bd929e184..14e1740c3e 100644 --- a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessor.java +++ b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessor.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.Processor; import java.util.HashMap; import java.util.Map; diff --git a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessor.java b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessor.java index eacfb1db0d..c8305ee353 100644 --- a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessor.java +++ b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessor.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.Processor; import java.util.HashMap; import java.util.Map; diff --git a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessor.java b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessor.java index 6c877b4fd0..2f0e5f0dc2 100644 --- a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessor.java +++ b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessor.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.Processor; /** * This processor takes in a key and changes its value to a string with the leading and trailing spaces trimmed. diff --git a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessor.java b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessor.java index e1b779cd53..9d3665fdd2 100644 --- a/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessor.java +++ b/data-prepper-plugins/mutate-string-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessor.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.Processor; import java.util.Locale; diff --git a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessorTests.java b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessorTests.java index 627912fbad..18bddf31a9 100644 --- a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessorTests.java +++ b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/LowercaseStringProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +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; diff --git a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessorTests.java b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessorTests.java index 07b15eddc8..bd802b8e12 100644 --- a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessorTests.java +++ b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SplitStringProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessorTests.java b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessorTests.java index 6d7dd054a4..6fc318798a 100644 --- a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessorTests.java +++ b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/SubstituteStringProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +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; diff --git a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessorTests.java b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessorTests.java index a31b8c99ad..06efbbad96 100644 --- a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessorTests.java +++ b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/TrimStringProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +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; diff --git a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessorTests.java b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessorTests.java index e7d1bc30b3..14af79d202 100644 --- a/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessorTests.java +++ b/data-prepper-plugins/mutate-string-processors/src/test/java/org/opensearch/dataprepper/plugins/processor/mutatestring/UppercaseStringProcessorTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.mutatestring; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +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; diff --git a/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java index 09b5a88004..2ae8629ca9 100644 --- a/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java +++ b/data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.EventType; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java index dd6739e3b8..c3bb5c629b 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import io.micrometer.core.instrument.Counter; import org.opensearch.OpenSearchException; import org.opensearch.action.bulk.BackoffPolicy; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java index 922293b8eb..308b023a12 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.apache.http.HttpHost; import org.apache.http.HttpRequestInterceptor; import org.apache.http.auth.AuthScope; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java index 23926b4c22..0136489580 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java @@ -5,12 +5,12 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.sink.AbstractSink; -import com.amazon.dataprepper.model.sink.Sink; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.sink.AbstractSink; +import org.opensearch.dataprepper.model.sink.Sink; import com.fasterxml.jackson.databind.ObjectMapper; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java index fe07b1923f..90b4455fdb 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfiguration.java index 66bd714cbe..201d81b6ec 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java index 504756d8a5..5e20d13f67 100644 --- a/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java +++ b/data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.EnumUtils; diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java index 10e6932e25..3036a4a022 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategyTests.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import io.micrometer.core.instrument.Measurement; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java index 40c03d0aff..bbd5563d0f 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/ConnectionConfigurationTests.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.junit.Test; import org.opensearch.client.RestHighLevelClient; diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java index dd225e3daa..d13d44d6cb 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkConfigurationTests.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.junit.Test; import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.BulkAction; import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConfiguration; diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java index 79fa028dbd..130de0e57e 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/RetryConfigurationTests.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.junit.Test; import java.util.HashMap; diff --git a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java index 5447390a7a..f725c0ede3 100644 --- a/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java +++ b/data-prepper-plugins/opensearch/src/test/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.sink.opensearch.index; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.junit.Test; import java.net.MalformedURLException; diff --git a/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelper.java b/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelper.java index c4517044cf..504bdf9ee8 100644 --- a/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelper.java +++ b/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelper.java @@ -5,10 +5,10 @@ package com.amazon.dataprepper.plugins.processor.otelmetrics; -import com.amazon.dataprepper.model.metric.Bucket; -import com.amazon.dataprepper.model.metric.DefaultBucket; -import com.amazon.dataprepper.model.metric.DefaultQuantile; -import com.amazon.dataprepper.model.metric.Quantile; +import org.opensearch.dataprepper.model.metric.Bucket; +import org.opensearch.dataprepper.model.metric.DefaultBucket; +import org.opensearch.dataprepper.model.metric.DefaultQuantile; +import org.opensearch.dataprepper.model.metric.Quantile; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.opentelemetry.proto.common.v1.AnyValue; diff --git a/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsRawProcessor.java b/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsRawProcessor.java index 328ae24a14..9cecfb1110 100644 --- a/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsRawProcessor.java +++ b/data-prepper-plugins/otel-metrics-raw-processor/src/main/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsRawProcessor.java @@ -5,20 +5,20 @@ package com.amazon.dataprepper.plugins.processor.otelmetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.metric.Gauge; -import com.amazon.dataprepper.model.metric.Histogram; -import com.amazon.dataprepper.model.metric.JacksonGauge; -import com.amazon.dataprepper.model.metric.JacksonHistogram; -import com.amazon.dataprepper.model.metric.JacksonSum; -import com.amazon.dataprepper.model.metric.JacksonSummary; -import com.amazon.dataprepper.model.metric.Metric; -import com.amazon.dataprepper.model.metric.Sum; -import com.amazon.dataprepper.model.metric.Summary; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.metric.Gauge; +import org.opensearch.dataprepper.model.metric.Histogram; +import org.opensearch.dataprepper.model.metric.JacksonGauge; +import org.opensearch.dataprepper.model.metric.JacksonHistogram; +import org.opensearch.dataprepper.model.metric.JacksonSum; +import org.opensearch.dataprepper.model.metric.JacksonSummary; +import org.opensearch.dataprepper.model.metric.Metric; +import org.opensearch.dataprepper.model.metric.Sum; +import org.opensearch.dataprepper.model.metric.Summary; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; import io.opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics; import io.opentelemetry.proto.metrics.v1.ResourceMetrics; diff --git a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginGaugeTest.java b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginGaugeTest.java index a4d02af977..8f9f2405de 100644 --- a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginGaugeTest.java +++ b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginGaugeTest.java @@ -5,9 +5,9 @@ package com.amazon.dataprepper.plugins.processor.otelmetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.metric.Metric; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.metric.Metric; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; diff --git a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginHistogramTest.java b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginHistogramTest.java index 2c1df7c570..a08c5cd63c 100644 --- a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginHistogramTest.java +++ b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginHistogramTest.java @@ -5,11 +5,11 @@ package com.amazon.dataprepper.plugins.processor.otelmetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.metric.Bucket; -import com.amazon.dataprepper.model.metric.DefaultBucket; -import com.amazon.dataprepper.model.metric.Metric; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.metric.Bucket; +import org.opensearch.dataprepper.model.metric.DefaultBucket; +import org.opensearch.dataprepper.model.metric.Metric; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; diff --git a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSumTest.java b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSumTest.java index 74d1c1f454..76cc740fea 100644 --- a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSumTest.java +++ b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSumTest.java @@ -5,9 +5,9 @@ package com.amazon.dataprepper.plugins.processor.otelmetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; @@ -109,7 +109,7 @@ public void test() throws JsonProcessingException { } private void assertSumProcessing(Map map) { - assertThat(map).contains(entry("kind", com.amazon.dataprepper.model.metric.Metric.KIND.SUM.toString())); + assertThat(map).contains(entry("kind", org.opensearch.dataprepper.model.metric.Metric.KIND.SUM.toString())); assertThat(map).contains(entry("unit", "seconds")); assertThat(map).contains(entry("description", "description")); assertThat(map).contains(entry("name", "name")); diff --git a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSummaryTest.java b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSummaryTest.java index fcea60e70f..7b4c88a87d 100644 --- a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSummaryTest.java +++ b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/MetricsPluginSummaryTest.java @@ -5,9 +5,9 @@ package com.amazon.dataprepper.plugins.processor.otelmetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; @@ -91,7 +91,7 @@ public void testSummaryProcessing() throws JsonProcessingException { } private void assertSumProcessing(Map map) { - assertThat(map).contains(entry("kind", com.amazon.dataprepper.model.metric.Metric.KIND.SUMMARY.toString())); + assertThat(map).contains(entry("kind", org.opensearch.dataprepper.model.metric.Metric.KIND.SUMMARY.toString())); assertThat(map).contains(entry("unit", "seconds")); assertThat(map).contains(entry("description", "description")); assertThat(map).contains(entry("name", "name")); diff --git a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelperTest.java b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelperTest.java index d818a34569..860e88ee70 100644 --- a/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelperTest.java +++ b/data-prepper-plugins/otel-metrics-raw-processor/src/test/java/com/amazon/dataprepper/plugins/processor/otelmetrics/OTelMetricsProtoHelperTest.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.processor.otelmetrics; -import com.amazon.dataprepper.model.metric.Bucket; +import org.opensearch.dataprepper.model.metric.Bucket; import com.google.protobuf.ByteString; import io.opentelemetry.proto.common.v1.AnyValue; import io.opentelemetry.proto.metrics.v1.NumberDataPoint; diff --git a/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcService.java b/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcService.java index 74da2edaf8..5fc3d2bfe3 100644 --- a/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcService.java +++ b/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcService.java @@ -5,9 +5,9 @@ package com.amazon.dataprepper.plugins.source.otelmetrics; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; import io.grpc.Context; import io.grpc.Status; import io.grpc.stub.StreamObserver; diff --git a/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSource.java b/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSource.java index ea17202207..407ca1f5ed 100644 --- a/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSource.java +++ b/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSource.java @@ -6,15 +6,15 @@ package com.amazon.dataprepper.plugins.source.otelmetrics; import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.buffer.Buffer; +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.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; import org.opensearch.dataprepper.plugins.certificate.model.Certificate; import com.amazon.dataprepper.plugins.health.HealthGrpcService; diff --git a/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceConfig.java b/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceConfig.java index 54f2628aa3..fa82e8b068 100644 --- a/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceConfig.java +++ b/data-prepper-plugins/otel-metrics-source/src/main/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceConfig.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.source.otelmetrics; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.StringUtils; diff --git a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcServiceTest.java b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcServiceTest.java index 7614bef945..3c7b057824 100644 --- a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcServiceTest.java +++ b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsGrpcServiceTest.java @@ -5,10 +5,10 @@ package com.amazon.dataprepper.plugins.source.otelmetrics; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; import io.grpc.stub.StreamObserver; import io.micrometer.core.instrument.Counter; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; diff --git a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceTest.java b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceTest.java index 38892fd287..113d03f5d2 100644 --- a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceTest.java +++ b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OTelMetricsSourceTest.java @@ -7,11 +7,11 @@ import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +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.model.record.Record; import org.opensearch.dataprepper.plugins.GrpcBasicAuthenticationProvider; import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer; diff --git a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OtelMetricsSourceConfigTests.java b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OtelMetricsSourceConfigTests.java index fe2e84a040..c1b37f3348 100644 --- a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OtelMetricsSourceConfigTests.java +++ b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/OtelMetricsSourceConfigTests.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.source.otelmetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/certificate/CertificateProviderFactoryTest.java b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/certificate/CertificateProviderFactoryTest.java index 71e75aed11..57b60a06c4 100644 --- a/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/certificate/CertificateProviderFactoryTest.java +++ b/data-prepper-plugins/otel-metrics-source/src/test/java/com/amazon/dataprepper/plugins/source/otelmetrics/certificate/CertificateProviderFactoryTest.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.source.otelmetrics.certificate; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.opensearch.dataprepper.plugins.certificate.CertificateProvider; import org.opensearch.dataprepper.plugins.certificate.acm.ACMCertificateProvider; import org.opensearch.dataprepper.plugins.certificate.file.FileCertificateProvider; diff --git a/data-prepper-plugins/otel-proto-common/src/main/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodec.java b/data-prepper-plugins/otel-proto-common/src/main/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodec.java index 9d9c5dc20f..f1c0b5df91 100644 --- a/data-prepper-plugins/otel-proto-common/src/main/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodec.java +++ b/data-prepper-plugins/otel-proto-common/src/main/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodec.java @@ -5,14 +5,14 @@ package com.amazon.dataprepper.plugins.otel.codec; -import com.amazon.dataprepper.model.trace.DefaultLink; -import com.amazon.dataprepper.model.trace.DefaultSpanEvent; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; -import com.amazon.dataprepper.model.trace.JacksonSpan; -import com.amazon.dataprepper.model.trace.Link; -import com.amazon.dataprepper.model.trace.Span; -import com.amazon.dataprepper.model.trace.SpanEvent; -import com.amazon.dataprepper.model.trace.TraceGroupFields; +import org.opensearch.dataprepper.model.trace.DefaultLink; +import org.opensearch.dataprepper.model.trace.DefaultSpanEvent; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.JacksonSpan; +import org.opensearch.dataprepper.model.trace.Link; +import org.opensearch.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.SpanEvent; +import org.opensearch.dataprepper.model.trace.TraceGroupFields; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.protobuf.ByteString; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** - * OTelProtoCodec is for encoding/decoding between {@link com.amazon.dataprepper.model.trace} and {@link io.opentelemetry.proto}. + * OTelProtoCodec is for encoding/decoding between {@link org.opensearch.dataprepper.model.trace} and {@link io.opentelemetry.proto}. */ public class OTelProtoCodec { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); diff --git a/data-prepper-plugins/otel-proto-common/src/test/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodecTest.java b/data-prepper-plugins/otel-proto-common/src/test/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodecTest.java index 6bd9c85d62..bf21ec2b7c 100644 --- a/data-prepper-plugins/otel-proto-common/src/test/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodecTest.java +++ b/data-prepper-plugins/otel-proto-common/src/test/java/com/amazon/dataprepper/plugins/otel/codec/OTelProtoCodecTest.java @@ -5,14 +5,14 @@ package com.amazon.dataprepper.plugins.otel.codec; -import com.amazon.dataprepper.model.trace.DefaultLink; -import com.amazon.dataprepper.model.trace.DefaultSpanEvent; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; -import com.amazon.dataprepper.model.trace.JacksonSpan; -import com.amazon.dataprepper.model.trace.Link; -import com.amazon.dataprepper.model.trace.Span; -import com.amazon.dataprepper.model.trace.SpanEvent; -import com.amazon.dataprepper.model.trace.TraceGroupFields; +import org.opensearch.dataprepper.model.trace.DefaultLink; +import org.opensearch.dataprepper.model.trace.DefaultSpanEvent; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.JacksonSpan; +import org.opensearch.dataprepper.model.trace.Link; +import org.opensearch.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.SpanEvent; +import org.opensearch.dataprepper.model.trace.TraceGroupFields; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessor.java b/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessor.java index 4754c106e4..97ce140b58 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessor.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessor.java @@ -5,14 +5,14 @@ package org.opensearch.dataprepper.plugins.processor.oteltracegroup; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; -import com.amazon.dataprepper.model.trace.Span; -import com.amazon.dataprepper.model.trace.TraceGroupFields; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.TraceGroupFields; import com.google.common.base.Strings; import io.micrometer.core.instrument.Counter; import org.opensearch.action.search.SearchRequest; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java b/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java index 81ad0f31c6..cf2aa24a25 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfig.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.oteltracegroup; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexConstants; import org.opensearch.dataprepper.plugins.sink.opensearch.index.IndexType; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/model/TraceGroup.java b/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/model/TraceGroup.java index 2fb2eaea6b..6d238ba16c 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/model/TraceGroup.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/model/TraceGroup.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.oteltracegroup.model; -import com.amazon.dataprepper.model.trace.Span; -import com.amazon.dataprepper.model.trace.TraceGroupFields; +import org.opensearch.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.TraceGroupFields; import java.util.Objects; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java b/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java index fe1ffb9d0b..13bdecb86d 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorConfigTests.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.oteltracegroup; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java b/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java index 99dbd744b8..70db97ca6f 100644 --- a/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java +++ b/data-prepper-plugins/otel-trace-group-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltracegroup/OTelTraceGroupProcessorTests.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.oteltracegroup; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; -import com.amazon.dataprepper.model.trace.JacksonSpan; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.JacksonSpan; +import org.opensearch.dataprepper.model.trace.Span; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.micrometer.core.instrument.Measurement; diff --git a/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessor.java b/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessor.java index 0ec122d3e5..e462178a6f 100644 --- a/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessor.java +++ b/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessor.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.oteltrace; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.Span; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import io.micrometer.core.instrument.util.StringUtils; diff --git a/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/SpanSet.java b/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/SpanSet.java index 519077584c..b35ccc1907 100644 --- a/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/SpanSet.java +++ b/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/SpanSet.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.processor.oteltrace.model; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.Span; import com.google.common.collect.Sets; import java.util.Set; diff --git a/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/TraceGroup.java b/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/TraceGroup.java index e5d740e1e5..f159dd6c7f 100644 --- a/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/TraceGroup.java +++ b/data-prepper-plugins/otel-trace-raw-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/oteltrace/model/TraceGroup.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.processor.oteltrace.model; -import com.amazon.dataprepper.model.trace.Span; -import com.amazon.dataprepper.model.trace.TraceGroupFields; +import org.opensearch.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.TraceGroupFields; public class TraceGroup { private final String traceGroup; diff --git a/data-prepper-plugins/otel-trace-raw-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessorTest.java b/data-prepper-plugins/otel-trace-raw-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessorTest.java index fbde7d8a9a..55f9bcc330 100644 --- a/data-prepper-plugins/otel-trace-raw-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessorTest.java +++ b/data-prepper-plugins/otel-trace-raw-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/oteltrace/OTelTraceRawProcessorTest.java @@ -5,13 +5,13 @@ package org.opensearch.dataprepper.plugins.processor.oteltrace; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; -import com.amazon.dataprepper.model.trace.JacksonSpan; -import com.amazon.dataprepper.model.trace.Span; -import com.amazon.dataprepper.model.trace.TraceGroupFields; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.JacksonSpan; +import org.opensearch.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.TraceGroupFields; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.assertj.core.api.Assertions; diff --git a/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcService.java b/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcService.java index f452871e4e..c25c5875f1 100644 --- a/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcService.java +++ b/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcService.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.source.oteltrace; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.Span; import com.amazon.dataprepper.plugins.otel.codec.OTelProtoCodec; import io.grpc.Context; import io.grpc.Status; diff --git a/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource.java b/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource.java index aaf9f3c8d0..47417532e7 100644 --- a/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource.java +++ b/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource.java @@ -5,15 +5,15 @@ package org.opensearch.dataprepper.plugins.source.oteltrace; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.buffer.Buffer; +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.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; import com.amazon.dataprepper.plugins.otel.codec.OTelProtoCodec; import com.linecorp.armeria.server.HttpService; import com.linecorp.armeria.server.Server; diff --git a/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceConfig.java b/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceConfig.java index 1d1bafe2f9..7c820070ab 100644 --- a/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceConfig.java +++ b/data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceConfig.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.oteltrace; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.StringUtils; diff --git a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcServiceTest.java b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcServiceTest.java index eb7a22bd0f..4011e18d51 100644 --- a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcServiceTest.java +++ b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceGrpcServiceTest.java @@ -5,12 +5,12 @@ package org.opensearch.dataprepper.plugins.source.oteltrace; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.buffer.SizeOverflowException; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.buffer.SizeOverflowException; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.Span; import com.amazon.dataprepper.plugins.otel.codec.OTelProtoCodec; import com.google.protobuf.ByteString; import io.grpc.Status; diff --git a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java index b8c6b315bf..8f22c59402 100644 --- a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java +++ b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.source.oteltrace; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +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.model.record.Record; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; diff --git a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OtelTraceSourceConfigTests.java b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OtelTraceSourceConfigTests.java index 60ce35fe8e..4ce7678541 100644 --- a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OtelTraceSourceConfigTests.java +++ b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OtelTraceSourceConfigTests.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.oteltrace; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/certificate/CertificateProviderFactoryTest.java b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/certificate/CertificateProviderFactoryTest.java index 9f3b5eefd3..3f4ba3abbb 100644 --- a/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/certificate/CertificateProviderFactoryTest.java +++ b/data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/certificate/CertificateProviderFactoryTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source.oteltrace.certificate; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.fasterxml.jackson.databind.ObjectMapper; import org.hamcrest.core.IsInstanceOf; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/parse-json-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessor.java b/data-prepper-plugins/parse-json-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessor.java index db45778de5..4c810c49df 100644 --- a/data-prepper-plugins/parse-json-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessor.java +++ b/data-prepper-plugins/parse-json-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessor.java @@ -5,14 +5,14 @@ package org.opensearch.dataprepper.plugins.processor.parsejson; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java b/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java index 2ed0906b08..2ec4271eec 100644 --- a/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java +++ b/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.processor.parsejson; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +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; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarder.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarder.java index e8c4efb40d..bca5c9b0f2 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarder.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarder.java @@ -5,13 +5,13 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.Span; import com.amazon.dataprepper.plugins.otel.codec.OTelProtoCodec; import com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery.StaticPeerListProvider; import io.micrometer.core.instrument.Counter; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfig.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfig.java index 5be43f3210..69c2ba7e2f 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfig.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfig.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.certificate.CertificateProviderConfig; import com.amazon.dataprepper.plugins.prepper.peerforwarder.certificate.CertificateProviderFactory; import com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery.PeerListProvider; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderUtils.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderUtils.java index 2cad3c2b43..3f380d43c5 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderUtils.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderUtils.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.trace.Span; import java.util.Collection; import java.util.List; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider.java index 0b0c136fbb..ffc5ddd13f 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.DynamicEndpointGroup; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DiscoveryMode.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DiscoveryMode.java index bfcd483a76..cdf59f873e 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DiscoveryMode.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DiscoveryMode.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import java.util.Objects; import java.util.function.BiFunction; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider.java index 60d553f2da..073090c387 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import com.google.common.base.Preconditions; import com.linecorp.armeria.client.Endpoint; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactory.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactory.java index 8e7e700a16..a2b8ce41d0 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactory.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactory.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import java.util.Objects; diff --git a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider.java b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider.java index 3421ba67bf..8876f9be54 100644 --- a/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider.java +++ b/data-prepper-plugins/peer-forwarder/src/main/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import com.google.common.base.Preconditions; import com.linecorp.armeria.client.Endpoint; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfigTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfigTest.java index d2c6e74d01..061492d8e1 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfigTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderConfigTest.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.certificate.model.Certificate; import com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery.DiscoveryMode; import org.junit.After; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderTest.java index cbd16a73f7..95ff0d225f 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/PeerForwarderTest.java @@ -5,14 +5,14 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; -import com.amazon.dataprepper.model.trace.JacksonSpan; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.JacksonSpan; +import org.opensearch.dataprepper.model.trace.Span; import com.amazon.dataprepper.plugins.otel.codec.OTelProtoCodec; import io.grpc.Channel; import io.micrometer.core.instrument.Measurement; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java index 92ac4f6332..0eb042759e 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProviderTest.java @@ -5,7 +5,7 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.retry.Backoff; import org.apache.commons.lang3.RandomStringUtils; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider_CreateTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider_CreateTest.java index ce8205854a..f5ed6448d6 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider_CreateTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/AwsCloudMapPeerListProvider_CreateTest.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProviderTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProviderTest.java index fcda25161a..af02dffef5 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProviderTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProviderTest.java @@ -5,10 +5,10 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.HashRing; import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider_CreateTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider_CreateTest.java index abe6d7b430..32611e9329 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider_CreateTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/DnsPeerListProvider_CreateTest.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup; import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroupBuilder; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactoryTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactoryTest.java index 71ccbcfac7..9527de8467 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactoryTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/PeerListProviderFactoryTest.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProviderTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProviderTest.java index 41394da84c..54447e3afb 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProviderTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProviderTest.java @@ -5,10 +5,10 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.HashRing; import io.micrometer.core.instrument.Measurement; import org.junit.Before; diff --git a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider_CreateTest.java b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider_CreateTest.java index 1e04e9f43a..cae7a65f18 100644 --- a/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider_CreateTest.java +++ b/data-prepper-plugins/peer-forwarder/src/test/java/com/amazon/dataprepper/plugins/prepper/peerforwarder/discovery/StaticPeerListProvider_CreateTest.java @@ -5,8 +5,8 @@ package com.amazon.dataprepper.plugins.prepper.peerforwarder.discovery; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginSetting; import com.amazon.dataprepper.plugins.prepper.peerforwarder.PeerForwarderConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/CsvRecordsGenerator.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/CsvRecordsGenerator.java index dbd58b1e64..c67c7f4134 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/CsvRecordsGenerator.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/CsvRecordsGenerator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.codec.CsvCodec; import org.opensearch.dataprepper.plugins.source.codec.CsvCodecConfig; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/JsonRecordsGenerator.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/JsonRecordsGenerator.java index 3a75d3d5f1..c2b729319e 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/JsonRecordsGenerator.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/JsonRecordsGenerator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.codec.JsonCodec; import com.fasterxml.jackson.core.JsonEncoding; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/NewlineDelimitedRecordsGenerator.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/NewlineDelimitedRecordsGenerator.java index a337a6ea11..cf327075b7 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/NewlineDelimitedRecordsGenerator.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/NewlineDelimitedRecordsGenerator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.codec.NewlineDelimitedCodec; import org.opensearch.dataprepper.plugins.source.codec.NewlineDelimitedConfig; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/RecordsGenerator.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/RecordsGenerator.java index 4b5dde6a11..4b1e0b9ef7 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/RecordsGenerator.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/RecordsGenerator.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.plugins.source.codec.Codec; import java.io.IOException; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerIT.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerIT.java index 9cc7704ea8..c121646e9d 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerIT.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerIT.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.compression.CompressionEngine; import org.opensearch.dataprepper.plugins.source.compression.GZipCompressionEngine; diff --git a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/SqsWorkerIT.java b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/SqsWorkerIT.java index bfffe6d15e..28fbe53b8b 100644 --- a/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/SqsWorkerIT.java +++ b/data-prepper-plugins/s3-source/src/integrationTest/java/org/opensearch/dataprepper/plugins/source/SqsWorkerIT.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.plugins.source.configuration.OnErrorOption; import org.opensearch.dataprepper.plugins.source.configuration.SqsOptions; import io.micrometer.core.instrument.Counter; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/BufferAccumulator.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/BufferAccumulator.java index 27be01d55f..e55eb57f7f 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/BufferAccumulator.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/BufferAccumulator.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.record.Record; import java.time.Duration; import java.util.ArrayList; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifier.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifier.java index 4907f1e5ca..abc33e2411 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifier.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifier.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import java.util.Objects; import java.util.function.BiConsumer; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorker.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorker.java index b112fda16b..fd09640907 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorker.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorker.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.compression.CompressionEngine; import org.opensearch.dataprepper.plugins.source.ownership.BucketOwnerProvider; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Service.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Service.java index 2831d3c531..204379530b 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Service.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Service.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.compression.CompressionEngine; import org.opensearch.dataprepper.plugins.source.ownership.BucketOwnerProvider; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Source.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Source.java index 6fbd153072..8c2a251208 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Source.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3Source.java @@ -5,16 +5,16 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.plugin.PluginFactory; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.source.Source; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.source.Source; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.ownership.BucketOwnerProvider; import org.opensearch.dataprepper.plugins.source.ownership.ConfigBucketOwnerProviderFactory; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3SourceConfig.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3SourceConfig.java index b756fb7312..ff1650f126 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3SourceConfig.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/S3SourceConfig.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.configuration.PluginModel; import org.opensearch.dataprepper.plugins.source.configuration.NotificationTypeOption; import org.opensearch.dataprepper.plugins.source.configuration.CompressionOption; import org.opensearch.dataprepper.plugins.source.configuration.SqsOptions; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsService.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsService.java index 16f738702b..2ac97e0149 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsService.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsService.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java index 3a5f6537f6..6f67e839d7 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.plugins.source.configuration.OnErrorOption; import org.opensearch.dataprepper.plugins.source.configuration.SqsOptions; import org.opensearch.dataprepper.plugins.source.filter.ObjectCreatedFilter; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/Codec.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/Codec.java index 32a03a9fff..a29aacf6a1 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/Codec.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/Codec.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.source.codec; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import java.io.IOException; import java.io.InputStream; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodec.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodec.java index 87e4d9492e..27892b302f 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodec.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodec.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.source.codec; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.log.JacksonLog; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.log.JacksonLog; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.MappingIterator; import com.fasterxml.jackson.dataformat.csv.CsvMapper; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodec.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodec.java index 7e496bf864..f52d84141f 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodec.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodec.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.source.codec; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.log.JacksonLog; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +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.model.record.Record; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodec.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodec.java index 63ab00e2df..f99a9e58ac 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodec.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodec.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.source.codec; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.log.JacksonLog; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.log.JacksonLog; +import org.opensearch.dataprepper.model.record.Record; import java.io.BufferedReader; import java.io.IOException; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/BufferAccumulatorTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/BufferAccumulatorTest.java index 94249cccaf..2fe3cc5d43 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/BufferAccumulatorTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/BufferAccumulatorTest.java @@ -5,8 +5,8 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.buffer.Buffer; +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; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifierTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifierTest.java index 0ed5fc0869..2f325e8a83 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifierTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/EventMetadataModifierTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.Event; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerTest.java index 05de16931c..5bcd75bc12 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3ObjectWorkerTest.java @@ -5,10 +5,10 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.buffer.Buffer; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.buffer.Buffer; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.plugins.source.codec.Codec; import org.opensearch.dataprepper.plugins.source.compression.CompressionEngine; import org.opensearch.dataprepper.plugins.source.ownership.BucketOwnerProvider; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3SourceTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3SourceTest.java index b6846b3c93..016bc952e0 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3SourceTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/S3SourceTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.configuration.PluginModel; -import com.amazon.dataprepper.model.plugin.PluginFactory; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.configuration.PluginModel; +import org.opensearch.dataprepper.model.plugin.PluginFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/SqsWorkerTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/SqsWorkerTest.java index c238a2d975..aee99bc52d 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/SqsWorkerTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/SqsWorkerTest.java @@ -5,7 +5,7 @@ package org.opensearch.dataprepper.plugins.source; -import com.amazon.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.plugins.source.configuration.AwsAuthenticationOptions; import org.opensearch.dataprepper.plugins.source.configuration.OnErrorOption; import org.opensearch.dataprepper.plugins.source.configuration.SqsOptions; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodecTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodecTest.java index 3fb6248612..0d3804dd63 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodecTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/CsvCodecTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.source.codec; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.EventType; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.databind.MappingIterator; import com.fasterxml.jackson.dataformat.csv.CsvMapper; import com.fasterxml.jackson.dataformat.csv.CsvParser; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodecTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodecTest.java index 641bdf985c..875cbbbd7c 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodecTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/JsonCodecTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.source.codec; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.EventType; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.record.Record; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodecTest.java b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodecTest.java index ae41c04abf..cb91e08879 100644 --- a/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodecTest.java +++ b/data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/codec/NewlineDelimitedCodecTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.source.codec; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.EventType; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.EventType; +import org.opensearch.dataprepper.model.record.Record; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/data-prepper-plugins/service-map-stateful/src/main/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepper.java b/data-prepper-plugins/service-map-stateful/src/main/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepper.java index 66d872f10d..312eac92be 100644 --- a/data-prepper-plugins/service-map-stateful/src/main/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepper.java +++ b/data-prepper-plugins/service-map-stateful/src/main/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepper.java @@ -5,16 +5,16 @@ package org.opensearch.dataprepper.plugins.prepper; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.SingleThread; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.event.JacksonEvent; -import com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.SingleThread; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.event.JacksonEvent; +import org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.Span; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; import com.google.common.primitives.SignedBytes; diff --git a/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepperTest.java b/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepperTest.java index b5dce35e4d..ea7200b5b1 100644 --- a/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepperTest.java +++ b/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapStatefulPrepperTest.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.prepper; -import com.amazon.dataprepper.metrics.MetricNames; -import com.amazon.dataprepper.metrics.MetricsTestUtil; -import com.amazon.dataprepper.model.configuration.PluginSetting; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.metrics.MetricNames; +import org.opensearch.dataprepper.metrics.MetricsTestUtil; +import org.opensearch.dataprepper.model.configuration.PluginSetting; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.Span; import com.google.common.collect.Sets; import io.micrometer.core.instrument.Measurement; import org.apache.commons.codec.binary.Hex; diff --git a/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapTestUtils.java b/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapTestUtils.java index b1e73a5635..afa7dec67d 100644 --- a/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapTestUtils.java +++ b/data-prepper-plugins/service-map-stateful/src/test/java/org/opensearch/dataprepper/plugins/prepper/ServiceMapTestUtils.java @@ -5,11 +5,11 @@ package org.opensearch.dataprepper.plugins.prepper; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; -import com.amazon.dataprepper.model.trace.JacksonSpan; -import com.amazon.dataprepper.model.trace.Span; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.JacksonSpan; +import org.opensearch.dataprepper.model.trace.Span; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -50,13 +50,13 @@ public static Future> startExecuteAsync(ExecutorServ } /** - * Creates a {@link com.amazon.dataprepper.model.trace.Span} object with the given parameters + * Creates a {@link org.opensearch.dataprepper.model.trace.Span} object with the given parameters * @param serviceName Resource name for the ResourceSpans object * @param spanName Span name for the single span in the ResourceSpans object * @param spanId Span id for the single span in the ResourceSpans object * @param parentId Parent id for the single span in the ResourceSpans object * @param spanKind Span kind for the single span in the ResourceSpans object - * @return {@link com.amazon.dataprepper.model.trace.Span} object with a single span constructed according to the parameters + * @return {@link org.opensearch.dataprepper.model.trace.Span} object with a single span constructed according to the parameters */ public static Span getSpan(final String serviceName, final String spanName, final String spanId, final String parentId, final String traceId, final io.opentelemetry.proto.trace.v1.Span.SpanKind spanKind) { diff --git a/data-prepper-plugins/trace-peer-forwarder-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessor.java b/data-prepper-plugins/trace-peer-forwarder-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessor.java index 5293b66bd1..bc310a30f4 100644 --- a/data-prepper-plugins/trace-peer-forwarder-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessor.java +++ b/data-prepper-plugins/trace-peer-forwarder-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessor.java @@ -5,14 +5,14 @@ package org.opensearch.dataprepper.plugins.processor; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.annotations.DataPrepperPlugin; -import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.peerforwarder.RequiresPeerForwarding; -import com.amazon.dataprepper.model.processor.AbstractProcessor; -import com.amazon.dataprepper.model.processor.Processor; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin; +import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.peerforwarder.RequiresPeerForwarding; +import org.opensearch.dataprepper.model.processor.AbstractProcessor; +import org.opensearch.dataprepper.model.processor.Processor; +import org.opensearch.dataprepper.model.record.Record; import java.util.Collection; import java.util.Collections; diff --git a/data-prepper-plugins/trace-peer-forwarder-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessorTest.java b/data-prepper-plugins/trace-peer-forwarder-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessorTest.java index 760e9bcd61..ecc231679e 100644 --- a/data-prepper-plugins/trace-peer-forwarder-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessorTest.java +++ b/data-prepper-plugins/trace-peer-forwarder-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/TracePeerForwarderProcessorTest.java @@ -5,9 +5,9 @@ package org.opensearch.dataprepper.plugins.processor; -import com.amazon.dataprepper.metrics.PluginMetrics; -import com.amazon.dataprepper.model.event.Event; -import com.amazon.dataprepper.model.record.Record; +import org.opensearch.dataprepper.metrics.PluginMetrics; +import org.opensearch.dataprepper.model.event.Event; +import org.opensearch.dataprepper.model.record.Record; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java b/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java index 1aa914c7b2..aa9e47567b 100644 --- a/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java +++ b/e2e-test/trace/src/integrationTest/java/org/opensearch/dataprepper/integration/trace/EndToEndRawSpanTest.java @@ -6,7 +6,7 @@ package org.opensearch.dataprepper.integration.trace; -import com.amazon.dataprepper.model.trace.DefaultTraceGroupFields; +import org.opensearch.dataprepper.model.trace.DefaultTraceGroupFields; import org.opensearch.dataprepper.plugins.processor.oteltracegroup.model.TraceGroup; import org.opensearch.dataprepper.plugins.sink.opensearch.ConnectionConfiguration; import com.google.protobuf.ByteString;