From 6894d248ae4b49f7705261d2f7ad2b1b40c0c841 Mon Sep 17 00:00:00 2001 From: Santhosh Gandhe <1909520+san81@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:53:28 -0700 Subject: [PATCH] module name renamed to source-crawler Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com> --- .../saas-source-plugins/jira-source/build.gradle | 4 ++-- .../plugins/source/saas/jira/JiraClient.java | 8 ++++---- .../plugins/source/saas/jira/JiraSource.java | 6 +++--- .../{saas-crawler => source-crawler}/build.gradle | 0 .../SaasCrawlerApplicationContextMarker.java | 2 +- .../plugins/source/source_crawler}/base/Crawler.java | 8 ++++---- .../source/source_crawler}/base/SaasClient.java | 6 +++--- .../base/SaasPluginExecutorServiceProvider.java | 2 +- .../source_crawler}/base/SaasSourceConfig.java | 2 +- .../source_crawler}/base/SaasSourcePlugin.java | 10 +++++----- .../coordination/PartitionFactory.java | 6 +++--- .../coordination/partition/LeaderPartition.java | 4 ++-- .../coordination/partition/SaasSourcePartition.java | 4 ++-- .../coordination/scheduler/LeaderScheduler.java | 10 +++++----- .../coordination/scheduler/WorkerScheduler.java | 10 +++++----- .../coordination/state/LeaderProgressState.java | 2 +- .../coordination/state/SaasWorkerProgressState.java | 2 +- .../source/source_crawler}/model/ItemInfo.java | 2 +- .../source/source_crawler}/base/CrawlerTest.java | 8 ++++---- .../base/SaasPluginExecutorServiceProviderTest.java | 2 +- .../source_crawler}/base/SaasSourcePluginTest.java | 4 ++-- .../coordination/PartitionFactoryTest.java | 8 ++++---- .../coordination/scheduler/LeaderSchedulerTest.java | 8 ++++---- .../coordination/scheduler/WorkerSchedulerTest.java | 12 ++++++------ .../coordination/state/LeaderProgressStateTest.java | 2 +- .../state/SaasWorkerProgressStateTest.java | 2 +- .../source/source_crawler}/model/ItemInfoTest.java | 2 +- settings.gradle | 2 +- 28 files changed, 69 insertions(+), 69 deletions(-) rename data-prepper-plugins/saas-source-plugins/{saas-crawler => source-crawler}/build.gradle (100%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/SaasCrawlerApplicationContextMarker.java (69%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/Crawler.java (90%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/SaasClient.java (84%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/SaasPluginExecutorServiceProvider.java (95%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/SaasSourceConfig.java (67%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/SaasSourcePlugin.java (88%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/PartitionFactory.java (83%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/partition/LeaderPartition.java (89%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/partition/SaasSourcePartition.java (89%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/scheduler/LeaderScheduler.java (89%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/scheduler/WorkerScheduler.java (87%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/state/LeaderProgressState.java (83%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/state/SaasWorkerProgressState.java (88%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler}/model/ItemInfo.java (95%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/CrawlerTest.java (94%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/SaasPluginExecutorServiceProviderTest.java (96%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/base/SaasSourcePluginTest.java (96%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/PartitionFactoryTest.java (92%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/scheduler/LeaderSchedulerTest.java (92%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/scheduler/WorkerSchedulerTest.java (92%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/state/LeaderProgressStateTest.java (92%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/coordination/state/SaasWorkerProgressStateTest.java (95%) rename data-prepper-plugins/saas-source-plugins/{saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler => source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler}/model/ItemInfoTest.java (96%) diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/build.gradle b/data-prepper-plugins/saas-source-plugins/jira-source/build.gradle index 4c115a2e1d..6b36619abf 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/build.gradle +++ b/data-prepper-plugins/saas-source-plugins/jira-source/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { - implementation project(path: ':data-prepper-plugins:saas-source-plugins:saas-crawler') + implementation project(path: ':data-prepper-plugins:saas-source-plugins:source-crawler') implementation project(path: ':data-prepper-api') implementation project(path: ':data-prepper-plugins:aws-plugin-api') implementation project(path: ':data-prepper-plugins:buffer-common') @@ -15,7 +15,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-core' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'javax.inject:javax.inject:1' - implementation 'org.springframework:spring-web:5.3.39' + implementation("org.springframework:spring-web:${libs.versions.spring.get()}") implementation 'org.springframework.retry:spring-retry:1.3.4' implementation 'org.projectlombok:lombok:1.18.30' diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraClient.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraClient.java index 5447f0713c..a468513f8f 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraClient.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraClient.java @@ -3,10 +3,10 @@ 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.saas_crawler.base.SaasClient; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.SaasSourceConfig; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.SaasWorkerProgressState; -import org.opensearch.dataprepper.plugins.source.saas_crawler.model.ItemInfo; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.SaasClient; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.SaasSourceConfig; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.SaasWorkerProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.model.ItemInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraSource.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraSource.java index 3ec860af25..e5841d7ede 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraSource.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/saas/jira/JiraSource.java @@ -11,9 +11,9 @@ 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.saas_crawler.SaasCrawlerApplicationContextMarker; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.Crawler; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.SaasPluginExecutorServiceProvider; +import org.opensearch.dataprepper.plugins.source.source_crawler.SaasCrawlerApplicationContextMarker; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.Crawler; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.SaasPluginExecutorServiceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/build.gradle b/data-prepper-plugins/saas-source-plugins/source-crawler/build.gradle similarity index 100% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/build.gradle rename to data-prepper-plugins/saas-source-plugins/source-crawler/build.gradle diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/SaasCrawlerApplicationContextMarker.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/SaasCrawlerApplicationContextMarker.java similarity index 69% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/SaasCrawlerApplicationContextMarker.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/SaasCrawlerApplicationContextMarker.java index 3a6700c934..cbfafd7738 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/SaasCrawlerApplicationContextMarker.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/SaasCrawlerApplicationContextMarker.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler; +package org.opensearch.dataprepper.plugins.source.source_crawler; /** * Market interface to indicate the base package to scan for dependency injection diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/Crawler.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/Crawler.java similarity index 90% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/Crawler.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/Crawler.java index 76397cf909..2d5c4af264 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/Crawler.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/Crawler.java @@ -1,12 +1,12 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; 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.model.source.coordinator.enhanced.EnhancedSourceCoordinator; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.SaasSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.SaasWorkerProgressState; -import org.opensearch.dataprepper.plugins.source.saas_crawler.model.ItemInfo; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.SaasSourcePartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.SaasWorkerProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.model.ItemInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasClient.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasClient.java similarity index 84% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasClient.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasClient.java index c78784f298..1edff7d07d 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasClient.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasClient.java @@ -1,10 +1,10 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; 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.saas_crawler.coordination.state.SaasWorkerProgressState; -import org.opensearch.dataprepper.plugins.source.saas_crawler.model.ItemInfo; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.SaasWorkerProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.model.ItemInfo; import java.util.Iterator; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasPluginExecutorServiceProvider.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasPluginExecutorServiceProvider.java similarity index 95% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasPluginExecutorServiceProvider.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasPluginExecutorServiceProvider.java index 58823d770f..bcb8f54acf 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasPluginExecutorServiceProvider.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasPluginExecutorServiceProvider.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourceConfig.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourceConfig.java similarity index 67% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourceConfig.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourceConfig.java index 149f8f1b5d..bb6ab49ef2 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourceConfig.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourceConfig.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; /** * Marker interface to all the SAAS connectors configuration diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourcePlugin.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourcePlugin.java similarity index 88% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourcePlugin.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourcePlugin.java index 87c92fb103..be29b003d6 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourcePlugin.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourcePlugin.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; import lombok.Getter; @@ -14,10 +14,10 @@ import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; import org.opensearch.dataprepper.model.source.coordinator.enhanced.UsesEnhancedSourceCoordination; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.PartitionFactory; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.LeaderPartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.scheduler.LeaderScheduler; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.scheduler.WorkerScheduler; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.PartitionFactory; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.LeaderPartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.scheduler.LeaderScheduler; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.scheduler.WorkerScheduler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/PartitionFactory.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/PartitionFactory.java similarity index 83% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/PartitionFactory.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/PartitionFactory.java index 0615f955cb..e322a028c1 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/PartitionFactory.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/PartitionFactory.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination; import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.LeaderPartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.SaasSourcePartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.LeaderPartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.SaasSourcePartition; import java.util.function.Function; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/partition/LeaderPartition.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/partition/LeaderPartition.java similarity index 89% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/partition/LeaderPartition.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/partition/LeaderPartition.java index 9d16fa5040..a857946faf 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/partition/LeaderPartition.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/partition/LeaderPartition.java @@ -1,8 +1,8 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition; import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.LeaderProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.LeaderProgressState; import java.util.Optional; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/partition/SaasSourcePartition.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/partition/SaasSourcePartition.java similarity index 89% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/partition/SaasSourcePartition.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/partition/SaasSourcePartition.java index d64d17f8fa..aa63a411b4 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/partition/SaasSourcePartition.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/partition/SaasSourcePartition.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition; import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.SaasWorkerProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.SaasWorkerProgressState; import java.util.Optional; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/LeaderScheduler.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/LeaderScheduler.java similarity index 89% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/LeaderScheduler.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/LeaderScheduler.java index b7d887361a..dcbe4d875f 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/LeaderScheduler.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/LeaderScheduler.java @@ -1,11 +1,11 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.scheduler; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.scheduler; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.Crawler; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.SaasSourcePlugin; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.LeaderPartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.LeaderProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.Crawler; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.SaasSourcePlugin; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.LeaderPartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.LeaderProgressState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/WorkerScheduler.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/WorkerScheduler.java similarity index 87% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/WorkerScheduler.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/WorkerScheduler.java index c2829690ea..a994c95937 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/WorkerScheduler.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/WorkerScheduler.java @@ -1,14 +1,14 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.scheduler; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.scheduler; 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.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.Crawler; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.SaasSourceConfig; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.SaasSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.SaasWorkerProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.Crawler; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.SaasSourceConfig; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.SaasSourcePartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.SaasWorkerProgressState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/LeaderProgressState.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/LeaderProgressState.java similarity index 83% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/LeaderProgressState.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/LeaderProgressState.java index bc59528f62..0062ae43ab 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/LeaderProgressState.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/LeaderProgressState.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/SaasWorkerProgressState.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/SaasWorkerProgressState.java similarity index 88% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/SaasWorkerProgressState.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/SaasWorkerProgressState.java index 9ab5e171b0..f04c70a14f 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/SaasWorkerProgressState.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/SaasWorkerProgressState.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/model/ItemInfo.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/model/ItemInfo.java similarity index 95% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/model/ItemInfo.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/model/ItemInfo.java index 5dc2f86ef5..91921e9ad0 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/saas_crawler/model/ItemInfo.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/model/ItemInfo.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.model; +package org.opensearch.dataprepper.plugins.source.source_crawler.model; import lombok.Getter; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/CrawlerTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/CrawlerTest.java similarity index 94% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/CrawlerTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/CrawlerTest.java index d4f5a63f30..5c9290c2df 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/CrawlerTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/CrawlerTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -9,9 +9,9 @@ import org.opensearch.dataprepper.model.event.Event; import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.SaasSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.SaasWorkerProgressState; -import org.opensearch.dataprepper.plugins.source.saas_crawler.model.ItemInfo; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.SaasSourcePartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.SaasWorkerProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.model.ItemInfo; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasPluginExecutorServiceProviderTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasPluginExecutorServiceProviderTest.java similarity index 96% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasPluginExecutorServiceProviderTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasPluginExecutorServiceProviderTest.java index 65444e35d0..3b5d44c36b 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasPluginExecutorServiceProviderTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasPluginExecutorServiceProviderTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourcePluginTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourcePluginTest.java similarity index 96% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourcePluginTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourcePluginTest.java index 571fe94908..e0efe1b86e 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/base/SaasSourcePluginTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/SaasSourcePluginTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.base; +package org.opensearch.dataprepper.plugins.source.source_crawler.base; import org.junit.jupiter.api.BeforeEach; @@ -17,7 +17,7 @@ import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.scheduler.LeaderScheduler; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.scheduler.LeaderScheduler; import java.util.concurrent.ExecutorService; import java.util.function.Function; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/PartitionFactoryTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/PartitionFactoryTest.java similarity index 92% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/PartitionFactoryTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/PartitionFactoryTest.java index 6cf4c92fea..16bc2acb46 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/PartitionFactoryTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/PartitionFactoryTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination; import org.junit.jupiter.api.Test; @@ -7,9 +7,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.LeaderPartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.SaasSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.LeaderProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.LeaderPartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.SaasSourcePartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.LeaderProgressState; import java.util.Optional; import java.util.UUID; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/LeaderSchedulerTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/LeaderSchedulerTest.java similarity index 92% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/LeaderSchedulerTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/LeaderSchedulerTest.java index 1fffa78ed4..d357bc56f0 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/LeaderSchedulerTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/LeaderSchedulerTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.scheduler; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.scheduler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -7,9 +7,9 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.Crawler; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.SaasSourcePlugin; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.LeaderPartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.Crawler; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.SaasSourcePlugin; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.LeaderPartition; import java.time.Duration; import java.util.Optional; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/WorkerSchedulerTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/WorkerSchedulerTest.java similarity index 92% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/WorkerSchedulerTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/WorkerSchedulerTest.java index 8d7d31f3bb..92e44fd856 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/scheduler/WorkerSchedulerTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/scheduler/WorkerSchedulerTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.scheduler; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.scheduler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -10,11 +10,11 @@ import org.opensearch.dataprepper.model.source.coordinator.SourcePartitionStoreItem; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator; import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.Crawler; -import org.opensearch.dataprepper.plugins.source.saas_crawler.base.SaasSourceConfig; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.PartitionFactory; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.partition.SaasSourcePartition; -import org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state.SaasWorkerProgressState; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.Crawler; +import org.opensearch.dataprepper.plugins.source.source_crawler.base.SaasSourceConfig; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.PartitionFactory; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.partition.SaasSourcePartition; +import org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state.SaasWorkerProgressState; import java.util.Optional; import java.util.UUID; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/LeaderProgressStateTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/LeaderProgressStateTest.java similarity index 92% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/LeaderProgressStateTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/LeaderProgressStateTest.java index 897c225173..d7ebf858ea 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/LeaderProgressStateTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/LeaderProgressStateTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/SaasWorkerProgressStateTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/SaasWorkerProgressStateTest.java similarity index 95% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/SaasWorkerProgressStateTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/SaasWorkerProgressStateTest.java index d24dd1aab4..f859a9a332 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/coordination/state/SaasWorkerProgressStateTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/coordination/state/SaasWorkerProgressStateTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.coordination.state; +package org.opensearch.dataprepper.plugins.source.source_crawler.coordination.state; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/model/ItemInfoTest.java b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/model/ItemInfoTest.java similarity index 96% rename from data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/model/ItemInfoTest.java rename to data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/model/ItemInfoTest.java index c3093472aa..cf8a6fffb9 100644 --- a/data-prepper-plugins/saas-source-plugins/saas-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/saas_crawler/model/ItemInfoTest.java +++ b/data-prepper-plugins/saas-source-plugins/source-crawler/src/test/java/org/opensearch/dataprepper/plugins/source/source_crawler/model/ItemInfoTest.java @@ -1,4 +1,4 @@ -package org.opensearch.dataprepper.plugins.source.saas_crawler.model; +package org.opensearch.dataprepper.plugins.source.source_crawler.model; import lombok.NonNull; import org.junit.jupiter.api.Test; diff --git a/settings.gradle b/settings.gradle index c8349901f5..f8fc52a4d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -187,6 +187,6 @@ include 'data-prepper-plugin-schema' include 'data-prepper-plugins:kinesis-source' include 'data-prepper-plugins:opensearch-api-source' include 'data-prepper-plugins:saas-source-plugins' -include 'data-prepper-plugins:saas-source-plugins:saas-crawler' +include 'data-prepper-plugins:saas-source-plugins:source-crawler' include 'data-prepper-plugins:saas-source-plugins:jira-source'