another push of spotless changes.

I think that the '#' character is a special magical one that means static imports, but I can't find it documented. Signed-off-by: Greg Schohn <[email protected]>
opensearch-project · Oct 4, 2024 · 0ba81b7 · 0ba81b7
1 parent a364b08
commit 0ba81b7
Show file tree

Hide file tree

Showing 428 changed files with 1,980 additions and 1,343 deletions.
diff --git a/CreateSnapshot/src/main/java/org/opensearch/migrations/CreateSnapshot.java b/CreateSnapshot/src/main/java/org/opensearch/migrations/CreateSnapshot.java
@@ -1,13 +1,7 @@
 package org.opensearch.migrations;
 
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.ParametersDelegate;
 import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
+
 import org.opensearch.migrations.bulkload.common.FileSystemSnapshotCreator;
 import org.opensearch.migrations.bulkload.common.OpenSearchClient;
 import org.opensearch.migrations.bulkload.common.S3SnapshotCreator;
@@ -22,6 +16,14 @@
 import org.opensearch.migrations.tracing.RootOtelContext;
 import org.opensearch.migrations.utils.ProcessHelpers;
 
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.ParameterException;
+import com.beust.jcommander.ParametersDelegate;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
 @AllArgsConstructor
 @Slf4j
 public class CreateSnapshot {

diff --git a/CreateSnapshot/src/test/java/org/opensearch/migrations/TestCreateSnapshot.java b/CreateSnapshot/src/test/java/org/opensearch/migrations/TestCreateSnapshot.java
@@ -1,22 +1,13 @@
 package org.opensearch.migrations;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpMethod;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+
 import org.opensearch.migrations.bulkload.common.OpenSearchClient;
 import org.opensearch.migrations.bulkload.common.S3SnapshotCreator;
 import org.opensearch.migrations.bulkload.common.http.ConnectionContextTestParams;
@@ -25,6 +16,17 @@
 import org.opensearch.migrations.testutils.SimpleHttpResponse;
 import org.opensearch.migrations.testutils.SimpleNettyHttpServer;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpMethod;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 @Slf4j
 public class TestCreateSnapshot {
     final SnapshotTestContext snapshotContext = SnapshotTestContext.factory().noOtelTracking();

diff --git a/...ntsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java b/...ntsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java
@@ -1,18 +1,13 @@
 package org.opensearch.migrations;
 
-import com.beust.jcommander.IStringConverter;
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.ParametersDelegate;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Clock;
 import java.time.Duration;
 import java.util.List;
 import java.util.function.Function;
-import lombok.extern.slf4j.Slf4j;
+
 import org.opensearch.migrations.bulkload.common.DefaultSourceRepoAccessor;
 import org.opensearch.migrations.bulkload.common.DocumentReindexer;
 import org.opensearch.migrations.bulkload.common.FileSystemRepo;
@@ -39,6 +34,13 @@
 import org.opensearch.migrations.tracing.CompositeContextTracker;
 import org.opensearch.migrations.tracing.RootOtelContext;
 import org.opensearch.migrations.utils.ProcessHelpers;
+
+import com.beust.jcommander.IStringConverter;
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.ParameterException;
+import com.beust.jcommander.ParametersDelegate;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 
 @Slf4j

diff --git a/...sFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java b/...sFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java
@@ -1,17 +1,10 @@
 package org.opensearch.migrations.bulkload;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 import java.io.File;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.io.TempDir;
-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;
@@ -23,6 +16,15 @@
 import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext;
 import org.opensearch.migrations.snapshot.creation.tracing.SnapshotTestContext;
 
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 @Tag("isolatedTest")
 public class EndToEndTest extends SourceTestBase {
     @TempDir

diff --git a/...tion/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java b/...tion/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java
@@ -1,7 +1,5 @@
 package org.opensearch.migrations.bulkload;
 
-import io.opentelemetry.sdk.metrics.data.LongPointData;
-import io.opentelemetry.sdk.metrics.data.MetricData;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,19 +11,23 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+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 io.opentelemetry.sdk.metrics.data.LongPointData;
+import io.opentelemetry.sdk.metrics.data.MetricData;
 import lombok.Lombok;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.params.ParameterizedTest;
 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;
 
 @Tag("isolatedTest")
 @Slf4j

diff --git a/...gration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java b/...gration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java
@@ -1,16 +1,18 @@
 package org.opensearch.migrations.bulkload;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
+
+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 lombok.extern.slf4j.Slf4j;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.StoredField;
@@ -22,16 +24,16 @@
 import org.apache.lucene.util.BytesRef;
 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 reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 @Slf4j
 public class PerformanceVerificationTest {
 

diff --git a/...pshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java b/...pshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java
@@ -1,6 +1,5 @@
 package org.opensearch.migrations.bulkload;
 
-import eu.rekawek.toxiproxy.model.ToxicDirection;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -11,18 +10,21 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Tag;
-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 eu.rekawek.toxiproxy.model.ToxicDirection;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.testcontainers.containers.Network;
 
 /**

diff --git a/...romSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java b/...romSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java
@@ -14,13 +14,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
-import lombok.AllArgsConstructor;
-import lombok.Lombok;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.hamcrest.MatcherAssert;
-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;
@@ -41,6 +35,14 @@
 import org.opensearch.migrations.bulkload.worker.DocumentsRunner;
 import org.opensearch.migrations.cluster.ClusterProviderRegistry;
 import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext;
+
+import lombok.AllArgsConstructor;
+import lombok.Lombok;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
 import reactor.core.publisher.Flux;
 
 @Slf4j

diff --git a/...hotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java b/...hotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java
@@ -1,10 +1,12 @@
 package org.opensearch.migrations.bulkload;
 
 import java.util.stream.Stream;
+
+import org.opensearch.migrations.bulkload.framework.SearchClusterContainer;
+
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
-import org.opensearch.migrations.bulkload.framework.SearchClusterContainer;
 
 /**
  * Defines all supported target clusters

diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/MetadataMigration.java b/MetadataMigration/src/main/java/org/opensearch/migrations/MetadataMigration.java
@@ -1,8 +1,7 @@
 package org.opensearch.migrations;
 
-import com.beust.jcommander.JCommander;
 import java.util.Optional;
-import lombok.extern.slf4j.Slf4j;
+
 import org.opensearch.migrations.commands.Configure;
 import org.opensearch.migrations.commands.Evaluate;
 import org.opensearch.migrations.commands.EvaluateArgs;
@@ -16,6 +15,9 @@
 import org.opensearch.migrations.tracing.RootOtelContext;
 import org.opensearch.migrations.utils.ProcessHelpers;
 
+import com.beust.jcommander.JCommander;
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class MetadataMigration {
 

diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/MigrateOrEvaluateArgs.java b/MetadataMigration/src/main/java/org/opensearch/migrations/MigrateOrEvaluateArgs.java
@@ -2,11 +2,12 @@
 
 
 
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParametersDelegate;
 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;
+
 public class MigrateOrEvaluateArgs {
     @Parameter(names = {"--help", "-h"}, help = true, description = "Displays information about how to use this tool")
     public boolean help;

diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/cli/ClusterReaderExtractor.java b/MetadataMigration/src/main/java/org/opensearch/migrations/cli/ClusterReaderExtractor.java
@@ -1,8 +1,7 @@
 package org.opensearch.migrations.cli;
 
-import com.beust.jcommander.ParameterException;
 import java.nio.file.Path;
-import lombok.AllArgsConstructor;
+
 import org.opensearch.migrations.MigrateOrEvaluateArgs;
 import org.opensearch.migrations.Version;
 import org.opensearch.migrations.bulkload.common.FileSystemRepo;
@@ -13,6 +12,9 @@
 import org.opensearch.migrations.cluster.ClusterProviderRegistry;
 import org.opensearch.migrations.cluster.ClusterReader;
 
+import com.beust.jcommander.ParameterException;
+import lombok.AllArgsConstructor;
+
 @AllArgsConstructor
 public class ClusterReaderExtractor {
     private final MigrateOrEvaluateArgs arguments;

diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/cli/Clusters.java b/MetadataMigration/src/main/java/org/opensearch/migrations/cli/Clusters.java
@@ -1,10 +1,11 @@
 package org.opensearch.migrations.cli;
 
+import org.opensearch.migrations.cluster.ClusterReader;
+import org.opensearch.migrations.cluster.ClusterWriter;
+
 import lombok.Builder;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.opensearch.migrations.cluster.ClusterReader;
-import org.opensearch.migrations.cluster.ClusterWriter;
 
 @Slf4j
 @Getter

diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/cli/Items.java b/MetadataMigration/src/main/java/org/opensearch/migrations/cli/Items.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;

diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/commands/Evaluate.java b/MetadataMigration/src/main/java/org/opensearch/migrations/commands/Evaluate.java
@@ -1,11 +1,12 @@
 package org.opensearch.migrations.commands;
 
-import com.beust.jcommander.ParameterException;
-import lombok.extern.slf4j.Slf4j;
 import org.opensearch.migrations.MigrateOrEvaluateArgs;
 import org.opensearch.migrations.MigrationMode;
 import org.opensearch.migrations.metadata.tracing.RootMetadataMigrationContext;
 
+import com.beust.jcommander.ParameterException;
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class Evaluate extends MigratorEvaluatorBase {