Change to bespoke spotless import spec to something more typical

.gitignore

@@ -8,7 +8,6 @@ __pycache__
 *.egg-info*
 .python-version
 logs
-.vscode/
 tmp/
 
 **/build/

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.completion.importOrder": ["javax","java","org.opensearch","","#"]
+}

CreateSnapshot/src/test/java/org/opensearch/migrations/TestCreateSnapshot.java

@@ -8,11 +8,6 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-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;
@@ -21,9 +16,13 @@
 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;

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java

@@ -5,11 +5,6 @@
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 
-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;
@@ -22,6 +17,10 @@
 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;

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java

@@ -12,23 +12,22 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.opentelemetry.sdk.metrics.data.LongPointData;
-import io.opentelemetry.sdk.metrics.data.MetricData;
-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;
 
+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;
 
 @Tag("isolatedTest")
 @Slf4j

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java

@@ -5,6 +5,15 @@
 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;
 import org.apache.lucene.index.DirectoryReader;
@@ -15,16 +24,6 @@
 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 lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java

@@ -11,11 +11,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-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;
@@ -26,6 +21,10 @@
 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;
 
 /**

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java

@@ -15,10 +15,6 @@
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
-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;
@@ -44,6 +40,9 @@
 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

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java

@@ -2,12 +2,12 @@
 
 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
  */

MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigrationItemResult.java

@@ -1,11 +1,11 @@
 package org.opensearch.migrations.commands;
 
-import org.apache.logging.log4j.util.Strings;
-
 import org.opensearch.migrations.cli.Clusters;
 import org.opensearch.migrations.cli.Format;
 import org.opensearch.migrations.cli.Items;
 
+import org.apache.logging.log4j.util.Strings;
+
 /** All shared cli result information */
 public interface MigrationItemResult extends Result {
     Clusters getClusters();

MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java

@@ -5,12 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
-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.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;
@@ -24,6 +18,11 @@
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+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.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;

MetadataMigration/src/test/java/org/opensearch/migrations/MetadataMigrationTest.java

@@ -2,10 +2,10 @@
 
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
-
 import org.opensearch.migrations.testutils.CloseableLogSetup;
 
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;

MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClusterReaderExtractorTest.java

@@ -1,7 +1,5 @@
 package org.opensearch.migrations.cli;
 
-import org.junit.jupiter.api.Test;
-
 import org.opensearch.migrations.MigrateOrEvaluateArgs;
 import org.opensearch.migrations.Version;
 import org.opensearch.migrations.bulkload.common.FileSystemRepo;
@@ -10,6 +8,7 @@
 import org.opensearch.migrations.cluster.ClusterReader;
 
 import com.beust.jcommander.ParameterException;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 import static org.hamcrest.CoreMatchers.equalTo;

MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClustersTest.java

@@ -1,15 +1,15 @@
 package org.opensearch.migrations.cli;
 
-import org.junit.jupiter.api.Test;
-
 import org.opensearch.migrations.cluster.ClusterReader;
 import org.opensearch.migrations.cluster.ClusterWriter;
 
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.opensearch.migrations.matchers.HasLineCount.hasLineCount;
 import static org.mockito.Mockito.mock;
+import static org.opensearch.migrations.matchers.HasLineCount.hasLineCount;
 
 public class ClustersTest {
     @Test

MetadataMigration/src/test/java/org/opensearch/migrations/commands/ConfigureTest.java

@@ -1,9 +1,9 @@
 package org.opensearch.migrations.commands;
 
-import org.junit.jupiter.api.Test;
-
 import org.opensearch.migrations.MetadataMigration;
 
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 

MetadataMigration/src/test/java/org/opensearch/migrations/commands/EvaluateTest.java

@@ -1,11 +1,11 @@
 package org.opensearch.migrations.commands;
 
-import org.junit.jupiter.api.Test;
-
 import org.opensearch.migrations.MetadataMigration;
 import org.opensearch.migrations.Version;
 import org.opensearch.migrations.metadata.tracing.RootMetadataMigrationContext;
 
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;

MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrateTest.java

@@ -1,11 +1,11 @@
 package org.opensearch.migrations.commands;
 
-import org.junit.jupiter.api.Test;
-
 import org.opensearch.migrations.MetadataMigration;
 import org.opensearch.migrations.Version;
 import org.opensearch.migrations.metadata.tracing.RootMetadataMigrationContext;
 
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;

MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrationItemResultTest.java

@@ -1,10 +1,10 @@
 package org.opensearch.migrations.commands;
 
-import org.junit.jupiter.api.Test;
-
 import org.opensearch.migrations.cli.Clusters;
 import org.opensearch.migrations.cli.Items;
 
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;

RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemSnapshotCreator.java

@@ -2,11 +2,11 @@
 
 import java.util.List;
 
+import org.opensearch.migrations.bulkload.tracing.IRfsContexts;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import org.opensearch.migrations.bulkload.tracing.IRfsContexts;
-
 public class FileSystemSnapshotCreator extends SnapshotCreator {
     private static final ObjectMapper mapper = new ObjectMapper();
 

RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java

@@ -8,11 +8,10 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.opensearch.migrations.bulkload.common.http.HttpResponse;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java

@@ -6,6 +6,11 @@
 import java.util.concurrent.Callable;
 import java.util.function.Function;
 
+import org.opensearch.migrations.cluster.ClusterSnapshotReader;
+
+import lombok.Lombok;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexCommit;
@@ -14,12 +19,6 @@
 import org.apache.lucene.index.SoftDeletesDirectoryReaderWrapper;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.BytesRef;
-
-import org.opensearch.migrations.cluster.ClusterSnapshotReader;
-
-import lombok.Lombok;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

RFS/src/main/java/org/opensearch/migrations/bulkload/common/OpenSearchClient.java

@@ -11,10 +11,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
 import org.opensearch.migrations.Flavor;
 import org.opensearch.migrations.Version;
 import org.opensearch.migrations.bulkload.common.http.ConnectionContext;
@@ -23,6 +19,9 @@
 import org.opensearch.migrations.parsing.BulkResponseParser;
 import org.opensearch.migrations.reindexer.FailedRequestsLogger;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;