diff --git a/CreateSnapshot/build.gradle b/CreateSnapshot/build.gradle index 1b8c77dfb..14a25540c 100644 --- a/CreateSnapshot/build.gradle +++ b/CreateSnapshot/build.gradle @@ -21,5 +21,5 @@ dependencies { } application { - mainClassName = 'com.rfs.CreateSnapshot' + mainClassName = 'org.opensearch.migrations.CreateSnapshot' } diff --git a/CreateSnapshot/src/main/java/com/rfs/CreateSnapshot.java b/CreateSnapshot/src/main/java/org/opensearch/migrations/CreateSnapshot.java similarity index 91% rename from CreateSnapshot/src/main/java/com/rfs/CreateSnapshot.java rename to CreateSnapshot/src/main/java/org/opensearch/migrations/CreateSnapshot.java index 54f23c57d..4a2a16962 100644 --- a/CreateSnapshot/src/main/java/com/rfs/CreateSnapshot.java +++ b/CreateSnapshot/src/main/java/org/opensearch/migrations/CreateSnapshot.java @@ -1,5 +1,12 @@ -package com.rfs; - +package org.opensearch.migrations; + +import org.opensearch.migrations.bulkload.common.FileSystemSnapshotCreator; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.S3SnapshotCreator; +import org.opensearch.migrations.bulkload.common.SnapshotCreator; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts.ICreateSnapshotContext; +import org.opensearch.migrations.bulkload.worker.SnapshotRunner; import org.opensearch.migrations.snapshot.creation.tracing.RootSnapshotContext; import org.opensearch.migrations.tracing.ActiveContextTracker; import org.opensearch.migrations.tracing.ActiveContextTrackerByActivityType; @@ -11,13 +18,6 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import com.beust.jcommander.ParametersDelegate; -import com.rfs.common.FileSystemSnapshotCreator; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.S3SnapshotCreator; -import com.rfs.common.SnapshotCreator; -import com.rfs.common.http.ConnectionContext; -import com.rfs.tracing.IRfsContexts.ICreateSnapshotContext; -import com.rfs.worker.SnapshotRunner; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/CreateSnapshot/src/test/resources/log4j2.properties b/CreateSnapshot/src/test/resources/log4j2.properties index 4f87b2f62..6adca47b5 100644 --- a/CreateSnapshot/src/test/resources/log4j2.properties +++ b/CreateSnapshot/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/DocumentsFromSnapshotMigration/build.gradle b/DocumentsFromSnapshotMigration/build.gradle index 369b90b47..b7abff63f 100644 --- a/DocumentsFromSnapshotMigration/build.gradle +++ b/DocumentsFromSnapshotMigration/build.gradle @@ -65,7 +65,7 @@ dependencies { } application { - mainClassName = 'com.rfs.RfsMigrateDocuments' + mainClassName = 'org.opensearch.migrations.RfsMigrateDocuments' } // Cleanup additional docker build directory diff --git a/DocumentsFromSnapshotMigration/src/main/java/com/rfs/RfsMigrateDocuments.java b/DocumentsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java similarity index 77% rename from DocumentsFromSnapshotMigration/src/main/java/com/rfs/RfsMigrateDocuments.java rename to DocumentsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java index a3d806ea0..1e47b08d9 100644 --- a/DocumentsFromSnapshotMigration/src/main/java/com/rfs/RfsMigrateDocuments.java +++ b/DocumentsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java @@ -1,4 +1,4 @@ -package com.rfs; +package org.opensearch.migrations; import java.io.IOException; import java.nio.file.Path; @@ -6,13 +6,28 @@ import java.time.Clock; import java.time.Duration; import java.util.List; -import java.util.function.BiFunction; import java.util.function.Function; -import org.opensearch.migrations.Version; -import org.opensearch.migrations.VersionConverter; +import org.opensearch.migrations.bulkload.common.DefaultSourceRepoAccessor; +import org.opensearch.migrations.bulkload.common.DocumentReindexer; +import org.opensearch.migrations.bulkload.common.FileSystemRepo; +import org.opensearch.migrations.bulkload.common.LuceneDocumentsReader; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.S3Repo; +import org.opensearch.migrations.bulkload.common.S3Uri; +import org.opensearch.migrations.bulkload.common.SnapshotShardUnpacker; +import org.opensearch.migrations.bulkload.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.models.ShardMetadata; +import org.opensearch.migrations.bulkload.workcoordination.CoordinateWorkHttpClient; +import org.opensearch.migrations.bulkload.workcoordination.IWorkCoordinator; +import org.opensearch.migrations.bulkload.workcoordination.LeaseExpireTrigger; +import org.opensearch.migrations.bulkload.workcoordination.OpenSearchWorkCoordinator; +import org.opensearch.migrations.bulkload.workcoordination.ScopedWorkCoordinator; +import org.opensearch.migrations.bulkload.worker.DocumentsRunner; +import org.opensearch.migrations.bulkload.worker.ShardWorkPreparer; import org.opensearch.migrations.cluster.ClusterProviderRegistry; -import org.opensearch.migrations.cluster.ClusterSnapshotReader; import org.opensearch.migrations.reindexer.tracing.RootDocumentMigrationContext; import org.opensearch.migrations.tracing.ActiveContextTracker; import org.opensearch.migrations.tracing.ActiveContextTrackerByActivityType; @@ -25,28 +40,6 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import com.beust.jcommander.ParametersDelegate; -import com.rfs.RfsMigrateDocuments.RunParameters; -import com.rfs.cms.CoordinateWorkHttpClient; -import com.rfs.cms.IWorkCoordinator; -import com.rfs.cms.LeaseExpireTrigger; -import com.rfs.cms.OpenSearchWorkCoordinator; -import com.rfs.cms.ScopedWorkCoordinator; -import com.rfs.common.DefaultSourceRepoAccessor; -import com.rfs.common.DocumentReindexer; -import com.rfs.common.FileSystemRepo; -import com.rfs.common.LuceneDocumentsReader; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.S3Repo; -import com.rfs.common.S3Uri; -import com.rfs.common.SnapshotShardUnpacker; -import com.rfs.common.SourceRepo; -import com.rfs.common.http.ConnectionContext; -import com.rfs.models.IndexMetadata; -import com.rfs.models.ShardMetadata; -import com.rfs.worker.DocumentsRunner; -import com.rfs.worker.ShardWorkPreparer; -import lombok.Builder; -import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; @@ -227,19 +220,19 @@ public static void main(String[] args) throws Exception { sourceResourceProvider.getBufferSizeInBytes() ); - run(RunParameters.builder() - .leaseExpireTrigger(processManager) - .workCoordinator(workCoordinator) - .reindexer(reindexer) - .snapshotName(arguments.snapshotName) - .snapshotReader(sourceResourceProvider) - .snapshotUnpacker(unpackerFactory) - .documentReader(LuceneDocumentsReader.getFactory(sourceResourceProvider)) - .indexAllowlist(arguments.indexAllowlist) - .maxInitialLeaseDuration(arguments.initialLeaseDuration) - .maxShardSizeBytes(arguments.maxShardSizeBytes) - .tracingContext(context) - .build()); + run( + LuceneDocumentsReader.getFactory(sourceResourceProvider), + reindexer, + workCoordinator, + arguments.initialLeaseDuration, + processManager, + sourceResourceProvider.getIndexMetadata(), + arguments.snapshotName, + arguments.indexAllowlist, + sourceResourceProvider.getShardMetadata(), + unpackerFactory, + arguments.maxShardSizeBytes, + context); } catch (Exception e) { log.atError().setMessage("Unexpected error running RfsWorker").setCause(e).log(); throw e; @@ -259,38 +252,40 @@ private static RootDocumentMigrationContext makeRootContext(Args arguments, Stri return new RootDocumentMigrationContext(otelSdk, compositeContextTracker); } - public static DocumentsRunner.CompletionStatus run(RunParameters params) throws Exception { - var scopedWorkCoordinator = new ScopedWorkCoordinator(params.workCoordinator, params.leaseExpireTrigger); - confirmShardPrepIsComplete( - params.snapshotReader.getIndexMetadata(), - params.snapshotName, - params.indexAllowlist, + public static DocumentsRunner.CompletionStatus run(Function readerFactory, + DocumentReindexer reindexer, + IWorkCoordinator workCoordinator, + Duration maxInitialLeaseDuration, + LeaseExpireTrigger leaseExpireTrigger, + IndexMetadata.Factory indexMetadataFactory, + String snapshotName, + List indexAllowlist, + ShardMetadata.Factory shardMetadataFactory, + SnapshotShardUnpacker.Factory unpackerFactory, + long maxShardSizeBytes, + RootDocumentMigrationContext rootDocumentContext) throws Exception + { + var scopedWorkCoordinator = new ScopedWorkCoordinator(workCoordinator, leaseExpireTrigger); + confirmShardPrepIsComplete(indexMetadataFactory, + snapshotName, + indexAllowlist, scopedWorkCoordinator, - params.tracingContext + rootDocumentContext ); - if (!params.workCoordinator.workItemsArePending( - params.tracingContext.getWorkCoordinationContext()::createItemsPendingContext + if (!workCoordinator.workItemsArePending( + rootDocumentContext.getWorkCoordinationContext()::createItemsPendingContext )) { throw new NoWorkLeftException("No work items are pending/all work items have been processed. Returning."); } - BiFunction shardFactory = (name, shard) -> { - var shardMetadataFactory = params.snapshotReader.getShardMetadata(); - var shardMetadata = shardMetadataFactory.fromRepo(params.snapshotName, name, shard); + var runner = new DocumentsRunner(scopedWorkCoordinator, maxInitialLeaseDuration, (name, shard) -> { + var shardMetadata = shardMetadataFactory.fromRepo(snapshotName, name, shard); log.info("Shard size: " + shardMetadata.getTotalSizeBytes()); - if (shardMetadata.getTotalSizeBytes() > params.maxShardSizeBytes) { - throw new DocumentsRunner.ShardTooLargeException(shardMetadata.getTotalSizeBytes(), params.maxShardSizeBytes); + if (shardMetadata.getTotalSizeBytes() > maxShardSizeBytes) { + throw new DocumentsRunner.ShardTooLargeException(shardMetadata.getTotalSizeBytes(), maxShardSizeBytes); } return shardMetadata; - }; - var runner = new DocumentsRunner( - scopedWorkCoordinator, - params.maxInitialLeaseDuration, - shardFactory, - params.snapshotUnpacker, - params.documentReader, - params.reindexer); - var migrationStatus = runner.migrateNextShard(params.tracingContext::createReindexContext); - return migrationStatus; + }, unpackerFactory, readerFactory, reindexer); + return runner.migrateNextShard(rootDocumentContext::createReindexContext); } private static void confirmShardPrepIsComplete( @@ -333,29 +328,4 @@ private static void confirmShardPrepIsComplete( } } } - - @Builder - static class RunParameters { - @NonNull - final LeaseExpireTrigger leaseExpireTrigger; - @NonNull - final IWorkCoordinator workCoordinator; - @NonNull - final String snapshotName; - @NonNull - final ClusterSnapshotReader snapshotReader; - @NonNull - final SnapshotShardUnpacker.Factory snapshotUnpacker; - @NonNull - final Function documentReader; - @NonNull - final DocumentReindexer reindexer; - @NonNull - final List indexAllowlist; - @NonNull - final Duration maxInitialLeaseDuration; - final long maxShardSizeBytes; - @NonNull - final RootDocumentMigrationContext tracingContext; - } } diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/EndToEndTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java similarity index 89% rename from DocumentsFromSnapshotMigration/src/test/java/com/rfs/EndToEndTest.java rename to DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java index 0ad7f1846..6b814e53a 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/EndToEndTest.java +++ b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java @@ -1,4 +1,4 @@ -package com.rfs; +package org.opensearch.migrations.bulkload; import java.io.File; import java.util.List; @@ -10,17 +10,17 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; +import org.opensearch.migrations.bulkload.common.FileSystemRepo; +import org.opensearch.migrations.bulkload.common.FileSystemSnapshotCreator; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; +import org.opensearch.migrations.bulkload.http.ClusterOperations; +import org.opensearch.migrations.bulkload.worker.DocumentsRunner; +import org.opensearch.migrations.bulkload.worker.SnapshotRunner; import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext; import org.opensearch.migrations.snapshot.creation.tracing.SnapshotTestContext; -import com.rfs.common.FileSystemRepo; -import com.rfs.common.FileSystemSnapshotCreator; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.http.ConnectionContextTestParams; -import com.rfs.framework.SearchClusterContainer; -import com.rfs.http.ClusterOperations; -import com.rfs.worker.DocumentsRunner; -import com.rfs.worker.SnapshotRunner; import lombok.SneakyThrows; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/ParallelDocumentMigrationsTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java similarity index 96% rename from DocumentsFromSnapshotMigration/src/test/java/com/rfs/ParallelDocumentMigrationsTest.java rename to DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java index e846ce7c3..8cb185683 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/ParallelDocumentMigrationsTest.java +++ b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java @@ -1,4 +1,4 @@ -package com.rfs; +package org.opensearch.migrations.bulkload; import java.nio.file.Files; import java.util.ArrayList; @@ -20,12 +20,13 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.opensearch.migrations.CreateSnapshot; +import org.opensearch.migrations.bulkload.common.FileSystemRepo; +import org.opensearch.migrations.bulkload.framework.PreloadedSearchClusterContainer; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext; import org.opensearch.migrations.snapshot.creation.tracing.SnapshotTestContext; -import com.rfs.common.FileSystemRepo; -import com.rfs.framework.PreloadedSearchClusterContainer; -import com.rfs.framework.SearchClusterContainer; import lombok.Lombok; import lombok.extern.slf4j.Slf4j; diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/PerformanceVerificationTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java similarity index 93% rename from DocumentsFromSnapshotMigration/src/test/java/com/rfs/PerformanceVerificationTest.java rename to DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java index 6d34df0a2..a65c3c790 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/PerformanceVerificationTest.java +++ b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java @@ -1,4 +1,4 @@ -package com.rfs; +package org.opensearch.migrations.bulkload; import java.nio.file.Paths; import java.util.List; @@ -16,14 +16,14 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.opensearch.migrations.bulkload.common.DocumentReindexer; +import org.opensearch.migrations.bulkload.common.LuceneDocumentsReader; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.OpenSearchClient.BulkResponse; +import org.opensearch.migrations.bulkload.common.RfsLuceneDocument; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; import org.opensearch.migrations.reindexer.tracing.IDocumentMigrationContexts; -import com.rfs.common.DocumentReindexer; -import com.rfs.common.LuceneDocumentsReader; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.OpenSearchClient.BulkResponse; -import com.rfs.common.RfsLuceneDocument; -import com.rfs.tracing.IRfsContexts; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/ProcessLifecycleTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java similarity index 96% rename from DocumentsFromSnapshotMigration/src/test/java/com/rfs/ProcessLifecycleTest.java rename to DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java index 1c06d167e..b577ddd3e 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/ProcessLifecycleTest.java +++ b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java @@ -1,4 +1,4 @@ -package com.rfs; +package org.opensearch.migrations.bulkload; import java.io.BufferedReader; import java.io.File; @@ -16,12 +16,13 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; +import org.opensearch.migrations.CreateSnapshot; +import org.opensearch.migrations.bulkload.framework.PreloadedSearchClusterContainer; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; import org.opensearch.migrations.snapshot.creation.tracing.SnapshotTestContext; import org.opensearch.migrations.testutils.ToxiProxyWrapper; import org.opensearch.testcontainers.OpensearchContainer; -import com.rfs.framework.PreloadedSearchClusterContainer; -import com.rfs.framework.SearchClusterContainer; import eu.rekawek.toxiproxy.model.ToxicDirection; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -190,7 +191,7 @@ private static ProcessBuilder setupProcess( javaExecutable, "-cp", classpath, - "com.rfs.RfsMigrateDocuments" + "org.opensearch.migrations.RfsMigrateDocuments" ); processBuilder.command().addAll(Arrays.asList(args)); processBuilder.redirectErrorStream(true); diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/SourceTestBase.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java similarity index 77% rename from DocumentsFromSnapshotMigration/src/test/java/com/rfs/SourceTestBase.java rename to DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java index 5fed0ee79..24223d259 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/SourceTestBase.java +++ b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java @@ -1,4 +1,4 @@ -package com.rfs; +package org.opensearch.migrations.bulkload; import java.io.IOException; @@ -19,27 +19,27 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; +import org.opensearch.migrations.RfsMigrateDocuments; import org.opensearch.migrations.Version; +import org.opensearch.migrations.bulkload.common.DefaultSourceRepoAccessor; +import org.opensearch.migrations.bulkload.common.DocumentReindexer; +import org.opensearch.migrations.bulkload.common.FileSystemRepo; +import org.opensearch.migrations.bulkload.common.LuceneDocumentsReader; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.RestClient; +import org.opensearch.migrations.bulkload.common.RfsLuceneDocument; +import org.opensearch.migrations.bulkload.common.SnapshotShardUnpacker; +import org.opensearch.migrations.bulkload.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; +import org.opensearch.migrations.bulkload.http.SearchClusterRequests; +import org.opensearch.migrations.bulkload.workcoordination.CoordinateWorkHttpClient; +import org.opensearch.migrations.bulkload.workcoordination.LeaseExpireTrigger; +import org.opensearch.migrations.bulkload.workcoordination.OpenSearchWorkCoordinator; +import org.opensearch.migrations.bulkload.worker.DocumentsRunner; import org.opensearch.migrations.cluster.ClusterProviderRegistry; import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext; -import com.rfs.RfsMigrateDocuments.RunParameters; -import com.rfs.cms.CoordinateWorkHttpClient; -import com.rfs.cms.LeaseExpireTrigger; -import com.rfs.cms.OpenSearchWorkCoordinator; -import com.rfs.common.DefaultSourceRepoAccessor; -import com.rfs.common.DocumentReindexer; -import com.rfs.common.FileSystemRepo; -import com.rfs.common.LuceneDocumentsReader; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.RestClient; -import com.rfs.common.RfsLuceneDocument; -import com.rfs.common.SnapshotShardUnpacker; -import com.rfs.common.SourceRepo; -import com.rfs.common.http.ConnectionContextTestParams; -import com.rfs.framework.SearchClusterContainer; -import com.rfs.http.SearchClusterRequests; -import com.rfs.worker.DocumentsRunner; import lombok.AllArgsConstructor; import lombok.Lombok; import lombok.SneakyThrows; @@ -202,24 +202,31 @@ public static DocumentsRunner.CompletionStatus migrateDocumentsWithOneWorker( UUID.randomUUID().toString(), Clock.offset(Clock.systemUTC(), Duration.ofMillis(nextClockShift)) )) { - return RfsMigrateDocuments.run(RunParameters.builder() - .leaseExpireTrigger(processManager) - .workCoordinator(workCoordinator) - .snapshotName(snapshotName) - .snapshotReader(sourceResourceProvider) - .snapshotUnpacker(unpackerFactory) - .documentReader(readerFactory) - .reindexer(new DocumentReindexer(new OpenSearchClient(ConnectionContextTestParams.builder() + return RfsMigrateDocuments.run( + readerFactory, + new DocumentReindexer(new OpenSearchClient(ConnectionContextTestParams.builder() .host(targetAddress) .compressionEnabled(compressionEnabled) .build() - .toConnectionContext()), 1000, Long.MAX_VALUE, 1)) - .maxInitialLeaseDuration(Duration.ofMinutes(10)) - .indexAllowlist(indexAllowlist) - .maxShardSizeBytes(MAX_SHARD_SIZE_BYTES) - .tracingContext(context) - .build() - ); + .toConnectionContext()), 1000, Long.MAX_VALUE, 1), + new OpenSearchWorkCoordinator( + new CoordinateWorkHttpClient(ConnectionContextTestParams.builder() + .host(targetAddress) + .build() + .toConnectionContext()), + TOLERABLE_CLIENT_SERVER_CLOCK_DIFFERENCE_SECONDS, + UUID.randomUUID().toString(), + Clock.offset(Clock.systemUTC(), Duration.ofMillis(nextClockShift)) + ), + Duration.ofMinutes(10), + processManager, + sourceResourceProvider.getIndexMetadata(), + snapshotName, + indexAllowlist, + sourceResourceProvider.getShardMetadata(), + unpackerFactory, + MAX_SHARD_SIZE_BYTES, + context); } } finally { deleteTree(tempDir); diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/SupportedTargetCluster.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java similarity index 80% rename from DocumentsFromSnapshotMigration/src/test/java/com/rfs/SupportedTargetCluster.java rename to DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java index c71a3f1c6..b7fd25a1b 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/SupportedTargetCluster.java +++ b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java @@ -1,4 +1,4 @@ -package com.rfs; +package org.opensearch.migrations.bulkload; import java.util.stream.Stream; @@ -6,7 +6,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; -import com.rfs.framework.SearchClusterContainer; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; /** * Defines all supported target clusters diff --git a/DocumentsFromSnapshotMigration/src/test/resources/log4j2.properties b/DocumentsFromSnapshotMigration/src/test/resources/log4j2.properties index a389da4cd..20171c3b6 100644 --- a/DocumentsFromSnapshotMigration/src/test/resources/log4j2.properties +++ b/DocumentsFromSnapshotMigration/src/test/resources/log4j2.properties @@ -33,7 +33,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/MigrateOrEvaluateArgs.java b/MetadataMigration/src/main/java/org/opensearch/migrations/MigrateOrEvaluateArgs.java index b05ffc5e2..037a6f881 100644 --- a/MetadataMigration/src/main/java/org/opensearch/migrations/MigrateOrEvaluateArgs.java +++ b/MetadataMigration/src/main/java/org/opensearch/migrations/MigrateOrEvaluateArgs.java @@ -2,10 +2,11 @@ +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.models.DataFilterArgs; + import com.beust.jcommander.Parameter; import com.beust.jcommander.ParametersDelegate; -import com.rfs.common.http.ConnectionContext; -import com.rfs.models.DataFilterArgs; public class MigrateOrEvaluateArgs { @Parameter(names = {"--help", "-h"}, help = true, description = "Displays information about how to use this tool") diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/cli/ClusterReaderExtractor.java b/MetadataMigration/src/main/java/org/opensearch/migrations/cli/ClusterReaderExtractor.java index 00ef9a4ce..f389a5968 100644 --- a/MetadataMigration/src/main/java/org/opensearch/migrations/cli/ClusterReaderExtractor.java +++ b/MetadataMigration/src/main/java/org/opensearch/migrations/cli/ClusterReaderExtractor.java @@ -4,15 +4,15 @@ import org.opensearch.migrations.MigrateOrEvaluateArgs; import org.opensearch.migrations.Version; +import org.opensearch.migrations.bulkload.common.FileSystemRepo; +import org.opensearch.migrations.bulkload.common.S3Repo; +import org.opensearch.migrations.bulkload.common.S3Uri; +import org.opensearch.migrations.bulkload.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; import org.opensearch.migrations.cluster.ClusterProviderRegistry; import org.opensearch.migrations.cluster.ClusterReader; import com.beust.jcommander.ParameterException; -import com.rfs.common.FileSystemRepo; -import com.rfs.common.S3Repo; -import com.rfs.common.S3Uri; -import com.rfs.common.SourceRepo; -import com.rfs.common.http.ConnectionContext; import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigratorEvaluatorBase.java b/MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigratorEvaluatorBase.java index 859d5addc..f862152db 100644 --- a/MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigratorEvaluatorBase.java +++ b/MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigratorEvaluatorBase.java @@ -4,6 +4,11 @@ import org.opensearch.migrations.MigrateOrEvaluateArgs; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.transformers.TransformFunctions; +import org.opensearch.migrations.bulkload.transformers.Transformer; +import org.opensearch.migrations.bulkload.worker.IndexMetadataResults; +import org.opensearch.migrations.bulkload.worker.IndexRunner; +import org.opensearch.migrations.bulkload.worker.MetadataRunner; import org.opensearch.migrations.cli.ClusterReaderExtractor; import org.opensearch.migrations.cli.Clusters; import org.opensearch.migrations.cli.Items; @@ -11,11 +16,6 @@ import org.opensearch.migrations.metadata.GlobalMetadataCreatorResults; import org.opensearch.migrations.metadata.tracing.RootMetadataMigrationContext; -import com.rfs.transformers.TransformFunctions; -import com.rfs.transformers.Transformer; -import com.rfs.worker.IndexMetadataResults; -import com.rfs.worker.IndexRunner; -import com.rfs.worker.MetadataRunner; import lombok.extern.slf4j.Slf4j; /** Shared functionality between migration and evaluation commands */ diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java index f438aef2c..173150998 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java +++ b/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java @@ -11,17 +11,17 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.opensearch.migrations.bulkload.common.FileSystemSnapshotCreator; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; +import org.opensearch.migrations.bulkload.http.ClusterOperations; +import org.opensearch.migrations.bulkload.models.DataFilterArgs; +import org.opensearch.migrations.bulkload.worker.SnapshotRunner; import org.opensearch.migrations.commands.MigrationItemResult; import org.opensearch.migrations.metadata.tracing.MetadataMigrationTestContext; import org.opensearch.migrations.snapshot.creation.tracing.SnapshotTestContext; -import com.rfs.common.FileSystemSnapshotCreator; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.http.ConnectionContextTestParams; -import com.rfs.framework.SearchClusterContainer; -import com.rfs.http.ClusterOperations; -import com.rfs.models.DataFilterArgs; -import com.rfs.worker.SnapshotRunner; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClusterReaderExtractorTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClusterReaderExtractorTest.java index dd6325aa5..9d6deae5c 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClusterReaderExtractorTest.java +++ b/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClusterReaderExtractorTest.java @@ -4,12 +4,12 @@ import org.opensearch.migrations.MigrateOrEvaluateArgs; import org.opensearch.migrations.Version; +import org.opensearch.migrations.bulkload.common.FileSystemRepo; +import org.opensearch.migrations.bulkload.common.S3Repo; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; import org.opensearch.migrations.cluster.ClusterReader; import com.beust.jcommander.ParameterException; -import com.rfs.common.FileSystemRepo; -import com.rfs.common.S3Repo; -import com.rfs.common.http.ConnectionContext; import org.mockito.ArgumentCaptor; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/MetadataMigration/src/test/resources/log4j2.properties b/MetadataMigration/src/test/resources/log4j2.properties index 7171a6322..8e9358f4a 100644 --- a/MetadataMigration/src/test/resources/log4j2.properties +++ b/MetadataMigration/src/test/resources/log4j2.properties @@ -14,7 +14,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} @@ -22,7 +22,7 @@ logger.migration.level = ${ownedPackagesLogLevel} logger.migrations.name = com.opensearch.migrations logger.migrations.level = debug -logger.transformer.name = com.rfs.transformers.Transformer_ES_6_8_to_OS_2_11 +logger.transformer.name = org.opensearch.migrations.bulkload.transformers.Transformer_ES_6_8_to_OS_2_11 logger.transformer.level = debug # Lower the logging level on these other systems diff --git a/RFS/src/main/java/com/rfs/common/ByteArrayIndexInput.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/ByteArrayIndexInput.java similarity index 98% rename from RFS/src/main/java/com/rfs/common/ByteArrayIndexInput.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/ByteArrayIndexInput.java index 9712c4a66..0143b8047 100644 --- a/RFS/src/main/java/com/rfs/common/ByteArrayIndexInput.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/ByteArrayIndexInput.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.EOFException; import java.io.IOException; diff --git a/RFS/src/main/java/com/rfs/common/DefaultSourceRepoAccessor.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/DefaultSourceRepoAccessor.java similarity index 93% rename from RFS/src/main/java/com/rfs/common/DefaultSourceRepoAccessor.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/DefaultSourceRepoAccessor.java index 385a79ac5..51e0fe4db 100644 --- a/RFS/src/main/java/com/rfs/common/DefaultSourceRepoAccessor.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/DefaultSourceRepoAccessor.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.InputStream; import java.nio.file.Files; diff --git a/RFS/src/main/java/com/rfs/common/DocumentReindexer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/DocumentReindexer.java similarity index 99% rename from RFS/src/main/java/com/rfs/common/DocumentReindexer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/DocumentReindexer.java index 2110eceb5..9e003706c 100644 --- a/RFS/src/main/java/com/rfs/common/DocumentReindexer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/DocumentReindexer.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.Collection; import java.util.List; diff --git a/RFS/src/main/java/com/rfs/common/EphemeralSourceRepoAccessor.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/EphemeralSourceRepoAccessor.java similarity index 97% rename from RFS/src/main/java/com/rfs/common/EphemeralSourceRepoAccessor.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/EphemeralSourceRepoAccessor.java index 395199b26..1f59f441c 100644 --- a/RFS/src/main/java/com/rfs/common/EphemeralSourceRepoAccessor.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/EphemeralSourceRepoAccessor.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.FileInputStream; import java.io.IOException; diff --git a/RFS/src/main/java/com/rfs/common/FileSystemRepo.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemRepo.java similarity index 96% rename from RFS/src/main/java/com/rfs/common/FileSystemRepo.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemRepo.java index f9e63d30d..d77490ba2 100644 --- a/RFS/src/main/java/com/rfs/common/FileSystemRepo.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemRepo.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.IOException; import java.nio.file.DirectoryStream; @@ -7,7 +7,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import lombok.ToString; @ToString diff --git a/RFS/src/main/java/com/rfs/common/FileSystemSnapshotCreator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemSnapshotCreator.java similarity index 89% rename from RFS/src/main/java/com/rfs/common/FileSystemSnapshotCreator.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemSnapshotCreator.java index ce5fee8b9..b877f0eb8 100644 --- a/RFS/src/main/java/com/rfs/common/FileSystemSnapshotCreator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemSnapshotCreator.java @@ -1,9 +1,9 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; public class FileSystemSnapshotCreator extends SnapshotCreator { private static final ObjectMapper mapper = new ObjectMapper(); diff --git a/RFS/src/main/java/com/rfs/common/FilterScheme.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FilterScheme.java similarity index 93% rename from RFS/src/main/java/com/rfs/common/FilterScheme.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/FilterScheme.java index c18e88954..da44d9c8c 100644 --- a/RFS/src/main/java/com/rfs/common/FilterScheme.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FilterScheme.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.List; import java.util.function.BiConsumer; diff --git a/RFS/src/main/java/com/rfs/common/InvalidResponse.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java similarity index 96% rename from RFS/src/main/java/com/rfs/common/InvalidResponse.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java index 007d65181..21f55415b 100644 --- a/RFS/src/main/java/com/rfs/common/InvalidResponse.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.ArrayList; import java.util.Map; @@ -11,7 +11,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rfs.common.http.HttpResponse; +import org.opensearch.migrations.bulkload.common.http.HttpResponse; + import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/RFS/src/main/java/com/rfs/common/Logging.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/Logging.java similarity index 95% rename from RFS/src/main/java/com/rfs/common/Logging.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/Logging.java index 5bcc67081..da6897540 100644 --- a/RFS/src/main/java/com/rfs/common/Logging.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/Logging.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/RFS/src/main/java/com/rfs/common/LuceneDocumentsReader.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java similarity index 99% rename from RFS/src/main/java/com/rfs/common/LuceneDocumentsReader.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java index 11b02fe6e..f87502629 100644 --- a/RFS/src/main/java/com/rfs/common/LuceneDocumentsReader.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.IOException; import java.nio.file.Path; diff --git a/RFS/src/main/java/com/rfs/common/MovementType.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/MovementType.java similarity index 94% rename from RFS/src/main/java/com/rfs/common/MovementType.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/MovementType.java index 1291c725a..f3f1fb77a 100644 --- a/RFS/src/main/java/com/rfs/common/MovementType.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/MovementType.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import com.beust.jcommander.IStringConverter; import com.beust.jcommander.ParameterException; diff --git a/RFS/src/main/java/com/rfs/common/OpenSearchClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/OpenSearchClient.java similarity index 97% rename from RFS/src/main/java/com/rfs/common/OpenSearchClient.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/OpenSearchClient.java index f63d11da4..2f9e5d289 100644 --- a/RFS/src/main/java/com/rfs/common/OpenSearchClient.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/OpenSearchClient.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.IOException; import java.net.HttpURLConnection; @@ -17,13 +17,12 @@ import org.opensearch.migrations.Flavor; import org.opensearch.migrations.Version; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.common.http.HttpResponse; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; import org.opensearch.migrations.parsing.BulkResponseParser; import org.opensearch.migrations.reindexer.FailedRequestsLogger; -import com.rfs.common.DocumentReindexer.BulkDocSection; -import com.rfs.common.http.ConnectionContext; -import com.rfs.common.http.HttpResponse; -import com.rfs.tracing.IRfsContexts; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; @@ -364,7 +363,7 @@ Retry getBulkRetryStrategy() { return bulkRetryStrategy; } - public Mono sendBulkRequest(String indexName, List docs, IRfsContexts.IRequestContext context) { + public Mono sendBulkRequest(String indexName, List docs, IRfsContexts.IRequestContext context) { final var docsMap = docs.stream().collect(Collectors.toMap(d -> d.getDocId(), d -> d)); return Mono.defer(() -> { final String targetPath = indexName + "/_bulk"; @@ -372,7 +371,7 @@ public Mono sendBulkRequest(String indexName, List .setMessage("Creating bulk body with document ids {}") .addArgument(() -> docsMap.keySet()) .log(); - var body = BulkDocSection.convertToBulkRequestBody(docsMap.values()); + var body = DocumentReindexer.BulkDocSection.convertToBulkRequestBody(docsMap.values()); var additionalHeaders = new HashMap>(); // Reduce network bandwidth by attempting request and response compression if (client.supportsGzipCompression()) { @@ -403,7 +402,7 @@ public Mono sendBulkRequest(String indexName, List failedRequestsLogger.logBulkFailure( indexName, docsMap::size, - () -> BulkDocSection.convertToBulkRequestBody(docsMap.values()), + () -> DocumentReindexer.BulkDocSection.convertToBulkRequestBody(docsMap.values()), error ); } else { diff --git a/RFS/src/main/java/com/rfs/common/PartSliceStream.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/PartSliceStream.java similarity index 96% rename from RFS/src/main/java/com/rfs/common/PartSliceStream.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/PartSliceStream.java index bc06841c0..d4f0eec87 100644 --- a/RFS/src/main/java/com/rfs/common/PartSliceStream.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/PartSliceStream.java @@ -1,9 +1,9 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.IOException; import java.io.InputStream; -import com.rfs.models.ShardFileInfo; +import org.opensearch.migrations.bulkload.models.ShardFileInfo; /** * Taken from Elasticsearch 6.8, combining the SlicedInputStream and PartSliceStream classes with our special sauce diff --git a/RFS/src/main/java/com/rfs/common/RestClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RestClient.java similarity index 95% rename from RFS/src/main/java/com/rfs/common/RestClient.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/RestClient.java index a0c6eb755..9b3f9fb08 100644 --- a/RFS/src/main/java/com/rfs/common/RestClient.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RestClient.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -12,13 +12,14 @@ import javax.net.ssl.SSLException; import javax.net.ssl.SSLParameters; -import com.rfs.common.http.CompositeTransformer; -import com.rfs.common.http.ConnectionContext; -import com.rfs.common.http.GzipPayloadRequestTransformer; -import com.rfs.common.http.HttpResponse; -import com.rfs.netty.ReadMeteringHandler; -import com.rfs.netty.WriteMeteringHandler; -import com.rfs.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.common.http.CompositeTransformer; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.common.http.GzipPayloadRequestTransformer; +import org.opensearch.migrations.bulkload.common.http.HttpResponse; +import org.opensearch.migrations.bulkload.netty.ReadMeteringHandler; +import org.opensearch.migrations.bulkload.netty.WriteMeteringHandler; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; + import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelPipeline; diff --git a/RFS/src/main/java/com/rfs/common/RfsException.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RfsException.java similarity index 81% rename from RFS/src/main/java/com/rfs/common/RfsException.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/RfsException.java index 194ea031f..2926a33a6 100644 --- a/RFS/src/main/java/com/rfs/common/RfsException.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RfsException.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; public class RfsException extends RuntimeException { public RfsException(String message) { diff --git a/RFS/src/main/java/com/rfs/common/RfsLuceneDocument.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RfsLuceneDocument.java similarity index 75% rename from RFS/src/main/java/com/rfs/common/RfsLuceneDocument.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/RfsLuceneDocument.java index a09225d82..13278d105 100644 --- a/RFS/src/main/java/com/rfs/common/RfsLuceneDocument.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RfsLuceneDocument.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import lombok.RequiredArgsConstructor; diff --git a/RFS/src/main/java/com/rfs/common/S3Repo.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3Repo.java similarity index 98% rename from RFS/src/main/java/com/rfs/common/S3Repo.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3Repo.java index 53c1df534..6627d6753 100644 --- a/RFS/src/main/java/com/rfs/common/S3Repo.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3Repo.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.IOException; import java.nio.file.Files; @@ -9,7 +9,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import lombok.ToString; import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; import software.amazon.awssdk.core.async.AsyncResponseTransformer; diff --git a/RFS/src/main/java/com/rfs/common/S3SnapshotCreator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3SnapshotCreator.java similarity index 96% rename from RFS/src/main/java/com/rfs/common/S3SnapshotCreator.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3SnapshotCreator.java index be25e6732..04925760d 100644 --- a/RFS/src/main/java/com/rfs/common/S3SnapshotCreator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3SnapshotCreator.java @@ -1,9 +1,9 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; public class S3SnapshotCreator extends SnapshotCreator { private static final ObjectMapper mapper = new ObjectMapper(); diff --git a/RFS/src/main/java/com/rfs/common/S3Uri.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3Uri.java similarity index 91% rename from RFS/src/main/java/com/rfs/common/S3Uri.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3Uri.java index 8075e923e..e88cf1116 100644 --- a/RFS/src/main/java/com/rfs/common/S3Uri.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3Uri.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; public class S3Uri { public final String bucketName; diff --git a/RFS/src/main/java/com/rfs/common/SnapshotCreator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotCreator.java similarity index 97% rename from RFS/src/main/java/com/rfs/common/SnapshotCreator.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotCreator.java index 32ce67ef3..53942e4e6 100644 --- a/RFS/src/main/java/com/rfs/common/SnapshotCreator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotCreator.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.Optional; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.rfs.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; public abstract class SnapshotCreator { private static final Logger logger = LogManager.getLogger(SnapshotCreator.class); diff --git a/RFS/src/main/java/com/rfs/common/SnapshotRepo.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotRepo.java similarity index 96% rename from RFS/src/main/java/com/rfs/common/SnapshotRepo.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotRepo.java index d65f919d6..fb45d152f 100644 --- a/RFS/src/main/java/com/rfs/common/SnapshotRepo.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotRepo.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.List; diff --git a/RFS/src/main/java/com/rfs/common/SnapshotShardUnpacker.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotShardUnpacker.java similarity index 95% rename from RFS/src/main/java/com/rfs/common/SnapshotShardUnpacker.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotShardUnpacker.java index 2978a0010..6869d81a8 100644 --- a/RFS/src/main/java/com/rfs/common/SnapshotShardUnpacker.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotShardUnpacker.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.InputStream; import java.nio.file.Files; @@ -13,8 +13,9 @@ import org.apache.lucene.store.NativeFSLockFactory; import org.apache.lucene.util.BytesRef; -import com.rfs.models.ShardFileInfo; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.models.ShardFileInfo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/RFS/src/main/java/com/rfs/common/SourceRepo.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SourceRepo.java similarity index 88% rename from RFS/src/main/java/com/rfs/common/SourceRepo.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/SourceRepo.java index fc29e3a8d..fb5976eec 100644 --- a/RFS/src/main/java/com/rfs/common/SourceRepo.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SourceRepo.java @@ -1,8 +1,8 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.nio.file.Path; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.models.ShardMetadata; public interface SourceRepo { public Path getRepoRootDir(); diff --git a/RFS/src/main/java/com/rfs/common/SourceRepoAccessor.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SourceRepoAccessor.java similarity index 93% rename from RFS/src/main/java/com/rfs/common/SourceRepoAccessor.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/SourceRepoAccessor.java index 3bd9a9e8f..0a9d4a0ba 100644 --- a/RFS/src/main/java/com/rfs/common/SourceRepoAccessor.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SourceRepoAccessor.java @@ -1,9 +1,9 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.InputStream; import java.nio.file.Path; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.models.ShardMetadata; // TODO: find a better approach to this (see https://opensearch.atlassian.net/browse/MIGRATIONS-1786) public abstract class SourceRepoAccessor { diff --git a/RFS/src/main/java/com/rfs/common/Uid.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/Uid.java similarity index 98% rename from RFS/src/main/java/com/rfs/common/Uid.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/Uid.java index ead992f7b..8bde19ac1 100644 --- a/RFS/src/main/java/com/rfs/common/Uid.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/Uid.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.Arrays; import java.util.Base64; diff --git a/RFS/src/main/java/com/rfs/common/http/BasicAuthTransformer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/BasicAuthTransformer.java similarity index 93% rename from RFS/src/main/java/com/rfs/common/http/BasicAuthTransformer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/BasicAuthTransformer.java index 67286ff02..140274d6b 100644 --- a/RFS/src/main/java/com/rfs/common/http/BasicAuthTransformer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/BasicAuthTransformer.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.util.Base64; diff --git a/RFS/src/main/java/com/rfs/common/http/CompositeTransformer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformer.java similarity index 93% rename from RFS/src/main/java/com/rfs/common/http/CompositeTransformer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformer.java index 65c95428d..75ce8d1e0 100644 --- a/RFS/src/main/java/com/rfs/common/http/CompositeTransformer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformer.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.util.List; diff --git a/RFS/src/main/java/com/rfs/common/http/ConnectionContext.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/ConnectionContext.java similarity index 99% rename from RFS/src/main/java/com/rfs/common/http/ConnectionContext.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/ConnectionContext.java index 05eafe29a..ad441fd07 100644 --- a/RFS/src/main/java/com/rfs/common/http/ConnectionContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/ConnectionContext.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.net.URI; import java.net.URISyntaxException; diff --git a/RFS/src/main/java/com/rfs/common/http/GzipPayloadRequestTransformer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformer.java similarity index 98% rename from RFS/src/main/java/com/rfs/common/http/GzipPayloadRequestTransformer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformer.java index e744fd2c9..f3c6744a7 100644 --- a/RFS/src/main/java/com/rfs/common/http/GzipPayloadRequestTransformer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformer.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/RFS/src/main/java/com/rfs/common/http/HttpResponse.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/HttpResponse.java similarity index 83% rename from RFS/src/main/java/com/rfs/common/http/HttpResponse.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/HttpResponse.java index 711086d9a..14cd356dd 100644 --- a/RFS/src/main/java/com/rfs/common/http/HttpResponse.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/HttpResponse.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.util.Map; diff --git a/RFS/src/main/java/com/rfs/common/http/NoAuthTransformer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/NoAuthTransformer.java similarity index 89% rename from RFS/src/main/java/com/rfs/common/http/NoAuthTransformer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/NoAuthTransformer.java index f1ce04d8b..1e63bcfc9 100644 --- a/RFS/src/main/java/com/rfs/common/http/NoAuthTransformer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/NoAuthTransformer.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/RFS/src/main/java/com/rfs/common/http/RequestTransformer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/RequestTransformer.java similarity index 83% rename from RFS/src/main/java/com/rfs/common/http/RequestTransformer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/RequestTransformer.java index 54176c075..f5fc738c9 100644 --- a/RFS/src/main/java/com/rfs/common/http/RequestTransformer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/RequestTransformer.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.util.List; diff --git a/RFS/src/main/java/com/rfs/common/http/SigV4AuthTransformer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformer.java similarity index 97% rename from RFS/src/main/java/com/rfs/common/http/SigV4AuthTransformer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformer.java index a5172a2ad..67303e28c 100644 --- a/RFS/src/main/java/com/rfs/common/http/SigV4AuthTransformer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformer.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.time.Clock; diff --git a/RFS/src/main/java/com/rfs/common/http/TransformedRequest.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/TransformedRequest.java similarity index 81% rename from RFS/src/main/java/com/rfs/common/http/TransformedRequest.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/TransformedRequest.java index bacb81c94..8d07cc084 100644 --- a/RFS/src/main/java/com/rfs/common/http/TransformedRequest.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/http/TransformedRequest.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.util.List; diff --git a/RFS/src/main/java/com/rfs/models/DataFilterArgs.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/DataFilterArgs.java similarity index 95% rename from RFS/src/main/java/com/rfs/models/DataFilterArgs.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/models/DataFilterArgs.java index f72f776ea..b3e424281 100644 --- a/RFS/src/main/java/com/rfs/models/DataFilterArgs.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/DataFilterArgs.java @@ -1,4 +1,4 @@ -package com.rfs.models; +package org.opensearch.migrations.bulkload.models; import java.util.List; diff --git a/RFS/src/main/java/com/rfs/models/GlobalMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/GlobalMetadata.java similarity index 93% rename from RFS/src/main/java/com/rfs/models/GlobalMetadata.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/models/GlobalMetadata.java index 3ce32efc9..a1e4fcd3b 100644 --- a/RFS/src/main/java/com/rfs/models/GlobalMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/GlobalMetadata.java @@ -1,4 +1,4 @@ -package com.rfs.models; +package org.opensearch.migrations.bulkload.models; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -11,9 +11,9 @@ import com.fasterxml.jackson.dataformat.smile.SmileFactory; import org.apache.lucene.codecs.CodecUtil; -import com.rfs.common.ByteArrayIndexInput; -import com.rfs.common.RfsException; -import com.rfs.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.ByteArrayIndexInput; +import org.opensearch.migrations.bulkload.common.RfsException; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; public interface GlobalMetadata { /** diff --git a/RFS/src/main/java/com/rfs/models/IndexMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/IndexMetadata.java similarity index 93% rename from RFS/src/main/java/com/rfs/models/IndexMetadata.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/models/IndexMetadata.java index 60f96a340..c493038f9 100644 --- a/RFS/src/main/java/com/rfs/models/IndexMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/IndexMetadata.java @@ -1,4 +1,4 @@ -package com.rfs.models; +package org.opensearch.migrations.bulkload.models; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -10,12 +10,11 @@ import com.fasterxml.jackson.dataformat.smile.SmileFactory; import org.apache.lucene.codecs.CodecUtil; +import org.opensearch.migrations.bulkload.common.ByteArrayIndexInput; +import org.opensearch.migrations.bulkload.common.RfsException; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; import org.opensearch.migrations.transformation.entity.Index; -import com.rfs.common.ByteArrayIndexInput; -import com.rfs.common.RfsException; -import com.rfs.common.SnapshotRepo; - public interface IndexMetadata extends Index { /* diff --git a/RFS/src/main/java/com/rfs/models/ShardFileInfo.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardFileInfo.java similarity index 94% rename from RFS/src/main/java/com/rfs/models/ShardFileInfo.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardFileInfo.java index 464aef5ad..9e4f2d80d 100644 --- a/RFS/src/main/java/com/rfs/models/ShardFileInfo.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardFileInfo.java @@ -1,4 +1,4 @@ -package com.rfs.models; +package org.opensearch.migrations.bulkload.models; import org.apache.lucene.util.BytesRef; diff --git a/RFS/src/main/java/com/rfs/models/ShardMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardMetadata.java similarity index 94% rename from RFS/src/main/java/com/rfs/models/ShardMetadata.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardMetadata.java index a66cd002d..a587e6d84 100644 --- a/RFS/src/main/java/com/rfs/models/ShardMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardMetadata.java @@ -1,4 +1,4 @@ -package com.rfs.models; +package org.opensearch.migrations.bulkload.models; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -11,9 +11,9 @@ import com.fasterxml.jackson.dataformat.smile.SmileFactory; import org.apache.lucene.codecs.CodecUtil; -import com.rfs.common.ByteArrayIndexInput; -import com.rfs.common.RfsException; -import com.rfs.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.ByteArrayIndexInput; +import org.opensearch.migrations.bulkload.common.RfsException; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; /** * Defines the behavior expected of an object that will surface the metadata of an shard stored in a snapshot diff --git a/RFS/src/main/java/com/rfs/models/SnapshotMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/SnapshotMetadata.java similarity index 93% rename from RFS/src/main/java/com/rfs/models/SnapshotMetadata.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/models/SnapshotMetadata.java index 002438ae4..d5aec5213 100644 --- a/RFS/src/main/java/com/rfs/models/SnapshotMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/SnapshotMetadata.java @@ -1,4 +1,4 @@ -package com.rfs.models; +package org.opensearch.migrations.bulkload.models; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -11,9 +11,9 @@ import com.fasterxml.jackson.dataformat.smile.SmileFactory; import org.apache.lucene.codecs.CodecUtil; -import com.rfs.common.ByteArrayIndexInput; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.ByteArrayIndexInput; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SourceRepo; /** * Defines the behavior expected of an object that will surface the metadata of a snapshot diff --git a/RFS/src/main/java/com/rfs/netty/ReadMeteringHandler.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/netty/ReadMeteringHandler.java similarity index 94% rename from RFS/src/main/java/com/rfs/netty/ReadMeteringHandler.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/netty/ReadMeteringHandler.java index 717de2a2e..25553624b 100644 --- a/RFS/src/main/java/com/rfs/netty/ReadMeteringHandler.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/netty/ReadMeteringHandler.java @@ -1,4 +1,4 @@ -package com.rfs.netty; +package org.opensearch.migrations.bulkload.netty; import java.util.function.IntConsumer; diff --git a/RFS/src/main/java/com/rfs/netty/WriteMeteringHandler.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/netty/WriteMeteringHandler.java similarity index 95% rename from RFS/src/main/java/com/rfs/netty/WriteMeteringHandler.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/netty/WriteMeteringHandler.java index 54334fd83..54d3de443 100644 --- a/RFS/src/main/java/com/rfs/netty/WriteMeteringHandler.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/netty/WriteMeteringHandler.java @@ -1,4 +1,4 @@ -package com.rfs.netty; +package org.opensearch.migrations.bulkload.netty; import java.util.function.IntConsumer; diff --git a/RFS/src/main/java/com/rfs/tracing/BaseRootRfsContext.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/BaseRootRfsContext.java similarity index 94% rename from RFS/src/main/java/com/rfs/tracing/BaseRootRfsContext.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/BaseRootRfsContext.java index 4f3a19351..272e23a59 100644 --- a/RFS/src/main/java/com/rfs/tracing/BaseRootRfsContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/BaseRootRfsContext.java @@ -1,4 +1,4 @@ -package com.rfs.tracing; +package org.opensearch.migrations.bulkload.tracing; import io.opentelemetry.api.OpenTelemetry; diff --git a/RFS/src/main/java/com/rfs/tracing/IRfsContexts.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/IRfsContexts.java similarity index 96% rename from RFS/src/main/java/com/rfs/tracing/IRfsContexts.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/IRfsContexts.java index 14cf2af77..f2c51008e 100644 --- a/RFS/src/main/java/com/rfs/tracing/IRfsContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/IRfsContexts.java @@ -1,4 +1,4 @@ -package com.rfs.tracing; +package org.opensearch.migrations.bulkload.tracing; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; diff --git a/RFS/src/main/java/com/rfs/tracing/IWorkCoordinationContexts.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/IWorkCoordinationContexts.java similarity index 95% rename from RFS/src/main/java/com/rfs/tracing/IWorkCoordinationContexts.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/IWorkCoordinationContexts.java index c6d369092..e5796be32 100644 --- a/RFS/src/main/java/com/rfs/tracing/IWorkCoordinationContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/IWorkCoordinationContexts.java @@ -1,9 +1,8 @@ -package com.rfs.tracing; +package org.opensearch.migrations.bulkload.tracing; +import org.opensearch.migrations.bulkload.workcoordination.OpenSearchWorkCoordinator; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; -import com.rfs.cms.OpenSearchWorkCoordinator; - public abstract class IWorkCoordinationContexts { public static class ActivityNames { diff --git a/RFS/src/main/java/com/rfs/tracing/RfsContexts.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RfsContexts.java similarity index 99% rename from RFS/src/main/java/com/rfs/tracing/RfsContexts.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RfsContexts.java index e74ad640b..90e8a677f 100644 --- a/RFS/src/main/java/com/rfs/tracing/RfsContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RfsContexts.java @@ -1,4 +1,4 @@ -package com.rfs.tracing; +package org.opensearch.migrations.bulkload.tracing; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; diff --git a/RFS/src/main/java/com/rfs/tracing/RootWorkCoordinationContext.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RootWorkCoordinationContext.java similarity index 98% rename from RFS/src/main/java/com/rfs/tracing/RootWorkCoordinationContext.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RootWorkCoordinationContext.java index 4aa0d36ca..0f5eff14b 100644 --- a/RFS/src/main/java/com/rfs/tracing/RootWorkCoordinationContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RootWorkCoordinationContext.java @@ -1,4 +1,4 @@ -package com.rfs.tracing; +package org.opensearch.migrations.bulkload.tracing; import io.opentelemetry.api.OpenTelemetry; diff --git a/RFS/src/main/java/com/rfs/tracing/WorkCoordinationContexts.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/WorkCoordinationContexts.java similarity index 98% rename from RFS/src/main/java/com/rfs/tracing/WorkCoordinationContexts.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/WorkCoordinationContexts.java index 1a970bc10..c86c9741a 100644 --- a/RFS/src/main/java/com/rfs/tracing/WorkCoordinationContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/WorkCoordinationContexts.java @@ -1,13 +1,13 @@ -package com.rfs.tracing; +package org.opensearch.migrations.bulkload.tracing; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; +import org.opensearch.migrations.bulkload.workcoordination.OpenSearchWorkCoordinator; import org.opensearch.migrations.tracing.BaseSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; -import com.rfs.cms.OpenSearchWorkCoordinator; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NonNull; diff --git a/RFS/src/main/java/com/rfs/transformers/TransformFunctions.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java similarity index 99% rename from RFS/src/main/java/com/rfs/transformers/TransformFunctions.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java index eaa9b742f..845da3d2f 100644 --- a/RFS/src/main/java/com/rfs/transformers/TransformFunctions.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java @@ -1,4 +1,4 @@ -package com.rfs.transformers; +package org.opensearch.migrations.bulkload.transformers; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/RFS/src/main/java/com/rfs/transformers/Transformer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer.java similarity index 76% rename from RFS/src/main/java/com/rfs/transformers/Transformer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer.java index ed3878531..bf00d9f6c 100644 --- a/RFS/src/main/java/com/rfs/transformers/Transformer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer.java @@ -1,7 +1,7 @@ -package com.rfs.transformers; +package org.opensearch.migrations.bulkload.transformers; -import com.rfs.models.GlobalMetadata; -import com.rfs.models.IndexMetadata; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; /** * Defines the behavior required to transform the Global and Index Metadata from one version of Elasticsearch/Opensearch diff --git a/RFS/src/main/java/com/rfs/transformers/Transformer_ES_6_8_to_OS_2_11.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_6_8_to_OS_2_11.java similarity index 91% rename from RFS/src/main/java/com/rfs/transformers/Transformer_ES_6_8_to_OS_2_11.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_6_8_to_OS_2_11.java index 6810592e5..18997190c 100644 --- a/RFS/src/main/java/com/rfs/transformers/Transformer_ES_6_8_to_OS_2_11.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_6_8_to_OS_2_11.java @@ -1,4 +1,4 @@ -package com.rfs.transformers; +package org.opensearch.migrations.bulkload.transformers; import java.util.List; @@ -7,15 +7,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.version_os_2_11.GlobalMetadataData_OS_2_11; +import org.opensearch.migrations.bulkload.version_os_2_11.IndexMetadataData_OS_2_11; import org.opensearch.migrations.transformation.TransformationRule; import org.opensearch.migrations.transformation.entity.Index; import org.opensearch.migrations.transformation.rules.IndexMappingTypeRemoval; -import com.rfs.models.GlobalMetadata; -import com.rfs.models.IndexMetadata; -import com.rfs.version_os_2_11.GlobalMetadataData_OS_2_11; -import com.rfs.version_os_2_11.IndexMetadataData_OS_2_11; - public class Transformer_ES_6_8_to_OS_2_11 implements Transformer { private static final Logger logger = LogManager.getLogger(Transformer_ES_6_8_to_OS_2_11.class); private static final ObjectMapper mapper = new ObjectMapper(); diff --git a/RFS/src/main/java/com/rfs/transformers/Transformer_ES_7_10_OS_2_11.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11.java similarity index 94% rename from RFS/src/main/java/com/rfs/transformers/Transformer_ES_7_10_OS_2_11.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11.java index 31e268c70..51f036fb8 100644 --- a/RFS/src/main/java/com/rfs/transformers/Transformer_ES_7_10_OS_2_11.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11.java @@ -1,13 +1,13 @@ -package com.rfs.transformers; +package org.opensearch.migrations.bulkload.transformers; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.rfs.models.GlobalMetadata; -import com.rfs.models.IndexMetadata; -import com.rfs.version_os_2_11.GlobalMetadataData_OS_2_11; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.version_os_2_11.GlobalMetadataData_OS_2_11; public class Transformer_ES_7_10_OS_2_11 implements Transformer { private static final Logger logger = LogManager.getLogger(Transformer_ES_7_10_OS_2_11.class); diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/ElasticsearchConstants_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ElasticsearchConstants_ES_6_8.java similarity index 96% rename from RFS/src/main/java/com/rfs/version_es_6_8/ElasticsearchConstants_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ElasticsearchConstants_ES_6_8.java index 98856c6c5..7e8b95767 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/ElasticsearchConstants_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ElasticsearchConstants_ES_6_8.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/GlobalMetadataData_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/GlobalMetadataData_ES_6_8.java similarity index 77% rename from RFS/src/main/java/com/rfs/version_es_6_8/GlobalMetadataData_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/GlobalMetadataData_ES_6_8.java index 372226cf4..652103a65 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/GlobalMetadataData_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/GlobalMetadataData_ES_6_8.java @@ -1,8 +1,8 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; public class GlobalMetadataData_ES_6_8 implements GlobalMetadata { private final ObjectNode root; diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/GlobalMetadataFactory_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/GlobalMetadataFactory_ES_6_8.java similarity index 82% rename from RFS/src/main/java/com/rfs/version_es_6_8/GlobalMetadataFactory_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/GlobalMetadataFactory_ES_6_8.java index d2cba66d6..4402ec9d1 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/GlobalMetadataFactory_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/GlobalMetadataFactory_ES_6_8.java @@ -1,11 +1,11 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; public class GlobalMetadataFactory_ES_6_8 implements GlobalMetadata.Factory { private final SnapshotRepo.Provider repoDataProvider; diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/IndexMetadataData_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/IndexMetadataData_ES_6_8.java similarity index 88% rename from RFS/src/main/java/com/rfs/version_es_6_8/IndexMetadataData_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/IndexMetadataData_ES_6_8.java index 45ee64f82..bc7cc2ffd 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/IndexMetadataData_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/IndexMetadataData_ES_6_8.java @@ -1,10 +1,11 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.IndexMetadata; -import com.rfs.transformers.TransformFunctions; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.transformers.TransformFunctions; + import lombok.Getter; public class IndexMetadataData_ES_6_8 implements IndexMetadata { diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/IndexMetadataFactory_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/IndexMetadataFactory_ES_6_8.java similarity index 85% rename from RFS/src/main/java/com/rfs/version_es_6_8/IndexMetadataFactory_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/IndexMetadataFactory_ES_6_8.java index fc0e765ed..b734ec2d5 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/IndexMetadataFactory_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/IndexMetadataFactory_ES_6_8.java @@ -1,11 +1,11 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.IndexMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.IndexMetadata; public class IndexMetadataFactory_ES_6_8 implements IndexMetadata.Factory { private final SnapshotRepo.Provider repoDataProvider; diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/RemoteReaderClient_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/RemoteReaderClient_ES_6_8.java similarity index 62% rename from RFS/src/main/java/com/rfs/version_es_6_8/RemoteReaderClient_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/RemoteReaderClient_ES_6_8.java index ca925fc4c..4e234774b 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/RemoteReaderClient_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/RemoteReaderClient_ES_6_8.java @@ -1,9 +1,9 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import java.util.Map; -import com.rfs.common.http.ConnectionContext; -import com.rfs.version_universal.RemoteReaderClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.version_universal.RemoteReaderClient; public class RemoteReaderClient_ES_6_8 extends RemoteReaderClient { diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/ShardMetadataData_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ShardMetadataData_ES_6_8.java similarity index 97% rename from RFS/src/main/java/com/rfs/version_es_6_8/ShardMetadataData_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ShardMetadataData_ES_6_8.java index 0a5fbbd9a..42769cd55 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/ShardMetadataData_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ShardMetadataData_ES_6_8.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import java.io.IOException; import java.util.Collections; @@ -13,8 +13,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.lucene.util.BytesRef; -import com.rfs.models.ShardFileInfo; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.models.ShardFileInfo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import lombok.Getter; @Getter diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/ShardMetadataFactory_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ShardMetadataFactory_ES_6_8.java similarity index 91% rename from RFS/src/main/java/com/rfs/version_es_6_8/ShardMetadataFactory_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ShardMetadataFactory_ES_6_8.java index 5fe23fed1..2556b58e8 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/ShardMetadataFactory_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ShardMetadataFactory_ES_6_8.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -6,8 +6,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotMetadataData_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotMetadataData_ES_6_8.java similarity index 85% rename from RFS/src/main/java/com/rfs/version_es_6_8/SnapshotMetadataData_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotMetadataData_ES_6_8.java index 14f4b7b5c..e64a5ed21 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotMetadataData_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotMetadataData_ES_6_8.java @@ -1,10 +1,11 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.rfs.models.SnapshotMetadata; +import org.opensearch.migrations.bulkload.models.SnapshotMetadata; + import lombok.Getter; @Getter diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotMetadataFactory_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotMetadataFactory_ES_6_8.java similarity index 89% rename from RFS/src/main/java/com/rfs/version_es_6_8/SnapshotMetadataFactory_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotMetadataFactory_ES_6_8.java index dc328faf7..cf90d0ac8 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotMetadataFactory_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotMetadataFactory_ES_6_8.java @@ -1,11 +1,11 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.models.SnapshotMetadata; +import org.opensearch.migrations.bulkload.models.SnapshotMetadata; public class SnapshotMetadataFactory_ES_6_8 implements SnapshotMetadata.Factory { diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotReader_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotReader_ES_6_8.java similarity index 84% rename from RFS/src/main/java/com/rfs/version_es_6_8/SnapshotReader_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotReader_ES_6_8.java index 076ef8799..74a11f07a 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotReader_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotReader_ES_6_8.java @@ -1,15 +1,14 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import org.opensearch.migrations.Version; import org.opensearch.migrations.VersionMatchers; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SourceRepo; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.models.ShardMetadata; import org.opensearch.migrations.cluster.ClusterSnapshotReader; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SourceRepo; -import com.rfs.models.GlobalMetadata; -import com.rfs.models.IndexMetadata; -import com.rfs.models.ShardMetadata; - public class SnapshotReader_ES_6_8 implements ClusterSnapshotReader { private Version version; diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotRepoData_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotRepoData_ES_6_8.java similarity index 89% rename from RFS/src/main/java/com/rfs/version_es_6_8/SnapshotRepoData_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotRepoData_ES_6_8.java index 8a34e929b..1cd0aeee8 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotRepoData_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotRepoData_ES_6_8.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import java.io.File; import java.io.IOException; @@ -8,9 +8,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SnapshotRepo.CantParseRepoFile; -import com.rfs.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.CantParseRepoFile; +import org.opensearch.migrations.bulkload.common.SourceRepo; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotRepoProvider_ES_6_8.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotRepoProvider_ES_6_8.java similarity index 92% rename from RFS/src/main/java/com/rfs/version_es_6_8/SnapshotRepoProvider_ES_6_8.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotRepoProvider_ES_6_8.java index 44cef6202..25262fb72 100644 --- a/RFS/src/main/java/com/rfs/version_es_6_8/SnapshotRepoProvider_ES_6_8.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/SnapshotRepoProvider_ES_6_8.java @@ -1,11 +1,11 @@ -package com.rfs.version_es_6_8; +package org.opensearch.migrations.bulkload.version_es_6_8; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SourceRepo; public class SnapshotRepoProvider_ES_6_8 implements SnapshotRepo.Provider { private final SourceRepo repo; diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/ElasticsearchConstants_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ElasticsearchConstants_ES_7_10.java similarity index 96% rename from RFS/src/main/java/com/rfs/version_es_7_10/ElasticsearchConstants_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ElasticsearchConstants_ES_7_10.java index 3d95fb245..476942125 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/ElasticsearchConstants_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ElasticsearchConstants_ES_7_10.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/GlobalMetadataData_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/GlobalMetadataData_ES_7_10.java similarity index 84% rename from RFS/src/main/java/com/rfs/version_es_7_10/GlobalMetadataData_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/GlobalMetadataData_ES_7_10.java index db8bfa303..b4cc96492 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/GlobalMetadataData_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/GlobalMetadataData_ES_7_10.java @@ -1,8 +1,8 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; public class GlobalMetadataData_ES_7_10 implements GlobalMetadata { private final ObjectNode root; diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/GlobalMetadataFactory_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/GlobalMetadataFactory_ES_7_10.java similarity index 82% rename from RFS/src/main/java/com/rfs/version_es_7_10/GlobalMetadataFactory_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/GlobalMetadataFactory_ES_7_10.java index 71ee0fd1c..e69f5c71f 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/GlobalMetadataFactory_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/GlobalMetadataFactory_ES_7_10.java @@ -1,11 +1,11 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; public class GlobalMetadataFactory_ES_7_10 implements GlobalMetadata.Factory { private final SnapshotRepo.Provider repoDataProvider; diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/IndexMetadataData_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/IndexMetadataData_ES_7_10.java similarity index 88% rename from RFS/src/main/java/com/rfs/version_es_7_10/IndexMetadataData_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/IndexMetadataData_ES_7_10.java index 64d712628..79a624196 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/IndexMetadataData_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/IndexMetadataData_ES_7_10.java @@ -1,9 +1,10 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.IndexMetadata; -import com.rfs.transformers.TransformFunctions; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.transformers.TransformFunctions; + import lombok.Getter; public class IndexMetadataData_ES_7_10 implements IndexMetadata { diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/IndexMetadataFactory_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/IndexMetadataFactory_ES_7_10.java similarity index 86% rename from RFS/src/main/java/com/rfs/version_es_7_10/IndexMetadataFactory_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/IndexMetadataFactory_ES_7_10.java index 9f45d88d1..f531db85b 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/IndexMetadataFactory_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/IndexMetadataFactory_ES_7_10.java @@ -1,11 +1,11 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.IndexMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.IndexMetadata; public class IndexMetadataFactory_ES_7_10 implements IndexMetadata.Factory { private final SnapshotRepo.Provider repoDataProvider; diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/ShardMetadataData_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ShardMetadataData_ES_7_10.java similarity index 97% rename from RFS/src/main/java/com/rfs/version_es_7_10/ShardMetadataData_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ShardMetadataData_ES_7_10.java index 31a238b28..3a3cd749e 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/ShardMetadataData_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ShardMetadataData_ES_7_10.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import java.io.IOException; import java.util.Collections; @@ -14,8 +14,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.lucene.util.BytesRef; -import com.rfs.models.ShardFileInfo; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.models.ShardFileInfo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import lombok.Getter; @Getter diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/ShardMetadataFactory_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ShardMetadataFactory_ES_7_10.java similarity index 92% rename from RFS/src/main/java/com/rfs/version_es_7_10/ShardMetadataFactory_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ShardMetadataFactory_ES_7_10.java index 1026dd098..3f6e0e06f 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/ShardMetadataFactory_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/ShardMetadataFactory_ES_7_10.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; @@ -7,8 +7,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotMetadataData_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotMetadataData_ES_7_10.java similarity index 88% rename from RFS/src/main/java/com/rfs/version_es_7_10/SnapshotMetadataData_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotMetadataData_ES_7_10.java index 09912837d..5ac388397 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotMetadataData_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotMetadataData_ES_7_10.java @@ -1,10 +1,11 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.rfs.models.SnapshotMetadata; +import org.opensearch.migrations.bulkload.models.SnapshotMetadata; + import lombok.Getter; @Getter diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotMetadataFactory_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotMetadataFactory_ES_7_10.java similarity index 90% rename from RFS/src/main/java/com/rfs/version_es_7_10/SnapshotMetadataFactory_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotMetadataFactory_ES_7_10.java index 565803e0f..761f0b2d1 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotMetadataFactory_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotMetadataFactory_ES_7_10.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.models.SnapshotMetadata; +import org.opensearch.migrations.bulkload.models.SnapshotMetadata; public class SnapshotMetadataFactory_ES_7_10 implements SnapshotMetadata.Factory { diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotReader_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotReader_ES_7_10.java similarity index 84% rename from RFS/src/main/java/com/rfs/version_es_7_10/SnapshotReader_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotReader_ES_7_10.java index c414c9223..b3f983316 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotReader_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotReader_ES_7_10.java @@ -1,15 +1,14 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import org.opensearch.migrations.Version; import org.opensearch.migrations.VersionMatchers; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SourceRepo; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.models.ShardMetadata; import org.opensearch.migrations.cluster.ClusterSnapshotReader; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SourceRepo; -import com.rfs.models.GlobalMetadata; -import com.rfs.models.IndexMetadata; -import com.rfs.models.ShardMetadata; - public class SnapshotReader_ES_7_10 implements ClusterSnapshotReader { private Version version; diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotRepoData_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoData_ES_7_10.java similarity index 91% rename from RFS/src/main/java/com/rfs/version_es_7_10/SnapshotRepoData_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoData_ES_7_10.java index d98a62f1e..bc21742c3 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotRepoData_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoData_ES_7_10.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import java.io.File; import java.io.IOException; @@ -10,9 +10,10 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SnapshotRepo.CantParseRepoFile; -import com.rfs.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.CantParseRepoFile; +import org.opensearch.migrations.bulkload.common.SourceRepo; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotRepoProvider_ES_7_10.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoProvider_ES_7_10.java similarity index 94% rename from RFS/src/main/java/com/rfs/version_es_7_10/SnapshotRepoProvider_ES_7_10.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoProvider_ES_7_10.java index ab154f85e..e6a72c4b2 100644 --- a/RFS/src/main/java/com/rfs/version_es_7_10/SnapshotRepoProvider_ES_7_10.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoProvider_ES_7_10.java @@ -1,11 +1,11 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SourceRepo; public class SnapshotRepoProvider_ES_7_10 implements SnapshotRepo.Provider { private final SourceRepo repo; diff --git a/RFS/src/main/java/com/rfs/version_os_2_11/GlobalMetadataCreator_OS_2_11.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/GlobalMetadataCreator_OS_2_11.java similarity index 97% rename from RFS/src/main/java/com/rfs/version_os_2_11/GlobalMetadataCreator_OS_2_11.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/GlobalMetadataCreator_OS_2_11.java index b40328b2f..9ba0e4f67 100644 --- a/RFS/src/main/java/com/rfs/version_os_2_11/GlobalMetadataCreator_OS_2_11.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/GlobalMetadataCreator_OS_2_11.java @@ -1,4 +1,4 @@ -package com.rfs.version_os_2_11; +package org.opensearch.migrations.bulkload.version_os_2_11; import java.util.ArrayList; import java.util.HashMap; @@ -8,12 +8,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; import org.opensearch.migrations.metadata.GlobalMetadataCreator; import org.opensearch.migrations.metadata.GlobalMetadataCreatorResults; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.IClusterMetadataContext; -import com.rfs.common.OpenSearchClient; -import com.rfs.models.GlobalMetadata; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/version_os_2_11/GlobalMetadataData_OS_2_11.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/GlobalMetadataData_OS_2_11.java similarity index 89% rename from RFS/src/main/java/com/rfs/version_os_2_11/GlobalMetadataData_OS_2_11.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/GlobalMetadataData_OS_2_11.java index 12ffbfb18..b251cca4c 100644 --- a/RFS/src/main/java/com/rfs/version_os_2_11/GlobalMetadataData_OS_2_11.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/GlobalMetadataData_OS_2_11.java @@ -1,8 +1,8 @@ -package com.rfs.version_os_2_11; +package org.opensearch.migrations.bulkload.version_os_2_11; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; public class GlobalMetadataData_OS_2_11 implements GlobalMetadata { private final ObjectNode root; diff --git a/RFS/src/main/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexCreator_OS_2_11.java similarity index 93% rename from RFS/src/main/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexCreator_OS_2_11.java index d19092a40..b6b772e88 100644 --- a/RFS/src/main/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexCreator_OS_2_11.java @@ -1,15 +1,15 @@ -package com.rfs.version_os_2_11; +package org.opensearch.migrations.bulkload.version_os_2_11; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.common.InvalidResponse; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.models.IndexMetadata; import org.opensearch.migrations.metadata.IndexCreator; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.ICreateIndexContext; -import com.rfs.common.InvalidResponse; -import com.rfs.common.OpenSearchClient; -import com.rfs.models.IndexMetadata; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/version_os_2_11/IndexMetadataData_OS_2_11.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexMetadataData_OS_2_11.java similarity index 90% rename from RFS/src/main/java/com/rfs/version_os_2_11/IndexMetadataData_OS_2_11.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexMetadataData_OS_2_11.java index db023e619..575811bce 100644 --- a/RFS/src/main/java/com/rfs/version_os_2_11/IndexMetadataData_OS_2_11.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexMetadataData_OS_2_11.java @@ -1,8 +1,8 @@ -package com.rfs.version_os_2_11; +package org.opensearch.migrations.bulkload.version_os_2_11; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.IndexMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; public class IndexMetadataData_OS_2_11 implements IndexMetadata { private ObjectNode root; diff --git a/RFS/src/main/java/com/rfs/version_os_2_11/RemoteWriter_OS_2_11.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/RemoteWriter_OS_2_11.java similarity index 89% rename from RFS/src/main/java/com/rfs/version_os_2_11/RemoteWriter_OS_2_11.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/RemoteWriter_OS_2_11.java index ed5321123..cfe4b398a 100644 --- a/RFS/src/main/java/com/rfs/version_os_2_11/RemoteWriter_OS_2_11.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_os_2_11/RemoteWriter_OS_2_11.java @@ -1,16 +1,15 @@ -package com.rfs.version_os_2_11; +package org.opensearch.migrations.bulkload.version_os_2_11; import org.opensearch.migrations.Version; import org.opensearch.migrations.VersionMatchers; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.models.DataFilterArgs; import org.opensearch.migrations.cluster.ClusterWriter; import org.opensearch.migrations.cluster.RemoteCluster; import org.opensearch.migrations.metadata.GlobalMetadataCreator; import org.opensearch.migrations.metadata.IndexCreator; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.http.ConnectionContext; -import com.rfs.models.DataFilterArgs; - public class RemoteWriter_OS_2_11 implements RemoteCluster, ClusterWriter { private Version version; private OpenSearchClient client; diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteDataProvider.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteDataProvider.java similarity index 77% rename from RFS/src/main/java/com/rfs/version_universal/RemoteDataProvider.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteDataProvider.java index 256851694..a48019486 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteDataProvider.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteDataProvider.java @@ -1,14 +1,15 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.common.SnapshotRepo.Index; -import com.rfs.common.SnapshotRepo.Provider; -import com.rfs.common.SnapshotRepo.Snapshot; -import com.rfs.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.Index; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.Provider; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.Snapshot; +import org.opensearch.migrations.bulkload.common.SourceRepo; + import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteIndexMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadata.java similarity index 90% rename from RFS/src/main/java/com/rfs/version_universal/RemoteIndexMetadata.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadata.java index ee4ba4a15..41233a13f 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteIndexMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadata.java @@ -1,9 +1,10 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.IndexMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; + import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteIndexMetadataFactory.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadataFactory.java similarity index 88% rename from RFS/src/main/java/com/rfs/version_universal/RemoteIndexMetadataFactory.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadataFactory.java index 6c1679c43..a410e2d33 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteIndexMetadataFactory.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadataFactory.java @@ -1,11 +1,12 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo.Provider; -import com.rfs.models.IndexMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.Provider; +import org.opensearch.migrations.bulkload.models.IndexMetadata; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteIndexSnapshotData.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexSnapshotData.java similarity index 80% rename from RFS/src/main/java/com/rfs/version_universal/RemoteIndexSnapshotData.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexSnapshotData.java index e7669e7ef..1496107ce 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteIndexSnapshotData.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexSnapshotData.java @@ -1,8 +1,9 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import java.util.List; -import com.rfs.common.SnapshotRepo.Index; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.Index; + import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadata.java similarity index 83% rename from RFS/src/main/java/com/rfs/version_universal/RemoteMetadata.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadata.java index 359d8ff55..a4b534a85 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadata.java @@ -1,10 +1,11 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import java.util.Optional; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; + import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteMetadataFactory.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadataFactory.java similarity index 83% rename from RFS/src/main/java/com/rfs/version_universal/RemoteMetadataFactory.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadataFactory.java index 2788a4ca9..48312801c 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteMetadataFactory.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadataFactory.java @@ -1,10 +1,11 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -import com.rfs.common.SnapshotRepo.Provider; -import com.rfs.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.common.SnapshotRepo.Provider; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; + import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteReader.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReader.java similarity index 80% rename from RFS/src/main/java/com/rfs/version_universal/RemoteReader.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReader.java index 03690c867..591736d5b 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteReader.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReader.java @@ -1,15 +1,15 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import org.opensearch.migrations.Version; import org.opensearch.migrations.VersionMatchers; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.models.GlobalMetadata.Factory; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.version_es_6_8.RemoteReaderClient_ES_6_8; import org.opensearch.migrations.cluster.ClusterReader; import org.opensearch.migrations.cluster.RemoteCluster; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.http.ConnectionContext; -import com.rfs.models.GlobalMetadata.Factory; -import com.rfs.version_es_6_8.RemoteReaderClient_ES_6_8; - public class RemoteReader implements RemoteCluster, ClusterReader { private Version version; private RemoteReaderClient client; @@ -35,7 +35,7 @@ public Factory getGlobalMetadata() { } @Override - public com.rfs.models.IndexMetadata.Factory getIndexMetadata() { + public IndexMetadata.Factory getIndexMetadata() { return new RemoteIndexMetadataFactory(getClient()); } diff --git a/RFS/src/main/java/com/rfs/version_universal/RemoteReaderClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java similarity index 95% rename from RFS/src/main/java/com/rfs/version_universal/RemoteReaderClient.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java index 5e0c5474a..91bd2811a 100644 --- a/RFS/src/main/java/com/rfs/version_universal/RemoteReaderClient.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java @@ -1,4 +1,4 @@ -package com.rfs.version_universal; +package org.opensearch.migrations.bulkload.version_universal; import java.util.List; import java.util.Map; @@ -6,9 +6,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.http.ConnectionContext; -import com.rfs.common.http.HttpResponse; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.common.http.HttpResponse; + import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/RFS/src/main/java/com/rfs/cms/AbstractedHttpClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/AbstractedHttpClient.java similarity index 96% rename from RFS/src/main/java/com/rfs/cms/AbstractedHttpClient.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/AbstractedHttpClient.java index 70f22102d..218fe8319 100644 --- a/RFS/src/main/java/com/rfs/cms/AbstractedHttpClient.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/AbstractedHttpClient.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/RFS/src/main/java/com/rfs/cms/CoordinateWorkHttpClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/CoordinateWorkHttpClient.java similarity index 89% rename from RFS/src/main/java/com/rfs/cms/CoordinateWorkHttpClient.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/CoordinateWorkHttpClient.java index ca01d6a66..a9ef210c0 100644 --- a/RFS/src/main/java/com/rfs/cms/CoordinateWorkHttpClient.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/CoordinateWorkHttpClient.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -6,8 +6,9 @@ import java.util.Map; import java.util.stream.Stream; -import com.rfs.common.RestClient; -import com.rfs.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.common.RestClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; + import io.netty.handler.codec.http.HttpMethod; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/RFS/src/main/java/com/rfs/cms/IWorkCoordinator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/IWorkCoordinator.java similarity index 98% rename from RFS/src/main/java/com/rfs/cms/IWorkCoordinator.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/IWorkCoordinator.java index c7cbd0548..df0b0d34b 100644 --- a/RFS/src/main/java/com/rfs/cms/IWorkCoordinator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/IWorkCoordinator.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.io.IOException; import java.time.Clock; @@ -6,7 +6,8 @@ import java.time.Instant; import java.util.function.Supplier; -import com.rfs.tracing.IWorkCoordinationContexts; +import org.opensearch.migrations.bulkload.tracing.IWorkCoordinationContexts; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NonNull; diff --git a/RFS/src/main/java/com/rfs/cms/LeaseExpireTrigger.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/LeaseExpireTrigger.java similarity index 98% rename from RFS/src/main/java/com/rfs/cms/LeaseExpireTrigger.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/LeaseExpireTrigger.java index 20c9fd643..9109c7a39 100644 --- a/RFS/src/main/java/com/rfs/cms/LeaseExpireTrigger.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/LeaseExpireTrigger.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.time.Clock; import java.time.Duration; diff --git a/RFS/src/main/java/com/rfs/cms/OpenSearchWorkCoordinator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java similarity index 99% rename from RFS/src/main/java/com/rfs/cms/OpenSearchWorkCoordinator.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java index eb12c6817..ec3ec39f6 100644 --- a/RFS/src/main/java/com/rfs/cms/OpenSearchWorkCoordinator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -13,7 +13,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.rfs.tracing.IWorkCoordinationContexts; +import org.opensearch.migrations.bulkload.tracing.IWorkCoordinationContexts; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Lombok; diff --git a/RFS/src/main/java/com/rfs/cms/ScopedWorkCoordinator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/ScopedWorkCoordinator.java similarity index 93% rename from RFS/src/main/java/com/rfs/cms/ScopedWorkCoordinator.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/ScopedWorkCoordinator.java index ca10c8374..68f91b42e 100644 --- a/RFS/src/main/java/com/rfs/cms/ScopedWorkCoordinator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/ScopedWorkCoordinator.java @@ -1,9 +1,10 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.io.IOException; import java.util.function.Supplier; -import com.rfs.tracing.IWorkCoordinationContexts; +import org.opensearch.migrations.bulkload.tracing.IWorkCoordinationContexts; + import lombok.NonNull; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/worker/DocumentsRunner.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/DocumentsRunner.java similarity index 86% rename from RFS/src/main/java/com/rfs/worker/DocumentsRunner.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/DocumentsRunner.java index f6168887f..45c87a3aa 100644 --- a/RFS/src/main/java/com/rfs/worker/DocumentsRunner.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/DocumentsRunner.java @@ -1,4 +1,4 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; import java.io.IOException; import java.nio.file.Path; @@ -7,16 +7,16 @@ import java.util.function.Function; import java.util.function.Supplier; +import org.opensearch.migrations.bulkload.common.DocumentReindexer; +import org.opensearch.migrations.bulkload.common.LuceneDocumentsReader; +import org.opensearch.migrations.bulkload.common.RfsException; +import org.opensearch.migrations.bulkload.common.RfsLuceneDocument; +import org.opensearch.migrations.bulkload.common.SnapshotShardUnpacker; +import org.opensearch.migrations.bulkload.models.ShardMetadata; +import org.opensearch.migrations.bulkload.workcoordination.IWorkCoordinator; +import org.opensearch.migrations.bulkload.workcoordination.ScopedWorkCoordinator; import org.opensearch.migrations.reindexer.tracing.IDocumentMigrationContexts; -import com.rfs.cms.IWorkCoordinator; -import com.rfs.cms.ScopedWorkCoordinator; -import com.rfs.common.DocumentReindexer; -import com.rfs.common.LuceneDocumentsReader; -import com.rfs.common.RfsException; -import com.rfs.common.RfsLuceneDocument; -import com.rfs.common.SnapshotShardUnpacker; -import com.rfs.models.ShardMetadata; import lombok.AllArgsConstructor; import lombok.Lombok; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/worker/IndexAndShard.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexAndShard.java similarity index 94% rename from RFS/src/main/java/com/rfs/worker/IndexAndShard.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexAndShard.java index 47e5eea6d..f075505f9 100644 --- a/RFS/src/main/java/com/rfs/worker/IndexAndShard.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexAndShard.java @@ -1,4 +1,4 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/RFS/src/main/java/com/rfs/worker/IndexMetadataResults.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexMetadataResults.java similarity index 83% rename from RFS/src/main/java/com/rfs/worker/IndexMetadataResults.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexMetadataResults.java index b63bcdbf7..6abd8e6b5 100644 --- a/RFS/src/main/java/com/rfs/worker/IndexMetadataResults.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexMetadataResults.java @@ -1,4 +1,4 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; import java.util.List; diff --git a/RFS/src/main/java/com/rfs/worker/IndexRunner.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexRunner.java similarity index 87% rename from RFS/src/main/java/com/rfs/worker/IndexRunner.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexRunner.java index 7f17f8663..68374ee4c 100644 --- a/RFS/src/main/java/com/rfs/worker/IndexRunner.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexRunner.java @@ -1,16 +1,16 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; import java.util.List; import java.util.function.BiConsumer; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.common.FilterScheme; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.transformers.Transformer; import org.opensearch.migrations.metadata.IndexCreator; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.ICreateIndexContext; -import com.rfs.common.FilterScheme; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.IndexMetadata; -import com.rfs.transformers.Transformer; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/worker/MetadataRunner.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/MetadataRunner.java similarity index 85% rename from RFS/src/main/java/com/rfs/worker/MetadataRunner.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/MetadataRunner.java index b85aba34d..2dd137c72 100644 --- a/RFS/src/main/java/com/rfs/worker/MetadataRunner.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/MetadataRunner.java @@ -1,12 +1,12 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.transformers.Transformer; import org.opensearch.migrations.metadata.GlobalMetadataCreator; import org.opensearch.migrations.metadata.GlobalMetadataCreatorResults; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.IClusterMetadataContext; -import com.rfs.models.GlobalMetadata; -import com.rfs.transformers.Transformer; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/worker/OpenSearchWorkItem.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/OpenSearchWorkItem.java similarity index 83% rename from RFS/src/main/java/com/rfs/worker/OpenSearchWorkItem.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/OpenSearchWorkItem.java index 614e07e40..2f99d7058 100644 --- a/RFS/src/main/java/com/rfs/worker/OpenSearchWorkItem.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/OpenSearchWorkItem.java @@ -1,4 +1,4 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; public class OpenSearchWorkItem { public final String indexName; diff --git a/RFS/src/main/java/com/rfs/worker/ShardWorkPreparer.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/ShardWorkPreparer.java similarity index 92% rename from RFS/src/main/java/com/rfs/worker/ShardWorkPreparer.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/ShardWorkPreparer.java index 9ef7b9d71..e10689dff 100644 --- a/RFS/src/main/java/com/rfs/worker/ShardWorkPreparer.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/ShardWorkPreparer.java @@ -1,4 +1,4 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; import java.io.IOException; import java.time.Duration; @@ -6,14 +6,14 @@ import java.util.function.BiConsumer; import java.util.stream.IntStream; +import org.opensearch.migrations.bulkload.common.FilterScheme; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.workcoordination.IWorkCoordinator; +import org.opensearch.migrations.bulkload.workcoordination.ScopedWorkCoordinator; import org.opensearch.migrations.reindexer.tracing.IDocumentMigrationContexts; import org.opensearch.migrations.reindexer.tracing.IRootDocumentMigrationContext; -import com.rfs.cms.IWorkCoordinator; -import com.rfs.cms.ScopedWorkCoordinator; -import com.rfs.common.FilterScheme; -import com.rfs.common.SnapshotRepo; -import com.rfs.models.IndexMetadata; import lombok.Lombok; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/com/rfs/worker/SnapshotRunner.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/SnapshotRunner.java similarity index 90% rename from RFS/src/main/java/com/rfs/worker/SnapshotRunner.java rename to RFS/src/main/java/org/opensearch/migrations/bulkload/worker/SnapshotRunner.java index 84506ae3f..eda8ba6bb 100644 --- a/RFS/src/main/java/com/rfs/worker/SnapshotRunner.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/SnapshotRunner.java @@ -1,6 +1,7 @@ -package com.rfs.worker; +package org.opensearch.migrations.bulkload.worker; + +import org.opensearch.migrations.bulkload.common.SnapshotCreator; -import com.rfs.common.SnapshotCreator; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterProviderRegistry.java b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterProviderRegistry.java index e0161ca8e..47a567f37 100644 --- a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterProviderRegistry.java +++ b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterProviderRegistry.java @@ -4,15 +4,15 @@ import java.util.stream.Stream; import org.opensearch.migrations.Version; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.SourceRepo; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.models.DataFilterArgs; +import org.opensearch.migrations.bulkload.version_es_6_8.SnapshotReader_ES_6_8; +import org.opensearch.migrations.bulkload.version_es_7_10.SnapshotReader_ES_7_10; +import org.opensearch.migrations.bulkload.version_os_2_11.RemoteWriter_OS_2_11; +import org.opensearch.migrations.bulkload.version_universal.RemoteReader; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.SourceRepo; -import com.rfs.common.http.ConnectionContext; -import com.rfs.models.DataFilterArgs; -import com.rfs.version_es_6_8.SnapshotReader_ES_6_8; -import com.rfs.version_es_7_10.SnapshotReader_ES_7_10; -import com.rfs.version_os_2_11.RemoteWriter_OS_2_11; -import com.rfs.version_universal.RemoteReader; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterReader.java b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterReader.java index ff777f1de..230e209c2 100644 --- a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterReader.java +++ b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterReader.java @@ -1,7 +1,7 @@ package org.opensearch.migrations.cluster; -import com.rfs.models.GlobalMetadata; -import com.rfs.models.IndexMetadata; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import org.opensearch.migrations.bulkload.models.IndexMetadata; /** Reads data from a cluster */ public interface ClusterReader extends VersionSpecificCluster { diff --git a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterSnapshotReader.java b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterSnapshotReader.java index ad97c0299..edf3055e3 100644 --- a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterSnapshotReader.java +++ b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterSnapshotReader.java @@ -1,9 +1,8 @@ package org.opensearch.migrations.cluster; import org.opensearch.migrations.Version; - -import com.rfs.common.SourceRepo; -import com.rfs.models.ShardMetadata; +import org.opensearch.migrations.bulkload.common.SourceRepo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; /** Reads data for a cluster from a snapshot */ public interface ClusterSnapshotReader extends ClusterReader { diff --git a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterWriter.java b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterWriter.java index d5c8d0432..6dad74ab4 100644 --- a/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterWriter.java +++ b/RFS/src/main/java/org/opensearch/migrations/cluster/ClusterWriter.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.cluster; +import org.opensearch.migrations.bulkload.models.DataFilterArgs; import org.opensearch.migrations.metadata.GlobalMetadataCreator; import org.opensearch.migrations.metadata.IndexCreator; -import com.rfs.models.DataFilterArgs; - /** Writes data onto a cluster */ public interface ClusterWriter extends VersionSpecificCluster { diff --git a/RFS/src/main/java/org/opensearch/migrations/cluster/RemoteCluster.java b/RFS/src/main/java/org/opensearch/migrations/cluster/RemoteCluster.java index 91f0b852d..7750ea5b2 100644 --- a/RFS/src/main/java/org/opensearch/migrations/cluster/RemoteCluster.java +++ b/RFS/src/main/java/org/opensearch/migrations/cluster/RemoteCluster.java @@ -1,6 +1,6 @@ package org.opensearch.migrations.cluster; -import com.rfs.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; /** Remote cluster */ public interface RemoteCluster extends VersionSpecificCluster { diff --git a/RFS/src/main/java/org/opensearch/migrations/metadata/GlobalMetadataCreator.java b/RFS/src/main/java/org/opensearch/migrations/metadata/GlobalMetadataCreator.java index f133a76f9..a04d42c6b 100644 --- a/RFS/src/main/java/org/opensearch/migrations/metadata/GlobalMetadataCreator.java +++ b/RFS/src/main/java/org/opensearch/migrations/metadata/GlobalMetadataCreator.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.metadata; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.IClusterMetadataContext; -import com.rfs.models.GlobalMetadata; - public interface GlobalMetadataCreator { public GlobalMetadataCreatorResults create( GlobalMetadata metadata, diff --git a/RFS/src/main/java/org/opensearch/migrations/metadata/IndexCreator.java b/RFS/src/main/java/org/opensearch/migrations/metadata/IndexCreator.java index 47219593e..4eb367751 100644 --- a/RFS/src/main/java/org/opensearch/migrations/metadata/IndexCreator.java +++ b/RFS/src/main/java/org/opensearch/migrations/metadata/IndexCreator.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.metadata; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.models.IndexMetadata; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.ICreateIndexContext; -import com.rfs.models.IndexMetadata; - public interface IndexCreator { public boolean create( IndexMetadata index, diff --git a/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/IMetadataMigrationContexts.java b/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/IMetadataMigrationContexts.java index a529ea380..5aad062f6 100644 --- a/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/IMetadataMigrationContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/IMetadataMigrationContexts.java @@ -1,9 +1,8 @@ package org.opensearch.migrations.metadata.tracing; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; -import com.rfs.tracing.IRfsContexts; - public abstract class IMetadataMigrationContexts { public interface ITemplateContext extends IRfsContexts.ICheckedIdempotentPutRequestContext { diff --git a/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationContexts.java b/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationContexts.java index 3bc6c1086..2af5be910 100644 --- a/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationContexts.java @@ -2,13 +2,13 @@ import io.opentelemetry.api.metrics.Meter; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.RfsContexts; import org.opensearch.migrations.tracing.BaseNestedSpanContext; import org.opensearch.migrations.tracing.BaseSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; -import com.rfs.tracing.IRfsContexts; -import com.rfs.tracing.RfsContexts; import lombok.NonNull; public class MetadataMigrationContexts { diff --git a/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/RootMetadataMigrationContext.java b/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/RootMetadataMigrationContext.java index b4b06c253..8ba720e0d 100644 --- a/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/RootMetadataMigrationContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/metadata/tracing/RootMetadataMigrationContext.java @@ -2,10 +2,9 @@ import io.opentelemetry.api.OpenTelemetry; +import org.opensearch.migrations.bulkload.tracing.BaseRootRfsContext; import org.opensearch.migrations.tracing.IContextTracker; -import com.rfs.tracing.BaseRootRfsContext; - public class RootMetadataMigrationContext extends BaseRootRfsContext { public static final String SCOPE_NAME = "metadataMigration"; diff --git a/RFS/src/main/java/org/opensearch/migrations/reindexer/FailedRequestsLogger.java b/RFS/src/main/java/org/opensearch/migrations/reindexer/FailedRequestsLogger.java index b080cc177..d6be23530 100644 --- a/RFS/src/main/java/org/opensearch/migrations/reindexer/FailedRequestsLogger.java +++ b/RFS/src/main/java/org/opensearch/migrations/reindexer/FailedRequestsLogger.java @@ -4,7 +4,8 @@ import java.util.function.IntSupplier; import java.util.function.Supplier; -import com.rfs.common.OpenSearchClient.OperationFailed; +import org.opensearch.migrations.bulkload.common.OpenSearchClient.OperationFailed; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationContexts.java b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationContexts.java index 1035bf7d7..ef03e882f 100644 --- a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationContexts.java @@ -2,15 +2,15 @@ import io.opentelemetry.api.metrics.Meter; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.IWorkCoordinationContexts; +import org.opensearch.migrations.bulkload.tracing.RfsContexts; +import org.opensearch.migrations.bulkload.tracing.RootWorkCoordinationContext; import org.opensearch.migrations.tracing.BaseNestedSpanContext; import org.opensearch.migrations.tracing.BaseSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; -import com.rfs.tracing.IRfsContexts; -import com.rfs.tracing.IWorkCoordinationContexts; -import com.rfs.tracing.RfsContexts; -import com.rfs.tracing.RootWorkCoordinationContext; import lombok.NonNull; public class DocumentMigrationContexts extends IDocumentMigrationContexts { diff --git a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IDocumentMigrationContexts.java b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IDocumentMigrationContexts.java index 92f2cd53d..78d4ed42b 100644 --- a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IDocumentMigrationContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IDocumentMigrationContexts.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.reindexer.tracing; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.IWorkCoordinationContexts; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; -import com.rfs.tracing.IRfsContexts; -import com.rfs.tracing.IWorkCoordinationContexts; - public abstract class IDocumentMigrationContexts { public static class ActivityNames { diff --git a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IRootDocumentMigrationContext.java b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IRootDocumentMigrationContext.java index 240af7201..e708cad69 100644 --- a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IRootDocumentMigrationContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/IRootDocumentMigrationContext.java @@ -1,6 +1,6 @@ package org.opensearch.migrations.reindexer.tracing; -import com.rfs.tracing.RootWorkCoordinationContext; +import org.opensearch.migrations.bulkload.tracing.RootWorkCoordinationContext; public interface IRootDocumentMigrationContext { RootWorkCoordinationContext getWorkCoordinationContext(); diff --git a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/RootDocumentMigrationContext.java b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/RootDocumentMigrationContext.java index 0ffbbdd61..9873dd4b7 100644 --- a/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/RootDocumentMigrationContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/reindexer/tracing/RootDocumentMigrationContext.java @@ -2,10 +2,10 @@ import io.opentelemetry.api.OpenTelemetry; +import org.opensearch.migrations.bulkload.tracing.BaseRootRfsContext; +import org.opensearch.migrations.bulkload.tracing.RootWorkCoordinationContext; import org.opensearch.migrations.tracing.IContextTracker; -import com.rfs.tracing.BaseRootRfsContext; -import com.rfs.tracing.RootWorkCoordinationContext; import lombok.Getter; public class RootDocumentMigrationContext extends BaseRootRfsContext implements IRootDocumentMigrationContext { diff --git a/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/CreateSnapshotContext.java b/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/CreateSnapshotContext.java index dbe279bc8..65d3c3bec 100644 --- a/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/CreateSnapshotContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/CreateSnapshotContext.java @@ -2,12 +2,12 @@ import io.opentelemetry.api.metrics.Meter; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.RfsContexts; import org.opensearch.migrations.tracing.BaseSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; -import com.rfs.tracing.IRfsContexts; -import com.rfs.tracing.RfsContexts; import lombok.NonNull; public class CreateSnapshotContext extends BaseSpanContext diff --git a/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/IRootSnapshotContext.java b/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/IRootSnapshotContext.java index 0b3f87dcd..a44321fb8 100644 --- a/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/IRootSnapshotContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/IRootSnapshotContext.java @@ -1,6 +1,6 @@ package org.opensearch.migrations.snapshot.creation.tracing; -import com.rfs.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; public interface IRootSnapshotContext { IRfsContexts.ICreateSnapshotContext createSnapshotCreateContext(); diff --git a/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/RootSnapshotContext.java b/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/RootSnapshotContext.java index 649ab9cb8..ea1d3f4c4 100644 --- a/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/RootSnapshotContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/snapshot/creation/tracing/RootSnapshotContext.java @@ -2,11 +2,10 @@ import io.opentelemetry.api.OpenTelemetry; +import org.opensearch.migrations.bulkload.tracing.BaseRootRfsContext; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; import org.opensearch.migrations.tracing.IContextTracker; -import com.rfs.tracing.BaseRootRfsContext; -import com.rfs.tracing.IRfsContexts; - public class RootSnapshotContext extends BaseRootRfsContext implements IRootSnapshotContext { public static final String SCOPE_NAME = "snapshotCreation"; public final CreateSnapshotContext.MetricInstruments snapshotInstruments; diff --git a/RFS/src/test/java/com/rfs/common/ConnectionContextTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/ConnectionContextTest.java similarity index 93% rename from RFS/src/test/java/com/rfs/common/ConnectionContextTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/ConnectionContextTest.java index 665dc1d2a..86ed5f172 100644 --- a/RFS/src/test/java/com/rfs/common/ConnectionContextTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/ConnectionContextTest.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.stream.Stream; import org.junit.jupiter.api.Test; @@ -6,11 +6,11 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import com.rfs.common.http.BasicAuthTransformer; -import com.rfs.common.http.ConnectionContext; -import com.rfs.common.http.ConnectionContextTestParams; -import com.rfs.common.http.NoAuthTransformer; -import com.rfs.common.http.SigV4AuthTransformer; +import org.opensearch.migrations.bulkload.common.http.BasicAuthTransformer; +import org.opensearch.migrations.bulkload.common.http.ConnectionContext; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; +import org.opensearch.migrations.bulkload.common.http.NoAuthTransformer; +import org.opensearch.migrations.bulkload.common.http.SigV4AuthTransformer; import static org.junit.jupiter.api.Assertions.*; diff --git a/RFS/src/test/java/com/rfs/common/DocumentReindexerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/DocumentReindexerTest.java similarity index 98% rename from RFS/src/test/java/com/rfs/common/DocumentReindexerTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/DocumentReindexerTest.java index 4624f0ca1..4955f3bdb 100644 --- a/RFS/src/test/java/com/rfs/common/DocumentReindexerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/DocumentReindexerTest.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -8,9 +8,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; import org.opensearch.migrations.reindexer.tracing.IDocumentMigrationContexts; -import com.rfs.tracing.IRfsContexts; import lombok.extern.slf4j.Slf4j; import org.mockito.ArgumentCaptor; import org.mockito.Mock; diff --git a/RFS/src/test/java/com/rfs/common/InvalidResponseTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/InvalidResponseTest.java similarity index 97% rename from RFS/src/test/java/com/rfs/common/InvalidResponseTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/InvalidResponseTest.java index 74d6bd4a2..71527e717 100644 --- a/RFS/src/test/java/com/rfs/common/InvalidResponseTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/InvalidResponseTest.java @@ -1,10 +1,10 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.Map; import org.junit.jupiter.api.Test; -import com.rfs.common.http.HttpResponse; +import org.opensearch.migrations.bulkload.common.http.HttpResponse; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/RFS/src/test/java/com/rfs/common/LuceneDocumentsReaderTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReaderTest.java similarity index 97% rename from RFS/src/test/java/com/rfs/common/LuceneDocumentsReaderTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReaderTest.java index 6e0297cbc..bbb3b83f4 100644 --- a/RFS/src/test/java/com/rfs/common/LuceneDocumentsReaderTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReaderTest.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.IOException; import java.nio.file.Files; @@ -32,10 +32,9 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opensearch.migrations.Version; +import org.opensearch.migrations.bulkload.models.ShardMetadata; import org.opensearch.migrations.cluster.ClusterProviderRegistry; -import com.rfs.common.TestResources.Snapshot; -import com.rfs.models.ShardMetadata; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.scheduler.Schedulers; @@ -82,7 +81,7 @@ static Stream provideSnapshots() { @ParameterizedTest @MethodSource("provideSnapshots") - public void ReadDocuments_AsExpected(Snapshot snapshot, Version version) throws Exception { + public void ReadDocuments_AsExpected(TestResources.Snapshot snapshot, Version version) throws Exception { final var repo = new FileSystemRepo(snapshot.dir); var sourceResourceProvider = ClusterProviderRegistry.getSnapshotReader(version, repo); DefaultSourceRepoAccessor repoAccessor = new DefaultSourceRepoAccessor(repo); @@ -133,7 +132,7 @@ public void ReadDocuments_AsExpected(Snapshot snapshot, Version version) throws @Test public void ReadDocuments_ES5_Origin_AsExpected() throws Exception { - Snapshot snapshot = TestResources.SNAPSHOT_ES_6_8_MERGED; + TestResources.Snapshot snapshot = TestResources.SNAPSHOT_ES_6_8_MERGED; Version version = Version.fromString("ES 6.8"); final var repo = new FileSystemRepo(snapshot.dir); diff --git a/RFS/src/test/java/com/rfs/common/OpenSearchClientTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/OpenSearchClientTest.java similarity index 90% rename from RFS/src/test/java/com/rfs/common/OpenSearchClientTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/OpenSearchClientTest.java index f98573c16..6912c0e5b 100644 --- a/RFS/src/test/java/com/rfs/common/OpenSearchClientTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/OpenSearchClientTest.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.time.Duration; import java.util.List; @@ -11,16 +11,17 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.Test; +import org.opensearch.migrations.bulkload.common.DocumentReindexer.BulkDocSection; +import org.opensearch.migrations.bulkload.common.http.HttpResponse; +import org.opensearch.migrations.bulkload.http.BulkRequestGenerator; +import org.opensearch.migrations.bulkload.http.BulkRequestGenerator.BulkItemResponseEntry; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts.ICheckedIdempotentPutRequestContext; import org.opensearch.migrations.reindexer.FailedRequestsLogger; -import com.rfs.common.DocumentReindexer.BulkDocSection; -import com.rfs.common.http.HttpResponse; -import com.rfs.http.BulkRequestGenerator; -import com.rfs.http.BulkRequestGenerator.BulkItemResponseEntry; -import com.rfs.tracing.IRfsContexts; -import com.rfs.tracing.IRfsContexts.ICheckedIdempotentPutRequestContext; import lombok.SneakyThrows; import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; @@ -28,8 +29,8 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -import static com.rfs.http.BulkRequestGenerator.itemEntry; -import static com.rfs.http.BulkRequestGenerator.itemEntryFailure; +import static org.opensearch.migrations.bulkload.http.BulkRequestGenerator.itemEntry; +import static org.opensearch.migrations.bulkload.http.BulkRequestGenerator.itemEntryFailure; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -54,7 +55,7 @@ void testCreateIndex() { var createdItemRawJson = "{\"created\":\"yup!\"}"; var createItemResponse = new HttpResponse(200, "", null, createdItemRawJson); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.getAsync(any(), any())).thenReturn(Mono.just(checkIfExistsResponse)); when(restClient.putAsync(any(), any(), any())).thenReturn(Mono.just(createItemResponse)); @@ -72,7 +73,7 @@ void testCreateIndex() { void testCreateIndex_alreadyExists() { var checkIfExistsResponse = new HttpResponse(200, "", null, "I exist!"); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.getAsync(any(), any())).thenReturn(Mono.just(checkIfExistsResponse)); var rawJson = "{ }"; @@ -88,7 +89,7 @@ void testCreateIndex_errorOnCreation_retried() { var createdItemRawJson = "{\"error\":\"unauthorized\"}"; var createItemResponse = new HttpResponse(403, "", null, createdItemRawJson); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.getAsync(any(), any())).thenReturn(Mono.just(checkIfExistsResponse)); when(restClient.putAsync(any(), any(), any())).thenReturn(Mono.just(createItemResponse)); @@ -111,7 +112,7 @@ void testCreateIndex_errorOnCreation_notRetriedOnBadRequest() { var createdItemRawJson = "{\"error\":\"illegal_argument_exception\"}"; var createItemResponse = new HttpResponse(400, "", null, createdItemRawJson); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.getAsync(any(), any())).thenReturn(Mono.just(checkIfExistsResponse)); when(restClient.putAsync(any(), any(), any())).thenReturn(Mono.just(createItemResponse)); @@ -139,7 +140,7 @@ void testBulkRequest_succeedAfterRetries() { var finalDocSuccess = bulkItemResponse(false, List.of(itemEntry(docId2))); var server500 = new HttpResponse(500, "", null, "{\"error\":\"Cannot Process Error!\"}"); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.postAsync(any(), any(), any(), any())).thenReturn(Mono.just(bothDocsFail)) .thenReturn(Mono.just(oneFailure)) .thenReturn(Mono.just(server500)) @@ -171,7 +172,7 @@ void testBulkRequest_recordsTotalFailures() { var docId1 = "tt1979320"; var docFails = bulkItemResponse(true, List.of(itemEntryFailure(docId1))); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.postAsync(any(), any(), any(), any())).thenReturn(Mono.just(docFails)); var failedRequestLogger = mock(FailedRequestsLogger.class); @@ -225,7 +226,7 @@ void testBulkRequest_addsGzipHeaders_whenSupported() { var docId = "tt1979320"; var bulkSuccess = bulkItemResponse(false, List.of(itemEntry(docId))); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.supportsGzipCompression()).thenReturn(true); when(restClient.postAsync(any(), any(), any(), any())).thenReturn(Mono.just(bulkSuccess)); @@ -256,7 +257,7 @@ void testBulkRequest_doesNotAddGzipHeaders_whenNotSupported() { var docId = "tt1979320"; var bulkSuccess = bulkItemResponse(false, List.of(itemEntry(docId))); - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.supportsGzipCompression()).thenReturn(false); when(restClient.postAsync(any(), any(), any(), any())).thenReturn(Mono.just(bulkSuccess)); @@ -284,7 +285,7 @@ void testBulkRequest_doesNotAddGzipHeaders_whenNotSupported() { @Test void testNonBulkRequest_doesNotAddGzipHeaders() { - var restClient = mock(RestClient.class); + var restClient = Mockito.mock(RestClient.class); when(restClient.supportsGzipCompression()).thenReturn(true); when(restClient.getAsync(any(), any())).thenReturn(Mono.just(new HttpResponse(404, "", null, "does not exist"))); when(restClient.putAsync(any(), any(), any())).thenReturn(Mono.just(new HttpResponse(200, "", null, "{\"created\":\"yup!\"}"))); diff --git a/RFS/src/test/java/com/rfs/common/RestClientTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/RestClientTest.java similarity index 96% rename from RFS/src/test/java/com/rfs/common/RestClientTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/RestClientTest.java index c76680bbf..8c833b76b 100644 --- a/RFS/src/test/java/com/rfs/common/RestClientTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/RestClientTest.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.nio.charset.StandardCharsets; import java.util.Comparator; @@ -11,13 +11,13 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; +import org.opensearch.migrations.bulkload.tracing.RfsContexts; import org.opensearch.migrations.snapshot.creation.tracing.SnapshotTestContext; import org.opensearch.migrations.testutils.HttpRequest; import org.opensearch.migrations.testutils.SimpleHttpResponse; import org.opensearch.migrations.testutils.SimpleNettyHttpServer; -import com.rfs.common.http.ConnectionContextTestParams; -import com.rfs.tracing.RfsContexts; import reactor.netty.http.client.HttpClient; import reactor.netty.resources.ConnectionProvider; diff --git a/RFS/src/test/java/com/rfs/common/S3RepoTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3RepoTest.java similarity index 97% rename from RFS/src/test/java/com/rfs/common/S3RepoTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3RepoTest.java index 0e761d3d2..fcbc5b9a4 100644 --- a/RFS/src/test/java/com/rfs/common/S3RepoTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3RepoTest.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.io.IOException; import java.nio.file.Path; @@ -10,7 +10,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.rfs.common.S3Repo.CannotFindSnapshotRepoRoot; +import org.opensearch.migrations.bulkload.common.S3Repo.CannotFindSnapshotRepoRoot; + import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; @@ -115,7 +116,7 @@ void GetSnapshotRepoDataFilePath_DoesNotExist() throws IOException { var nonExistentFileName = "does-not-exist"; var bucket = new S3Uri("s3://bucket-name/directory" + nonExistentFileName); - var testRepo = Mockito.spy(new S3Repo(testDir, bucket, testRegion, mockS3Client)); + var testRepo = spy(new S3Repo(testDir, bucket, testRegion, mockS3Client)); // Run the test var thrown = assertThrows(CannotFindSnapshotRepoRoot.class, () -> testRepo.getSnapshotRepoDataFilePath()); diff --git a/RFS/src/test/java/com/rfs/common/S3UriTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3UriTest.java similarity index 95% rename from RFS/src/test/java/com/rfs/common/S3UriTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3UriTest.java index 068f537f7..d80aefe10 100644 --- a/RFS/src/test/java/com/rfs/common/S3UriTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3UriTest.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.util.stream.Stream; diff --git a/RFS/src/test/java/com/rfs/common/TestResources.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/TestResources.java similarity index 96% rename from RFS/src/test/java/com/rfs/common/TestResources.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/TestResources.java index 9672e1787..ec3973dc2 100644 --- a/RFS/src/test/java/com/rfs/common/TestResources.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/TestResources.java @@ -1,4 +1,4 @@ -package com.rfs.common; +package org.opensearch.migrations.bulkload.common; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/RFS/src/test/java/com/rfs/common/http/CompositeTransformerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformerTest.java similarity index 96% rename from RFS/src/test/java/com/rfs/common/http/CompositeTransformerTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformerTest.java index fb12962e2..e3a6021f2 100644 --- a/RFS/src/test/java/com/rfs/common/http/CompositeTransformerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformerTest.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.util.Collections; diff --git a/RFS/src/test/java/com/rfs/common/http/GzipPayloadRequestTransformerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformerTest.java similarity index 99% rename from RFS/src/test/java/com/rfs/common/http/GzipPayloadRequestTransformerTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformerTest.java index ce2f72327..50aff7b7a 100644 --- a/RFS/src/test/java/com/rfs/common/http/GzipPayloadRequestTransformerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformerTest.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/RFS/src/test/java/com/rfs/common/http/SigV4AuthTransformerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformerTest.java similarity index 98% rename from RFS/src/test/java/com/rfs/common/http/SigV4AuthTransformerTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformerTest.java index 5e3ce13a1..44cfef444 100644 --- a/RFS/src/test/java/com/rfs/common/http/SigV4AuthTransformerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformerTest.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/RFS/src/test/java/com/rfs/framework/SimpleRestoreFromSnapshot.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot.java similarity index 87% rename from RFS/src/test/java/com/rfs/framework/SimpleRestoreFromSnapshot.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot.java index 9ef797264..2d3867465 100644 --- a/RFS/src/test/java/com/rfs/framework/SimpleRestoreFromSnapshot.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot.java @@ -1,14 +1,13 @@ -package com.rfs.framework; +package org.opensearch.migrations.bulkload.framework; import java.nio.file.Path; import java.util.List; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; +import org.opensearch.migrations.bulkload.models.IndexMetadata; import org.opensearch.migrations.reindexer.tracing.IDocumentMigrationContexts; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.http.ConnectionContextTestParams; -import com.rfs.models.IndexMetadata; - public interface SimpleRestoreFromSnapshot { public static SimpleRestoreFromSnapshot forCluster(final String sourceClusterUrl) { diff --git a/RFS/src/test/java/com/rfs/framework/SimpleRestoreFromSnapshot_ES_7_10.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot_ES_7_10.java similarity index 78% rename from RFS/src/test/java/com/rfs/framework/SimpleRestoreFromSnapshot_ES_7_10.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot_ES_7_10.java index ca4ff5096..51c4e0e5f 100644 --- a/RFS/src/test/java/com/rfs/framework/SimpleRestoreFromSnapshot_ES_7_10.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot_ES_7_10.java @@ -1,4 +1,4 @@ -package com.rfs.framework; +package org.opensearch.migrations.bulkload.framework; import java.nio.file.Path; import java.util.List; @@ -8,21 +8,20 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.util.IOUtils; +import org.opensearch.migrations.bulkload.common.DefaultSourceRepoAccessor; +import org.opensearch.migrations.bulkload.common.DocumentReindexer; +import org.opensearch.migrations.bulkload.common.FileSystemRepo; +import org.opensearch.migrations.bulkload.common.LuceneDocumentsReader; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.common.SnapshotShardUnpacker; +import org.opensearch.migrations.bulkload.models.IndexMetadata; +import org.opensearch.migrations.bulkload.version_es_7_10.ElasticsearchConstants_ES_7_10; +import org.opensearch.migrations.bulkload.version_es_7_10.IndexMetadataFactory_ES_7_10; +import org.opensearch.migrations.bulkload.version_es_7_10.ShardMetadataFactory_ES_7_10; +import org.opensearch.migrations.bulkload.version_es_7_10.SnapshotRepoProvider_ES_7_10; import org.opensearch.migrations.reindexer.tracing.IDocumentMigrationContexts; -import com.rfs.common.DefaultSourceRepoAccessor; -import com.rfs.common.DocumentReindexer; -import com.rfs.common.FileSystemRepo; -import com.rfs.common.LuceneDocumentsReader; -import com.rfs.common.OpenSearchClient; -import com.rfs.common.SnapshotRepo; -import com.rfs.common.SnapshotShardUnpacker; -import com.rfs.models.IndexMetadata; -import com.rfs.version_es_7_10.ElasticsearchConstants_ES_7_10; -import com.rfs.version_es_7_10.IndexMetadataFactory_ES_7_10; -import com.rfs.version_es_7_10.ShardMetadataFactory_ES_7_10; -import com.rfs.version_es_7_10.SnapshotRepoProvider_ES_7_10; - /** * Simplified version of RFS for use in testing - ES 7.10 version. */ diff --git a/RFS/src/test/java/com/rfs/integration/SnapshotStateTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/SnapshotStateTest.java similarity index 94% rename from RFS/src/test/java/com/rfs/integration/SnapshotStateTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/integration/SnapshotStateTest.java index 2df195373..377c98653 100644 --- a/RFS/src/test/java/com/rfs/integration/SnapshotStateTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/SnapshotStateTest.java @@ -1,4 +1,4 @@ -package com.rfs.integration; +package org.opensearch.migrations.bulkload.integration; import java.io.File; import java.nio.file.Path; @@ -9,13 +9,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import org.opensearch.migrations.bulkload.common.DocumentReindexer.BulkDocSection; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; +import org.opensearch.migrations.bulkload.framework.SimpleRestoreFromSnapshot_ES_7_10; +import org.opensearch.migrations.bulkload.http.ClusterOperations; import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext; -import com.rfs.common.DocumentReindexer.BulkDocSection; -import com.rfs.common.OpenSearchClient; -import com.rfs.framework.SearchClusterContainer; -import com.rfs.framework.SimpleRestoreFromSnapshot_ES_7_10; -import com.rfs.http.ClusterOperations; import org.mockito.ArgumentCaptor; import reactor.core.publisher.Mono; diff --git a/RFS/src/test/java/com/rfs/integration/WorkerCompleteAfterErrorTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/WorkerCompleteAfterErrorTest.java similarity index 98% rename from RFS/src/test/java/com/rfs/integration/WorkerCompleteAfterErrorTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/integration/WorkerCompleteAfterErrorTest.java index c6054f7cf..f088c7e5f 100644 --- a/RFS/src/test/java/com/rfs/integration/WorkerCompleteAfterErrorTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/WorkerCompleteAfterErrorTest.java @@ -1,4 +1,4 @@ -package com.rfs.integration; +package org.opensearch.migrations.bulkload.integration; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/RFS/src/test/java/com/rfs/version_es_7_10/SnapshotRepoData_ES_7_10Test.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoData_ES_7_10Test.java similarity index 98% rename from RFS/src/test/java/com/rfs/version_es_7_10/SnapshotRepoData_ES_7_10Test.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoData_ES_7_10Test.java index 6d3aacbbb..8a2af9e05 100644 --- a/RFS/src/test/java/com/rfs/version_es_7_10/SnapshotRepoData_ES_7_10Test.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/version_es_7_10/SnapshotRepoData_ES_7_10Test.java @@ -1,4 +1,4 @@ -package com.rfs.version_es_7_10; +package org.opensearch.migrations.bulkload.version_es_7_10; import java.io.File; import java.io.FileOutputStream; diff --git a/RFS/src/test/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11Test.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexCreator_OS_2_11Test.java similarity index 96% rename from RFS/src/test/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11Test.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexCreator_OS_2_11Test.java index 7466bfb28..f227c40bf 100644 --- a/RFS/src/test/java/com/rfs/version_os_2_11/IndexCreator_OS_2_11Test.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/version_os_2_11/IndexCreator_OS_2_11Test.java @@ -1,4 +1,4 @@ -package com.rfs.version_os_2_11; +package org.opensearch.migrations.bulkload.version_os_2_11; import java.util.Optional; import java.util.Set; @@ -10,10 +10,10 @@ import org.junit.jupiter.api.Test; import org.opensearch.migrations.MigrationMode; +import org.opensearch.migrations.bulkload.common.InvalidResponse; +import org.opensearch.migrations.bulkload.common.OpenSearchClient; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.ICreateIndexContext; -import com.rfs.common.InvalidResponse; -import com.rfs.common.OpenSearchClient; import lombok.SneakyThrows; import org.mockito.ArgumentCaptor; diff --git a/RFS/src/test/java/com/rfs/cms/OpenSearchWorkCoodinatorTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoodinatorTest.java similarity index 97% rename from RFS/src/test/java/com/rfs/cms/OpenSearchWorkCoodinatorTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoodinatorTest.java index ba22db0ff..3a1e3b43f 100644 --- a/RFS/src/test/java/com/rfs/cms/OpenSearchWorkCoodinatorTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoodinatorTest.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -14,9 +14,9 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.opensearch.migrations.bulkload.workcoordination.OpenSearchWorkCoordinator.DocumentModificationResult; import org.opensearch.migrations.testutils.CloseableLogSetup; -import com.rfs.cms.OpenSearchWorkCoordinator.DocumentModificationResult; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/test/java/com/rfs/cms/WorkCoordinatorErrantAcquisitonsRetryTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorErrantAcquisitonsRetryTest.java similarity index 98% rename from RFS/src/test/java/com/rfs/cms/WorkCoordinatorErrantAcquisitonsRetryTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorErrantAcquisitonsRetryTest.java index 4938a9049..1cfb87714 100644 --- a/RFS/src/test/java/com/rfs/cms/WorkCoordinatorErrantAcquisitonsRetryTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorErrantAcquisitonsRetryTest.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -13,13 +13,13 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; import org.opensearch.migrations.testutils.HttpRequest; import org.opensearch.migrations.testutils.SimpleHttpResponse; import org.opensearch.migrations.testutils.SimpleNettyHttpServer; import org.opensearch.migrations.tracing.InMemoryInstrumentationBundle; import org.opensearch.migrations.workcoordination.tracing.WorkCoordinationTestContext; -import com.rfs.common.http.ConnectionContextTestParams; import lombok.NonNull; import org.slf4j.MDC; diff --git a/RFS/src/test/java/com/rfs/cms/WorkCoordinatorTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorTest.java similarity index 98% rename from RFS/src/test/java/com/rfs/cms/WorkCoordinatorTest.java rename to RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorTest.java index 42f5c8581..6edc9852e 100644 --- a/RFS/src/test/java/com/rfs/cms/WorkCoordinatorTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorTest.java @@ -1,4 +1,4 @@ -package com.rfs.cms; +package org.opensearch.migrations.bulkload.workcoordination; import java.io.IOException; import java.time.Duration; @@ -16,11 +16,11 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams; +import org.opensearch.migrations.bulkload.framework.SearchClusterContainer; import org.opensearch.migrations.tracing.InMemoryInstrumentationBundle; import org.opensearch.migrations.workcoordination.tracing.WorkCoordinationTestContext; -import com.rfs.common.http.ConnectionContextTestParams; -import com.rfs.framework.SearchClusterContainer; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/test/java/org/opensearch/migrations/parsing/BulkResponseParserTest.java b/RFS/src/test/java/org/opensearch/migrations/parsing/BulkResponseParserTest.java index 9765d5646..a6173f588 100644 --- a/RFS/src/test/java/org/opensearch/migrations/parsing/BulkResponseParserTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/parsing/BulkResponseParserTest.java @@ -6,14 +6,15 @@ import org.junit.jupiter.api.Test; -import com.rfs.http.BulkRequestGenerator; +import org.opensearch.migrations.bulkload.http.BulkRequestGenerator; + import org.testcontainers.shaded.com.google.common.collect.Streams; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; -import static com.rfs.http.BulkRequestGenerator.itemEntry; -import static com.rfs.http.BulkRequestGenerator.itemEntryFailure; +import static org.opensearch.migrations.bulkload.http.BulkRequestGenerator.itemEntry; +import static org.opensearch.migrations.bulkload.http.BulkRequestGenerator.itemEntryFailure; class BulkResponseParserTest { diff --git a/RFS/src/test/java/org/opensearch/migrations/parsing/JacksonParserVsReadObjectBenchmark.java b/RFS/src/test/java/org/opensearch/migrations/parsing/JacksonParserVsReadObjectBenchmark.java index 14d012b94..e1723634d 100644 --- a/RFS/src/test/java/org/opensearch/migrations/parsing/JacksonParserVsReadObjectBenchmark.java +++ b/RFS/src/test/java/org/opensearch/migrations/parsing/JacksonParserVsReadObjectBenchmark.java @@ -13,8 +13,9 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import org.junit.jupiter.api.Test; -import com.rfs.http.BulkRequestGenerator; -import com.rfs.http.BulkRequestGenerator.BulkItemResponseEntry; +import org.opensearch.migrations.bulkload.http.BulkRequestGenerator; +import org.opensearch.migrations.bulkload.http.BulkRequestGenerator.BulkItemResponseEntry; + import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Measurement; diff --git a/RFS/src/test/java/org/opensearch/migrations/reindexer/FailedRequestsLoggerTest.java b/RFS/src/test/java/org/opensearch/migrations/reindexer/FailedRequestsLoggerTest.java index 862b69b76..ef44deec1 100644 --- a/RFS/src/test/java/org/opensearch/migrations/reindexer/FailedRequestsLoggerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/reindexer/FailedRequestsLoggerTest.java @@ -2,11 +2,10 @@ import org.junit.jupiter.api.Test; +import org.opensearch.migrations.bulkload.common.OpenSearchClient.OperationFailed; +import org.opensearch.migrations.bulkload.common.http.HttpResponse; import org.opensearch.migrations.testutils.CloseableLogSetup; -import com.rfs.common.OpenSearchClient.OperationFailed; -import com.rfs.common.http.HttpResponse; - import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.hasItem; diff --git a/RFS/src/test/resources/log4j2.properties b/RFS/src/test/resources/log4j2.properties index ea5f68cc2..30932664d 100644 --- a/RFS/src/test/resources/log4j2.properties +++ b/RFS/src/test/resources/log4j2.properties @@ -14,7 +14,7 @@ appender.console.layout.type = PatternLayout appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS}{UTC} %p %c{1.} [%t] %m%n # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} @@ -29,7 +29,7 @@ logger.dockerclientdeps.name = com.github.dockerjava.zerodep logger.dockerclientdeps.level = info # Setup a specific logger for the work coordinator to print MDC data (like the workerId) -logger.WorkCoordinator.name = com.rfs.cms.OpenSearchWorkCoordinator +logger.WorkCoordinator.name = org.opensearch.migrations.bulkload.cms.OpenSearchWorkCoordinator logger.WorkCoordinator.level = info logger.WorkCoordinator.appenderRef.stdout.ref = WorkCoordinator diff --git a/RFS/src/testFixtures/java/com/rfs/common/http/ConnectionContextTestParams.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/common/http/ConnectionContextTestParams.java similarity index 87% rename from RFS/src/testFixtures/java/com/rfs/common/http/ConnectionContextTestParams.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/common/http/ConnectionContextTestParams.java index 1b7dcf35b..62f00c6f6 100644 --- a/RFS/src/testFixtures/java/com/rfs/common/http/ConnectionContextTestParams.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/common/http/ConnectionContextTestParams.java @@ -1,4 +1,4 @@ -package com.rfs.common.http; +package org.opensearch.migrations.bulkload.common.http; import lombok.Builder; import lombok.Getter; diff --git a/RFS/src/testFixtures/java/com/rfs/framework/PreloadedDataContainerOrchestrator.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedDataContainerOrchestrator.java similarity index 99% rename from RFS/src/testFixtures/java/com/rfs/framework/PreloadedDataContainerOrchestrator.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedDataContainerOrchestrator.java index a92baf5f1..b098305ba 100644 --- a/RFS/src/testFixtures/java/com/rfs/framework/PreloadedDataContainerOrchestrator.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedDataContainerOrchestrator.java @@ -1,4 +1,4 @@ -package com.rfs.framework; +package org.opensearch.migrations.bulkload.framework; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/RFS/src/testFixtures/java/com/rfs/framework/PreloadedSearchClusterContainer.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedSearchClusterContainer.java similarity index 93% rename from RFS/src/testFixtures/java/com/rfs/framework/PreloadedSearchClusterContainer.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedSearchClusterContainer.java index 9584dec5d..723b655dd 100644 --- a/RFS/src/testFixtures/java/com/rfs/framework/PreloadedSearchClusterContainer.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedSearchClusterContainer.java @@ -1,4 +1,4 @@ -package com.rfs.framework; +package org.opensearch.migrations.bulkload.framework; import java.io.IOException; diff --git a/RFS/src/testFixtures/java/com/rfs/framework/SearchClusterContainer.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java similarity index 99% rename from RFS/src/testFixtures/java/com/rfs/framework/SearchClusterContainer.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java index 69458705a..db7473ef8 100644 --- a/RFS/src/testFixtures/java/com/rfs/framework/SearchClusterContainer.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java @@ -1,4 +1,4 @@ -package com.rfs.framework; +package org.opensearch.migrations.bulkload.framework; import java.io.File; import java.time.Duration; diff --git a/RFS/src/testFixtures/java/com/rfs/framework/tracing/TrackingTestContextCreator.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/tracing/TrackingTestContextCreator.java similarity index 95% rename from RFS/src/testFixtures/java/com/rfs/framework/tracing/TrackingTestContextCreator.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/tracing/TrackingTestContextCreator.java index 642e761d7..27b7e9dea 100644 --- a/RFS/src/testFixtures/java/com/rfs/framework/tracing/TrackingTestContextCreator.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/tracing/TrackingTestContextCreator.java @@ -1,4 +1,4 @@ -package com.rfs.framework.tracing; +package org.opensearch.migrations.bulkload.framework.tracing; import java.util.function.BiFunction; diff --git a/RFS/src/testFixtures/java/com/rfs/framework/tracing/TrackingTestContextFactory.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/tracing/TrackingTestContextFactory.java similarity index 95% rename from RFS/src/testFixtures/java/com/rfs/framework/tracing/TrackingTestContextFactory.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/tracing/TrackingTestContextFactory.java index 8835a4892..03f0d6707 100644 --- a/RFS/src/testFixtures/java/com/rfs/framework/tracing/TrackingTestContextFactory.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/tracing/TrackingTestContextFactory.java @@ -1,4 +1,4 @@ -package com.rfs.framework.tracing; +package org.opensearch.migrations.bulkload.framework.tracing; import java.util.function.BiFunction; diff --git a/RFS/src/testFixtures/java/com/rfs/http/BulkRequestGenerator.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/BulkRequestGenerator.java similarity index 98% rename from RFS/src/testFixtures/java/com/rfs/http/BulkRequestGenerator.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/BulkRequestGenerator.java index 5818c8bd1..6ef5a7429 100644 --- a/RFS/src/testFixtures/java/com/rfs/http/BulkRequestGenerator.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/BulkRequestGenerator.java @@ -1,4 +1,4 @@ -package com.rfs.http; +package org.opensearch.migrations.bulkload.http; import java.util.List; import java.util.stream.Collectors; diff --git a/RFS/src/testFixtures/java/com/rfs/http/ClusterOperations.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java similarity index 99% rename from RFS/src/testFixtures/java/com/rfs/http/ClusterOperations.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java index 3ccd6a4c4..751d60391 100644 --- a/RFS/src/testFixtures/java/com/rfs/http/ClusterOperations.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java @@ -1,4 +1,4 @@ -package com.rfs.http; +package org.opensearch.migrations.bulkload.http; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/RFS/src/testFixtures/java/com/rfs/http/SearchClusterRequests.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/SearchClusterRequests.java similarity index 95% rename from RFS/src/testFixtures/java/com/rfs/http/SearchClusterRequests.java rename to RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/SearchClusterRequests.java index 710c1ffd6..da12abc33 100644 --- a/RFS/src/testFixtures/java/com/rfs/http/SearchClusterRequests.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/SearchClusterRequests.java @@ -1,4 +1,4 @@ -package com.rfs.http; +package org.opensearch.migrations.bulkload.http; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import org.opensearch.migrations.bulkload.common.RestClient; import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext; -import com.rfs.common.RestClient; import lombok.SneakyThrows; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationTestContext.java b/RFS/src/testFixtures/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationTestContext.java index 783489dfe..adea0b0b6 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationTestContext.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/metadata/tracing/MetadataMigrationTestContext.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.metadata.tracing; +import org.opensearch.migrations.bulkload.framework.tracing.TrackingTestContextFactory; import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.InMemoryInstrumentationBundle; -import com.rfs.framework.tracing.TrackingTestContextFactory; - public class MetadataMigrationTestContext extends RootMetadataMigrationContext { public final InMemoryInstrumentationBundle inMemoryInstrumentationBundle; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationTestContext.java b/RFS/src/testFixtures/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationTestContext.java index 3b0bfbaed..40132d6d4 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationTestContext.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/reindexer/tracing/DocumentMigrationTestContext.java @@ -1,12 +1,11 @@ package org.opensearch.migrations.reindexer.tracing; +import org.opensearch.migrations.bulkload.framework.tracing.TrackingTestContextFactory; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.RfsContexts; import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.InMemoryInstrumentationBundle; -import com.rfs.framework.tracing.TrackingTestContextFactory; -import com.rfs.tracing.IRfsContexts; -import com.rfs.tracing.RfsContexts; - public class DocumentMigrationTestContext extends RootDocumentMigrationContext { public final InMemoryInstrumentationBundle inMemoryInstrumentationBundle; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/snapshot/creation/tracing/SnapshotTestContext.java b/RFS/src/testFixtures/java/org/opensearch/migrations/snapshot/creation/tracing/SnapshotTestContext.java index 9a734ec8d..8bdf029e4 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/snapshot/creation/tracing/SnapshotTestContext.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/snapshot/creation/tracing/SnapshotTestContext.java @@ -1,12 +1,11 @@ package org.opensearch.migrations.snapshot.creation.tracing; +import org.opensearch.migrations.bulkload.framework.tracing.TrackingTestContextFactory; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; +import org.opensearch.migrations.bulkload.tracing.RfsContexts; import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.InMemoryInstrumentationBundle; -import com.rfs.framework.tracing.TrackingTestContextFactory; -import com.rfs.tracing.IRfsContexts; -import com.rfs.tracing.RfsContexts; - public class SnapshotTestContext extends RootSnapshotContext { public final InMemoryInstrumentationBundle inMemoryInstrumentationBundle; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/workcoordination/tracing/WorkCoordinationTestContext.java b/RFS/src/testFixtures/java/org/opensearch/migrations/workcoordination/tracing/WorkCoordinationTestContext.java index ba05bf859..16f7cc4a5 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/workcoordination/tracing/WorkCoordinationTestContext.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/workcoordination/tracing/WorkCoordinationTestContext.java @@ -1,11 +1,10 @@ package org.opensearch.migrations.workcoordination.tracing; +import org.opensearch.migrations.bulkload.framework.tracing.TrackingTestContextFactory; +import org.opensearch.migrations.bulkload.tracing.RootWorkCoordinationContext; import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.InMemoryInstrumentationBundle; -import com.rfs.framework.tracing.TrackingTestContextFactory; -import com.rfs.tracing.RootWorkCoordinationContext; - public class WorkCoordinationTestContext extends RootWorkCoordinationContext { public final InMemoryInstrumentationBundle inMemoryInstrumentationBundle; diff --git a/TrafficCapture/captureKafkaOffloader/src/test/resources/log4j2.properties b/TrafficCapture/captureKafkaOffloader/src/test/resources/log4j2.properties index 5e063eb26..beed2085f 100644 --- a/TrafficCapture/captureKafkaOffloader/src/test/resources/log4j2.properties +++ b/TrafficCapture/captureKafkaOffloader/src/test/resources/log4j2.properties @@ -13,7 +13,7 @@ appender.console.layout.type = PatternLayout appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS}{UTC} %p %c{1.} [%t] %m%equals{ ctx=%mdc}{ ctx=\{\}}{}%n # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/TrafficCapture/captureOffloader/src/test/resources/log4j2.properties b/TrafficCapture/captureOffloader/src/test/resources/log4j2.properties index 5e063eb26..beed2085f 100644 --- a/TrafficCapture/captureOffloader/src/test/resources/log4j2.properties +++ b/TrafficCapture/captureOffloader/src/test/resources/log4j2.properties @@ -13,7 +13,7 @@ appender.console.layout.type = PatternLayout appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS}{UTC} %p %c{1.} [%t] %m%equals{ ctx=%mdc}{ ctx=\{\}}{}%n # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/TrafficCapture/nettyWireLogging/src/test/resources/log4j2.properties b/TrafficCapture/nettyWireLogging/src/test/resources/log4j2.properties index 79f28d0bb..fe1b7abd2 100644 --- a/TrafficCapture/nettyWireLogging/src/test/resources/log4j2.properties +++ b/TrafficCapture/nettyWireLogging/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ appender.console.layout.type = PatternLayout appender.console.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss,SSS}{UTC} [%t] %c{1} - %msg%equals{ ctx=%mdc}{ ctx=\{\}}{}%n # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/resources/log4j2.properties b/TrafficCapture/trafficCaptureProxyServer/src/test/resources/log4j2.properties index da3da9bb4..b6a81d780 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/resources/log4j2.properties +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/resources/log4j2.properties @@ -13,7 +13,7 @@ rootLogger.appenderRefs = stderr rootLogger.appenderRef.stderr.ref = STDERR # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/TrafficCapture/trafficReplayer/src/test/resources/log4j2.properties b/TrafficCapture/trafficReplayer/src/test/resources/log4j2.properties index 7136cf5aa..08d167976 100644 --- a/TrafficCapture/trafficReplayer/src/test/resources/log4j2.properties +++ b/TrafficCapture/trafficReplayer/src/test/resources/log4j2.properties @@ -18,7 +18,7 @@ logger.OutputTupleJsonLogger.name = OutputTupleJsonLogger logger.OutputTupleJsonLogger.level = OFF # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/resources/log4j2.properties b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/resources/log4j2.properties index 4f87b2f62..6adca47b5 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/resources/log4j2.properties +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/resources/log4j2.properties b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/resources/log4j2.properties index 4f87b2f62..6adca47b5 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/resources/log4j2.properties +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/resources/log4j2.properties b/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/resources/log4j2.properties index 4f87b2f62..6adca47b5 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/resources/log4j2.properties +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/awsUtilities/src/test/resources/log4j2.properties b/awsUtilities/src/test/resources/log4j2.properties index 4f87b2f62..6adca47b5 100644 --- a/awsUtilities/src/test/resources/log4j2.properties +++ b/awsUtilities/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/coreUtilities/src/test/resources/log4j2.properties b/coreUtilities/src/test/resources/log4j2.properties index 4f87b2f62..6adca47b5 100644 --- a/coreUtilities/src/test/resources/log4j2.properties +++ b/coreUtilities/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/dashboardsSanitizer/src/test/resources/log4j2.properties b/dashboardsSanitizer/src/test/resources/log4j2.properties index 4f87b2f62..6adca47b5 100644 --- a/dashboardsSanitizer/src/test/resources/log4j2.properties +++ b/dashboardsSanitizer/src/test/resources/log4j2.properties @@ -12,7 +12,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = Console # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel} diff --git a/deployment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts b/deployment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts index d453ebe77..8cb5608ad 100644 --- a/deployment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts +++ b/deployment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts @@ -69,7 +69,7 @@ export class ReindexFromSnapshotStack extends MigrationServiceCore { parameter: MigrationSSMParameter.OS_CLUSTER_ENDPOINT, }); const s3Uri = `s3://migration-artifacts-${this.account}-${props.stage}-${this.region}/rfs-snapshot-repo`; - let rfsCommand = `/rfs-app/runJavaWithClasspath.sh com.rfs.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri ${s3Uri} --s3-region ${this.region} --snapshot-name rfs-snapshot --lucene-dir '/lucene' --target-host ${osClusterEndpoint}` + let rfsCommand = `/rfs-app/runJavaWithClasspath.sh org.opensearch.migrations.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri ${s3Uri} --s3-region ${this.region} --snapshot-name rfs-snapshot --lucene-dir '/lucene' --target-host ${osClusterEndpoint}` rfsCommand = props.clusterAuthDetails.sigv4 ? rfsCommand.concat(`--target-aws-service-signing-name ${props.clusterAuthDetails.sigv4.serviceSigningName} --target-aws-region ${props.clusterAuthDetails.sigv4.region}`) : rfsCommand rfsCommand = props.otelCollectorEnabled ? rfsCommand.concat(` --otel-collector-endpoint ${OtelCollectorSidecar.getOtelLocalhostEndpoint()}`) : rfsCommand rfsCommand = props.sourceClusterVersion ? rfsCommand.concat(` --source-version ${props.sourceClusterVersion}`) : rfsCommand diff --git a/deployment/cdk/opensearch-service-migration/test/reindex-from-snapshot-stack.test.ts b/deployment/cdk/opensearch-service-migration/test/reindex-from-snapshot-stack.test.ts index 8b668f54c..75e92f748 100644 --- a/deployment/cdk/opensearch-service-migration/test/reindex-from-snapshot-stack.test.ts +++ b/deployment/cdk/opensearch-service-migration/test/reindex-from-snapshot-stack.test.ts @@ -115,7 +115,7 @@ describe('ReindexFromSnapshotStack Tests', () => { Value: { "Fn::Join": [ "", - [ "/rfs-app/runJavaWithClasspath.sh com.rfs.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri s3://migration-artifacts-test-account-unit-test-us-east-1/rfs-snapshot-repo --s3-region us-east-1 --snapshot-name rfs-snapshot --lucene-dir '/lucene' --target-host ", + [ "/rfs-app/runJavaWithClasspath.sh org.opensearch.migrations.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri s3://migration-artifacts-test-account-unit-test-us-east-1/rfs-snapshot-repo --s3-region us-east-1 --snapshot-name rfs-snapshot --lucene-dir '/lucene' --target-host ", { "Ref": "SsmParameterValuemigrationunittestdefaultosClusterEndpointC96584B6F00A464EAD1953AFF4B05118Parameter", }, @@ -182,7 +182,7 @@ describe('ReindexFromSnapshotStack Tests', () => { Value: { "Fn::Join": [ "", - [ "/rfs-app/runJavaWithClasspath.sh com.rfs.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri s3://migration-artifacts-test-account-unit-test-us-east-1/rfs-snapshot-repo --s3-region us-east-1 --snapshot-name rfs-snapshot --lucene-dir '/lucene' --target-host ", + [ "/rfs-app/runJavaWithClasspath.sh org.opensearch.migrations.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri s3://migration-artifacts-test-account-unit-test-us-east-1/rfs-snapshot-repo --s3-region us-east-1 --snapshot-name rfs-snapshot --lucene-dir '/lucene' --target-host ", { "Ref": "SsmParameterValuemigrationunittestdefaultosClusterEndpointC96584B6F00A464EAD1953AFF4B05118Parameter", }, @@ -271,7 +271,7 @@ describe('ReindexFromSnapshotStack Tests', () => { Value: { "Fn::Join": [ "", - [ "/rfs-app/runJavaWithClasspath.sh com.rfs.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri s3://migration-artifacts-test-account-unit-test-us-east-1/rfs-snapshot-repo --s3-region us-east-1 --snapshot-name custom-snapshot --lucene-dir /lucene --target-host ", + [ "/rfs-app/runJavaWithClasspath.sh org.opensearch.migrations.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri s3://migration-artifacts-test-account-unit-test-us-east-1/rfs-snapshot-repo --s3-region us-east-1 --snapshot-name custom-snapshot --lucene-dir /lucene --target-host ", { "Ref": "SsmParameterValuemigrationunittestdefaultosClusterEndpointC96584B6F00A464EAD1953AFF4B05118Parameter", }, diff --git a/transformation/src/test/resources/log4j2.properties b/transformation/src/test/resources/log4j2.properties index 25b4245ff..e2c046118 100644 --- a/transformation/src/test/resources/log4j2.properties +++ b/transformation/src/test/resources/log4j2.properties @@ -13,7 +13,7 @@ appender.console.layout.type = PatternLayout appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS}{UTC} %p %c{1.} [%t] %m%equals{ ctx=%mdc}{ ctx=\{\}}{}%n # Allow customization of owned package logs -logger.rfs.name = com.rfs +logger.rfs.name = org.opensearch.migrations.bulkload logger.rfs.level = ${ownedPackagesLogLevel} logger.migration.name = org.opensearch.migrations logger.migration.level = ${ownedPackagesLogLevel}