diff --git a/.gitignore b/.gitignore index b96951d65..25af502e0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ __pycache__ *.egg-info* .python-version logs -.vscode/ tmp/ **/build/ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..342c57891 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "java.compile.nullAnalysis.mode": "automatic", + "java.completion.importOrder": ["javax","java","org.opensearch","","#"] +} \ No newline at end of file diff --git a/CreateSnapshot/src/test/java/org/opensearch/migrations/TestCreateSnapshot.java b/CreateSnapshot/src/test/java/org/opensearch/migrations/TestCreateSnapshot.java index 88fdb65b8..36757a224 100644 --- a/CreateSnapshot/src/test/java/org/opensearch/migrations/TestCreateSnapshot.java +++ b/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; diff --git a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java index 77104bf8b..71614f72a 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java +++ b/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; diff --git a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java index d07b11052..b0256304d 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java +++ b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java @@ -12,14 +12,6 @@ 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; @@ -27,8 +19,15 @@ 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 diff --git a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java index a65c3c790..6bb4b65e8 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/PerformanceVerificationTest.java +++ b/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; diff --git a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java index b577ddd3e..c3aaf8ccf 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ProcessLifecycleTest.java +++ b/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; /** diff --git a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java index 4c5e78480..ceeac2d16 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java +++ b/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 diff --git a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java b/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java index b7fd25a1b..41ee1ac7f 100644 --- a/DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SupportedTargetCluster.java +++ b/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 */ diff --git a/MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigrationItemResult.java b/MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigrationItemResult.java index 67396f11a..4de0da438 100644 --- a/MetadataMigration/src/main/java/org/opensearch/migrations/commands/MigrationItemResult.java +++ b/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(); diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java index 8a7f7248b..01ea88526 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java +++ b/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; diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/MetadataMigrationTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/MetadataMigrationTest.java index 8b2de3940..97b6ec67a 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/MetadataMigrationTest.java +++ b/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; 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 9d6deae5c..9174cf6f6 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClusterReaderExtractorTest.java +++ b/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; diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClustersTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClustersTest.java index 6a037bf48..b942d2436 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/cli/ClustersTest.java +++ b/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 diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/ConfigureTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/commands/ConfigureTest.java index 10fb99e10..ba7e6264f 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/ConfigureTest.java +++ b/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; diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/EvaluateTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/commands/EvaluateTest.java index 9da7d6593..558a3d187 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/EvaluateTest.java +++ b/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; diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrateTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrateTest.java index b3013388e..e29da49e0 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrateTest.java +++ b/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; diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrationItemResultTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrationItemResultTest.java index f5e745e42..19b67f5ed 100644 --- a/MetadataMigration/src/test/java/org/opensearch/migrations/commands/MigrationItemResultTest.java +++ b/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; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemSnapshotCreator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemSnapshotCreator.java index a0b8f1cb0..edbcf0904 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/FileSystemSnapshotCreator.java +++ b/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(); diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java index 2205a99c5..30bea01ee 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java +++ b/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 diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java index 74d161b5e..c4583ce71 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java +++ b/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; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/OpenSearchClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/OpenSearchClient.java index 65947c99b..0d01ced82 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/OpenSearchClient.java +++ b/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; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RestClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RestClient.java index fb47d4984..988ae5de8 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RestClient.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/RestClient.java @@ -1,5 +1,9 @@ package org.opensearch.migrations.bulkload.common; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLParameters; + import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -8,9 +12,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; import java.util.stream.Collectors; -import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLParameters; import org.opensearch.migrations.bulkload.common.http.CompositeTransformer; import org.opensearch.migrations.bulkload.common.http.ConnectionContext; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3SnapshotCreator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3SnapshotCreator.java index 58c7b7111..b92c15da5 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3SnapshotCreator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/S3SnapshotCreator.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 S3SnapshotCreator extends SnapshotCreator { private static final ObjectMapper mapper = new ObjectMapper(); diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotCreator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotCreator.java index 9d8e53af4..5fd55d8a5 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotCreator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotCreator.java @@ -3,13 +3,12 @@ import java.util.List; import java.util.Optional; +import org.opensearch.migrations.bulkload.tracing.IRfsContexts; + import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; - -import org.opensearch.migrations.bulkload.tracing.IRfsContexts; - import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotShardUnpacker.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotShardUnpacker.java index c8951157b..294b93c75 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotShardUnpacker.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/common/SnapshotShardUnpacker.java @@ -5,17 +5,16 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.NativeFSLockFactory; -import org.apache.lucene.util.BytesRef; - import org.opensearch.migrations.bulkload.models.ShardFileInfo; import org.opensearch.migrations.bulkload.models.ShardMetadata; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.store.NativeFSLockFactory; +import org.apache.lucene.util.BytesRef; @RequiredArgsConstructor @Slf4j diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/models/GlobalMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/GlobalMetadata.java index a1e4fcd3b..8dd260f22 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/models/GlobalMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/GlobalMetadata.java @@ -5,16 +5,16 @@ import java.io.InputStream; import java.nio.file.Path; +import org.opensearch.migrations.bulkload.common.ByteArrayIndexInput; +import org.opensearch.migrations.bulkload.common.RfsException; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; + 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 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; - public interface GlobalMetadata { /** * Defines the behavior expected of an object that will surface the global metadata of a snapshot diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/models/IndexMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/IndexMetadata.java index c493038f9..dcc6d7d8c 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/models/IndexMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/IndexMetadata.java @@ -5,16 +5,16 @@ import java.io.InputStream; import java.nio.file.Path; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -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.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.smile.SmileFactory; +import org.apache.lucene.codecs.CodecUtil; + public interface IndexMetadata extends Index { /* diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardMetadata.java index a587e6d84..81fc9f8ef 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/models/ShardMetadata.java @@ -6,15 +6,15 @@ import java.nio.file.Path; import java.util.List; +import org.opensearch.migrations.bulkload.common.ByteArrayIndexInput; +import org.opensearch.migrations.bulkload.common.RfsException; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; 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; - /** * Defines the behavior expected of an object that will surface the metadata of an shard stored in a snapshot * See: https://github.com/elastic/elasticsearch/blob/7.10/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java#L510 diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/BaseRootRfsContext.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/BaseRootRfsContext.java index 272e23a59..144841c8b 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/BaseRootRfsContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/BaseRootRfsContext.java @@ -1,10 +1,10 @@ package org.opensearch.migrations.bulkload.tracing; -import io.opentelemetry.api.OpenTelemetry; - import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.RootOtelContext; +import io.opentelemetry.api.OpenTelemetry; + public class BaseRootRfsContext extends RootOtelContext { public final RfsContexts.GenericRequestContext.MetricInstruments genericRequestInstruments; public final RfsContexts.CheckedIdempotentPutRequestContext.MetricInstruments getTwoStepIdempotentRequestInstruments; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RfsContexts.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RfsContexts.java index 925a0f3be..96f793cf3 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RfsContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RfsContexts.java @@ -1,15 +1,14 @@ package org.opensearch.migrations.bulkload.tracing; +import org.opensearch.migrations.tracing.BaseSpanContext; +import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; +import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; + import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; - -import org.opensearch.migrations.tracing.BaseSpanContext; -import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; -import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; - import lombok.Getter; import lombok.NonNull; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RootWorkCoordinationContext.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RootWorkCoordinationContext.java index 0f5eff14b..ee36f5ed5 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RootWorkCoordinationContext.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/RootWorkCoordinationContext.java @@ -1,11 +1,11 @@ package org.opensearch.migrations.bulkload.tracing; -import io.opentelemetry.api.OpenTelemetry; - import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; import org.opensearch.migrations.tracing.RootOtelContext; +import io.opentelemetry.api.OpenTelemetry; + public class RootWorkCoordinationContext extends RootOtelContext { private static final String SCOPE_NAME = "workCoordination"; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/WorkCoordinationContexts.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/WorkCoordinationContexts.java index e8cc5fafe..ff0a26362 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/WorkCoordinationContexts.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/tracing/WorkCoordinationContexts.java @@ -1,13 +1,12 @@ 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 io.opentelemetry.api.metrics.LongCounter; +import io.opentelemetry.api.metrics.Meter; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NonNull; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java index 9c50f5a5e..fb5cb3c17 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java @@ -1,12 +1,12 @@ package org.opensearch.migrations.bulkload.transformers; +import org.opensearch.migrations.Version; +import org.opensearch.migrations.VersionMatchers; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.opensearch.migrations.Version; -import org.opensearch.migrations.VersionMatchers; - public class TransformFunctions { private static final ObjectMapper mapper = new ObjectMapper(); public static final String MAPPINGS_KEY_STR = "mappings"; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index 16087ac2f..a4005752c 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 @@ -2,9 +2,6 @@ import java.util.List; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; - 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; @@ -13,6 +10,8 @@ import org.opensearch.migrations.transformation.entity.Index; import org.opensearch.migrations.transformation.rules.IndexMappingTypeRemoval; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index 429748429..48c9366a2 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,11 +1,10 @@ package org.opensearch.migrations.bulkload.transformers; -import com.fasterxml.jackson.databind.node.ObjectNode; - 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 com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index 652103a65..465497f30 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,9 +1,9 @@ package org.opensearch.migrations.bulkload.version_es_6_8; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import com.fasterxml.jackson.databind.node.ObjectNode; + public class GlobalMetadataData_ES_6_8 implements GlobalMetadata { private final ObjectNode root; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index 4402ec9d1..53a1844da 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,12 +1,12 @@ package org.opensearch.migrations.bulkload.version_es_6_8; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -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/org/opensearch/migrations/bulkload/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 index bc7cc2ffd..0effc88ce 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,11 +1,10 @@ package org.opensearch.migrations.bulkload.version_es_6_8; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.IndexMetadata; import org.opensearch.migrations.bulkload.transformers.TransformFunctions; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Getter; public class IndexMetadataData_ES_6_8 implements IndexMetadata { diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index b734ec2d5..0390c2121 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,12 +1,12 @@ package org.opensearch.migrations.bulkload.version_es_6_8; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.IndexMetadata; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -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/org/opensearch/migrations/bulkload/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 index 42769cd55..516fe713c 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 @@ -4,6 +4,9 @@ import java.util.Collections; import java.util.List; +import org.opensearch.migrations.bulkload.models.ShardFileInfo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; @@ -11,12 +14,8 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.lucene.util.BytesRef; - -import org.opensearch.migrations.bulkload.models.ShardFileInfo; -import org.opensearch.migrations.bulkload.models.ShardMetadata; - import lombok.Getter; +import org.apache.lucene.util.BytesRef; @Getter public class ShardMetadataData_ES_6_8 implements ShardMetadata { diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index 2556b58e8..2cebad058 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,14 +1,13 @@ package org.opensearch.migrations.bulkload.version_es_6_8; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; - -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/org/opensearch/migrations/bulkload/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 index 1cd0aeee8..431429a28 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 @@ -6,12 +6,11 @@ import java.util.List; import java.util.Map; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.opensearch.migrations.bulkload.common.SnapshotRepo; import org.opensearch.migrations.bulkload.common.SnapshotRepo.CantParseRepoFile; import org.opensearch.migrations.bulkload.common.SourceRepo; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index b4cc96492..8b3e294c9 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,9 +1,9 @@ package org.opensearch.migrations.bulkload.version_es_7_10; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import com.fasterxml.jackson.databind.node.ObjectNode; + public class GlobalMetadataData_ES_7_10 implements GlobalMetadata { private final ObjectNode root; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index e69f5c71f..8de92c746 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,12 +1,12 @@ package org.opensearch.migrations.bulkload.version_es_7_10; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.GlobalMetadata; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -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/org/opensearch/migrations/bulkload/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 index 79a624196..2377704f6 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,10 +1,9 @@ package org.opensearch.migrations.bulkload.version_es_7_10; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.IndexMetadata; import org.opensearch.migrations.bulkload.transformers.TransformFunctions; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Getter; public class IndexMetadataData_ES_7_10 implements IndexMetadata { diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index f531db85b..e32cc59c1 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,12 +1,12 @@ package org.opensearch.migrations.bulkload.version_es_7_10; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.IndexMetadata; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; -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/org/opensearch/migrations/bulkload/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 index 3a3cd749e..f1907af97 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 @@ -4,6 +4,9 @@ import java.util.Collections; import java.util.List; +import org.opensearch.migrations.bulkload.models.ShardFileInfo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; @@ -12,12 +15,8 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.lucene.util.BytesRef; - -import org.opensearch.migrations.bulkload.models.ShardFileInfo; -import org.opensearch.migrations.bulkload.models.ShardMetadata; - import lombok.Getter; +import org.apache.lucene.util.BytesRef; @Getter public class ShardMetadataData_ES_7_10 implements ShardMetadata { diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index 3f6e0e06f..29d291578 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,15 +1,14 @@ package org.opensearch.migrations.bulkload.version_es_7_10; +import org.opensearch.migrations.bulkload.common.SnapshotRepo; +import org.opensearch.migrations.bulkload.models.ShardMetadata; + import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.smile.SmileFactory; - -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/org/opensearch/migrations/bulkload/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 index bc21742c3..74d31fa20 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 @@ -6,14 +6,13 @@ import java.util.List; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.opensearch.migrations.bulkload.common.SnapshotRepo; import org.opensearch.migrations.bulkload.common.SnapshotRepo.CantParseRepoFile; import org.opensearch.migrations.bulkload.common.SourceRepo; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index d8ff0be2d..dd0140d64 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 @@ -6,8 +6,6 @@ import java.util.Map; import java.util.Optional; -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; @@ -15,6 +13,7 @@ import org.opensearch.migrations.metadata.GlobalMetadataCreatorResults; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.IClusterMetadataContext; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index b251cca4c..a7c00b3f4 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,9 +1,9 @@ package org.opensearch.migrations.bulkload.version_os_2_11; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import com.fasterxml.jackson.databind.node.ObjectNode; + public class GlobalMetadataData_OS_2_11 implements GlobalMetadata { private final ObjectNode root; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index b6b772e88..8cadfdb5c 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,8 +1,5 @@ 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; @@ -10,6 +7,8 @@ import org.opensearch.migrations.metadata.IndexCreator; import org.opensearch.migrations.metadata.tracing.IMetadataMigrationContexts.ICreateIndexContext; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/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 index 575811bce..c621e3861 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/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,9 +1,9 @@ package org.opensearch.migrations.bulkload.version_os_2_11; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.IndexMetadata; +import com.fasterxml.jackson.databind.node.ObjectNode; + public class IndexMetadataData_OS_2_11 implements IndexMetadata { private ObjectNode root; private String indexId; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteDataProvider.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteDataProvider.java index 9cddfcb59..50119c5ee 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteDataProvider.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteDataProvider.java @@ -3,13 +3,12 @@ import java.util.ArrayList; import java.util.List; -import com.fasterxml.jackson.databind.node.ObjectNode; - 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 com.fasterxml.jackson.databind.node.ObjectNode; import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadata.java index 41233a13f..7f830c63a 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadata.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.bulkload.version_universal; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.IndexMetadata; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadataFactory.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadataFactory.java index a410e2d33..e07bd3d66 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadataFactory.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteIndexMetadataFactory.java @@ -1,12 +1,11 @@ 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 org.opensearch.migrations.bulkload.common.SnapshotRepo.Provider; import org.opensearch.migrations.bulkload.models.IndexMetadata; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.smile.SmileFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadata.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadata.java index a4b534a85..22e042a01 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadata.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadata.java @@ -2,10 +2,9 @@ import java.util.Optional; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadataFactory.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadataFactory.java index 48312801c..30113db0b 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadataFactory.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteMetadataFactory.java @@ -1,11 +1,10 @@ package org.opensearch.migrations.bulkload.version_universal; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.dataformat.smile.SmileFactory; - import org.opensearch.migrations.bulkload.common.SnapshotRepo.Provider; import org.opensearch.migrations.bulkload.models.GlobalMetadata; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.dataformat.smile.SmileFactory; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java index e802031c9..2889a5868 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java @@ -4,12 +4,11 @@ import java.util.Map; import java.util.Map.Entry; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.bulkload.common.OpenSearchClient; import org.opensearch.migrations.bulkload.common.http.ConnectionContext; import org.opensearch.migrations.bulkload.common.http.HttpResponse; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java index c57e60a6e..f1d9e801f 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoordinator.java @@ -11,10 +11,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.opensearch.migrations.bulkload.tracing.IWorkCoordinationContexts; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Lombok; 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 4387305bf..a88aee0dc 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 @@ -1,7 +1,5 @@ package org.opensearch.migrations.metadata.tracing; -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; @@ -9,6 +7,7 @@ import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; +import io.opentelemetry.api.metrics.Meter; import lombok.NonNull; public interface 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 8ba720e0d..2cb6d4198 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 @@ -1,10 +1,10 @@ package org.opensearch.migrations.metadata.tracing; -import io.opentelemetry.api.OpenTelemetry; - import org.opensearch.migrations.bulkload.tracing.BaseRootRfsContext; import org.opensearch.migrations.tracing.IContextTracker; +import io.opentelemetry.api.OpenTelemetry; + public class RootMetadataMigrationContext extends BaseRootRfsContext { public static final String SCOPE_NAME = "metadataMigration"; diff --git a/RFS/src/main/java/org/opensearch/migrations/parsing/BulkResponseParser.java b/RFS/src/main/java/org/opensearch/migrations/parsing/BulkResponseParser.java index b7d2d832e..2f7e56a94 100644 --- a/RFS/src/main/java/org/opensearch/migrations/parsing/BulkResponseParser.java +++ b/RFS/src/main/java/org/opensearch/migrations/parsing/BulkResponseParser.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; - import lombok.Builder; import lombok.Getter; import lombok.experimental.UtilityClass; 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 7f3ffb246..2c17bcb42 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 @@ -1,7 +1,5 @@ package org.opensearch.migrations.reindexer.tracing; -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; @@ -11,6 +9,7 @@ import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; +import io.opentelemetry.api.metrics.Meter; import lombok.NonNull; public interface DocumentMigrationContexts extends IDocumentMigrationContexts { 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 9873dd4b7..66e0979cf 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 @@ -1,11 +1,10 @@ package org.opensearch.migrations.reindexer.tracing; -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 io.opentelemetry.api.OpenTelemetry; 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 65d3c3bec..58d4cdb4f 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 @@ -1,13 +1,12 @@ package org.opensearch.migrations.snapshot.creation.tracing; -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 io.opentelemetry.api.metrics.Meter; import lombok.NonNull; public class CreateSnapshotContext extends BaseSpanContext 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 ea1d3f4c4..9dedcfd79 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 @@ -1,11 +1,11 @@ package org.opensearch.migrations.snapshot.creation.tracing; -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 io.opentelemetry.api.OpenTelemetry; + 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/org/opensearch/migrations/bulkload/common/ConnectionContextTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/ConnectionContextTest.java index 86ed5f172..61ee0b5ae 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/ConnectionContextTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/ConnectionContextTest.java @@ -1,17 +1,17 @@ package org.opensearch.migrations.bulkload.common; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; -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.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 org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + import static org.junit.jupiter.api.Assertions.*; class ConnectionContextTest { diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/DocumentReindexerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/DocumentReindexerTest.java index 4955f3bdb..73ed28718 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/DocumentReindexerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/DocumentReindexerTest.java @@ -5,13 +5,12 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -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 lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/InvalidResponseTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/InvalidResponseTest.java index 71527e717..237fb7e73 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/InvalidResponseTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/InvalidResponseTest.java @@ -2,10 +2,10 @@ import java.util.Map; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.bulkload.common.http.HttpResponse; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReaderTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReaderTest.java index bbb3b83f4..a477dd5ed 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReaderTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReaderTest.java @@ -13,9 +13,14 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; +import org.opensearch.migrations.Version; +import org.opensearch.migrations.bulkload.models.ShardMetadata; +import org.opensearch.migrations.cluster.ClusterProviderRegistry; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.StoredField; @@ -30,12 +35,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; 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 lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.scheduler.Schedulers; import reactor.test.StepVerifier; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/OpenSearchClientTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/OpenSearchClientTest.java index 8a6aa0405..64a355624 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/OpenSearchClientTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/OpenSearchClientTest.java @@ -5,12 +5,6 @@ import java.util.Map; import java.util.Optional; -import com.fasterxml.jackson.core.StreamReadFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.Version; import org.opensearch.migrations.bulkload.common.DocumentReindexer.BulkDocSection; import org.opensearch.migrations.bulkload.common.http.HttpResponse; @@ -20,7 +14,12 @@ import org.opensearch.migrations.bulkload.tracing.IRfsContexts.ICheckedIdempotentPutRequestContext; import org.opensearch.migrations.reindexer.FailedRequestsLogger; +import com.fasterxml.jackson.core.StreamReadFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.SneakyThrows; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import reactor.core.publisher.Mono; @@ -30,8 +29,6 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -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.anyString; @@ -44,6 +41,8 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import static org.opensearch.migrations.bulkload.http.BulkRequestGenerator.itemEntry; +import static org.opensearch.migrations.bulkload.http.BulkRequestGenerator.itemEntryFailure; class OpenSearchClientTest { private static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder() diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/RestClientTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/RestClientTest.java index 8c833b76b..385fd29d7 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/RestClientTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/RestClientTest.java @@ -6,11 +6,6 @@ import java.util.Map; import java.util.stream.Collectors; -import io.opentelemetry.sdk.trace.data.SpanData; -import org.hamcrest.MatcherAssert; -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; @@ -18,6 +13,10 @@ import org.opensearch.migrations.testutils.SimpleHttpResponse; import org.opensearch.migrations.testutils.SimpleNettyHttpServer; +import io.opentelemetry.sdk.trace.data.SpanData; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; import reactor.netty.http.client.HttpClient; import reactor.netty.resources.ConnectionProvider; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3RepoTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3RepoTest.java index fcbc5b9a4..244f4cd8d 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3RepoTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/S3RepoTest.java @@ -6,12 +6,11 @@ import java.util.List; import java.util.concurrent.CompletableFuture; +import org.opensearch.migrations.bulkload.common.S3Repo.CannotFindSnapshotRepoRoot; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; - -import org.opensearch.migrations.bulkload.common.S3Repo.CannotFindSnapshotRepoRoot; - import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformerTest.java index e3a6021f2..5bc3872e2 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/CompositeTransformerTest.java @@ -4,7 +4,6 @@ import java.util.Collections; import org.junit.jupiter.api.Test; - import org.mockito.Mockito; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformerTest.java index 50aff7b7a..0af487e88 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/GzipPayloadRequestTransformerTest.java @@ -14,7 +14,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; - import reactor.core.publisher.Mono; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformerTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformerTest.java index 44cfef444..230185027 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/common/http/SigV4AuthTransformerTest.java @@ -10,10 +10,9 @@ import java.util.List; import java.util.Map; +import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - -import lombok.SneakyThrows; import reactor.core.publisher.Mono; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot_ES_7_10.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot_ES_7_10.java index 51c4e0e5f..8b32fd4da 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot_ES_7_10.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/framework/SimpleRestoreFromSnapshot_ES_7_10.java @@ -4,10 +4,6 @@ import java.util.List; import java.util.stream.Collectors; -import org.apache.logging.log4j.LogManager; -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; @@ -22,6 +18,10 @@ import org.opensearch.migrations.bulkload.version_es_7_10.SnapshotRepoProvider_ES_7_10; import org.opensearch.migrations.reindexer.tracing.IDocumentMigrationContexts; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.lucene.util.IOUtils; + /** * Simplified version of RFS for use in testing - ES 7.10 version. */ diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/SnapshotStateTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/SnapshotStateTest.java index 377c98653..445cd15d2 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/SnapshotStateTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/SnapshotStateTest.java @@ -4,11 +4,6 @@ import java.nio.file.Path; import java.util.List; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -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; @@ -16,6 +11,10 @@ import org.opensearch.migrations.bulkload.http.ClusterOperations; import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.mockito.ArgumentCaptor; import reactor.core.publisher.Mono; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/WorkerCompleteAfterErrorTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/WorkerCompleteAfterErrorTest.java index f088c7e5f..c7141cf6d 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/WorkerCompleteAfterErrorTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/integration/WorkerCompleteAfterErrorTest.java @@ -1,11 +1,10 @@ package org.opensearch.migrations.bulkload.integration; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import lombok.extern.slf4j.Slf4j; - /** * Test case to verify worker will not deadlock and complete all work given failures * during critical migration workflows. diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java index 19cfa94e5..1b0f7d0a8 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java @@ -3,9 +3,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.jupiter.api.Test; - import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java index 2bd61b4fc..9e07b77a4 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java @@ -1,8 +1,6 @@ package org.opensearch.migrations.bulkload.transformers; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.Version; import org.opensearch.migrations.bulkload.common.FileSystemRepo; import org.opensearch.migrations.bulkload.common.TestResources; @@ -13,6 +11,7 @@ import org.opensearch.migrations.cluster.ClusterProviderRegistry; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/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 index f227c40bf..751a86392 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/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 @@ -3,18 +3,17 @@ import java.util.Optional; import java.util.Set; -import com.fasterxml.jackson.core.StreamReadFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -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.fasterxml.jackson.core.StreamReadFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.SneakyThrows; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import static org.hamcrest.CoreMatchers.containsString; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoodinatorTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoodinatorTest.java index 3a1e3b43f..a851ffb14 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoodinatorTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/OpenSearchWorkCoodinatorTest.java @@ -8,18 +8,17 @@ import java.util.function.Function; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -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.workcoordination.OpenSearchWorkCoordinator.DocumentModificationResult; import org.opensearch.migrations.testutils.CloseableLogSetup; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException; import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorErrantAcquisitonsRetryTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorErrantAcquisitonsRetryTest.java index 1cfb87714..0375fb9ab 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorErrantAcquisitonsRetryTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorErrantAcquisitonsRetryTest.java @@ -6,13 +6,6 @@ import java.util.function.Function; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -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.http.ConnectionContextTestParams; import org.opensearch.migrations.testutils.HttpRequest; import org.opensearch.migrations.testutils.SimpleHttpResponse; @@ -21,6 +14,12 @@ import org.opensearch.migrations.workcoordination.tracing.WorkCoordinationTestContext; import lombok.NonNull; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.MDC; public class WorkCoordinatorErrantAcquisitonsRetryTest { diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorTest.java index 6edc9852e..9680f3955 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/workcoordination/WorkCoordinatorTest.java @@ -9,20 +9,19 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -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.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; /** * The contract here is that the first request in will acquire a lease for the duration that was requested. 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 a6173f588..72a5a1a91 100644 --- a/RFS/src/test/java/org/opensearch/migrations/parsing/BulkResponseParserTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/parsing/BulkResponseParserTest.java @@ -4,10 +4,9 @@ import java.util.List; import java.util.stream.Collectors; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.bulkload.http.BulkRequestGenerator; +import org.junit.jupiter.api.Test; import org.testcontainers.shaded.com.google.common.collect.Streams; import static org.hamcrest.CoreMatchers.equalTo; 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 e1723634d..ddef3970e 100644 --- a/RFS/src/test/java/org/opensearch/migrations/parsing/JacksonParserVsReadObjectBenchmark.java +++ b/RFS/src/test/java/org/opensearch/migrations/parsing/JacksonParserVsReadObjectBenchmark.java @@ -7,15 +7,14 @@ import java.util.UUID; import java.util.stream.Collectors; +import org.opensearch.migrations.bulkload.http.BulkRequestGenerator; +import org.opensearch.migrations.bulkload.http.BulkRequestGenerator.BulkItemResponseEntry; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.StreamReadFeature; import com.fasterxml.jackson.databind.json.JsonMapper; import org.junit.jupiter.api.Test; - -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 55bed16da..bb13e007c 100644 --- a/RFS/src/test/java/org/opensearch/migrations/reindexer/FailedRequestsLoggerTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/reindexer/FailedRequestsLoggerTest.java @@ -1,11 +1,11 @@ package org.opensearch.migrations.reindexer; -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 org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.hasItem; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedDataContainerOrchestrator.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedDataContainerOrchestrator.java index b098305ba..6f977f259 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedDataContainerOrchestrator.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/PreloadedDataContainerOrchestrator.java @@ -11,11 +11,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.collect.Streams; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.HttpClients; - import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.PullImageResultCallback; import com.github.dockerjava.api.command.WaitContainerResultCallback; @@ -24,9 +19,13 @@ import com.github.dockerjava.core.DockerClientImpl; import com.github.dockerjava.core.command.ExecStartResultCallback; import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; +import com.google.common.collect.Streams; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.HttpClients; import org.jetbrains.annotations.NotNull; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java index db7473ef8..05c8736e1 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java @@ -4,10 +4,9 @@ import java.time.Duration; import java.util.Map; -import com.google.common.collect.ImmutableMap; - import org.opensearch.migrations.Version; +import com.google.common.collect.ImmutableMap; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java index 751d60391..439862882 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/ClusterOperations.java @@ -4,6 +4,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; +import lombok.SneakyThrows; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; @@ -13,8 +14,6 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.io.entity.StringEntity; -import lombok.SneakyThrows; - import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/SearchClusterRequests.java b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/SearchClusterRequests.java index da12abc33..2525f0472 100644 --- a/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/SearchClusterRequests.java +++ b/RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/http/SearchClusterRequests.java @@ -5,11 +5,10 @@ import java.util.Map; import java.util.stream.Collectors; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.opensearch.migrations.bulkload.common.RestClient; import org.opensearch.migrations.reindexer.tracing.DocumentMigrationTestContext; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactory.java b/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactory.java index 4099e6389..47ecb3d8d 100644 --- a/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactory.java +++ b/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactory.java @@ -6,11 +6,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ForkJoinPool; -import com.google.protobuf.CodedOutputStream; -import org.apache.kafka.clients.producer.Producer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.clients.producer.RecordMetadata; - import org.opensearch.migrations.tracing.commoncontexts.IConnectionContext; import org.opensearch.migrations.trafficcapture.CodedOutputStreamHolder; import org.opensearch.migrations.trafficcapture.IChannelConnectionCaptureSerializer; @@ -19,9 +14,13 @@ import org.opensearch.migrations.trafficcapture.StreamChannelConnectionCaptureSerializer; import org.opensearch.migrations.trafficcapture.kafkaoffloader.tracing.IRootKafkaOffloaderContext; +import com.google.protobuf.CodedOutputStream; import lombok.AllArgsConstructor; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; @Slf4j public class KafkaCaptureFactory implements IConnectionCaptureFactory { diff --git a/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/tracing/KafkaRecordContext.java b/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/tracing/KafkaRecordContext.java index 8c53e48d2..8d7ce960e 100644 --- a/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/tracing/KafkaRecordContext.java +++ b/TrafficCapture/captureKafkaOffloader/src/main/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/tracing/KafkaRecordContext.java @@ -1,14 +1,13 @@ package org.opensearch.migrations.trafficcapture.kafkaoffloader.tracing; -import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.api.metrics.Meter; - import org.opensearch.migrations.tracing.BaseNestedSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; import org.opensearch.migrations.tracing.commoncontexts.IConnectionContext; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.api.metrics.Meter; import lombok.Getter; import lombok.NonNull; diff --git a/TrafficCapture/captureKafkaOffloader/src/test/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactoryTest.java b/TrafficCapture/captureKafkaOffloader/src/test/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactoryTest.java index 3b5b114fa..1791d9df1 100644 --- a/TrafficCapture/captureKafkaOffloader/src/test/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactoryTest.java +++ b/TrafficCapture/captureKafkaOffloader/src/test/java/org/opensearch/migrations/trafficcapture/kafkaoffloader/KafkaCaptureFactoryTest.java @@ -14,6 +14,12 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReentrantLock; +import org.opensearch.migrations.trafficcapture.kafkaoffloader.tracing.TestRootKafkaOffloaderContext; +import org.opensearch.migrations.trafficcapture.tracing.ConnectionContext; + +import io.netty.buffer.Unpooled; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.MockProducer; @@ -28,13 +34,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; - -import org.opensearch.migrations.trafficcapture.kafkaoffloader.tracing.TestRootKafkaOffloaderContext; -import org.opensearch.migrations.trafficcapture.tracing.ConnectionContext; - -import io.netty.buffer.Unpooled; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamAndByteBufferWrapper.java b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamAndByteBufferWrapper.java index 55a08be10..32b54ee7f 100644 --- a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamAndByteBufferWrapper.java +++ b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamAndByteBufferWrapper.java @@ -3,7 +3,6 @@ import java.nio.ByteBuffer; import com.google.protobuf.CodedOutputStream; - import lombok.Getter; import lombok.NonNull; diff --git a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamHolder.java b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamHolder.java index 566d4c1a4..28d7e096d 100644 --- a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamHolder.java +++ b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamHolder.java @@ -1,7 +1,6 @@ package org.opensearch.migrations.trafficcapture; import com.google.protobuf.CodedOutputStream; - import lombok.NonNull; public interface CodedOutputStreamHolder { diff --git a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtil.java b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtil.java index 3132884ed..87e7e8b92 100644 --- a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtil.java +++ b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtil.java @@ -2,12 +2,11 @@ import java.time.Instant; -import com.google.protobuf.CodedOutputStream; -import com.google.protobuf.Timestamp; - import org.opensearch.migrations.trafficcapture.protos.TrafficObservation; import org.opensearch.migrations.trafficcapture.protos.TrafficStream; +import com.google.protobuf.CodedOutputStream; +import com.google.protobuf.Timestamp; import io.netty.buffer.ByteBuf; /** diff --git a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializer.java b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializer.java index 5e836c66e..a98673087 100644 --- a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializer.java +++ b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializer.java @@ -9,12 +9,6 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.IntStream; -import com.google.protobuf.ByteOutput; -import com.google.protobuf.CodedOutputStream; -import com.google.protobuf.Descriptors; -import com.google.protobuf.Timestamp; -import com.google.protobuf.WireFormat; - import org.opensearch.migrations.trafficcapture.protos.CloseObservation; import org.opensearch.migrations.trafficcapture.protos.ConnectionExceptionObservation; import org.opensearch.migrations.trafficcapture.protos.EndOfMessageIndication; @@ -27,6 +21,11 @@ import org.opensearch.migrations.trafficcapture.protos.WriteObservation; import org.opensearch.migrations.trafficcapture.protos.WriteSegmentObservation; +import com.google.protobuf.ByteOutput; +import com.google.protobuf.CodedOutputStream; +import com.google.protobuf.Descriptors; +import com.google.protobuf.Timestamp; +import com.google.protobuf.WireFormat; import io.netty.buffer.ByteBuf; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/tracing/ConnectionContext.java b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/tracing/ConnectionContext.java index e14f52b3a..6fa4df172 100644 --- a/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/tracing/ConnectionContext.java +++ b/TrafficCapture/captureOffloader/src/main/java/org/opensearch/migrations/trafficcapture/tracing/ConnectionContext.java @@ -1,13 +1,12 @@ package org.opensearch.migrations.trafficcapture.tracing; -import io.opentelemetry.api.metrics.LongUpDownCounter; -import io.opentelemetry.api.metrics.Meter; - import org.opensearch.migrations.tracing.BaseSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IHasRootInstrumentationScope; import org.opensearch.migrations.tracing.commoncontexts.IConnectionContext; +import io.opentelemetry.api.metrics.LongUpDownCounter; +import io.opentelemetry.api.metrics.Meter; import lombok.Getter; import lombok.NonNull; diff --git a/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtilTest.java b/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtilTest.java index 7010af480..aa24d43ba 100644 --- a/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtilTest.java +++ b/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/CodedOutputStreamSizeUtilTest.java @@ -3,11 +3,10 @@ import java.nio.charset.StandardCharsets; import java.time.Instant; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; class CodedOutputStreamSizeUtilTest { diff --git a/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializerTest.java b/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializerTest.java index 2f080f403..38122b18e 100644 --- a/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializerTest.java +++ b/TrafficCapture/captureOffloader/src/test/java/org/opensearch/migrations/trafficcapture/StreamChannelConnectionCaptureSerializerTest.java @@ -13,15 +13,6 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutionException; -import com.google.protobuf.ByteString; -import com.google.protobuf.CodedOutputStream; -import com.google.protobuf.Timestamp; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; -import org.junit.jupiter.params.provider.ValueSource; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.trafficcapture.StreamChannelConnectionCaptureSerializerTest.StreamManager.NullStreamManager; import org.opensearch.migrations.trafficcapture.protos.CloseObservation; @@ -34,11 +25,19 @@ import org.opensearch.migrations.trafficcapture.protos.WriteObservation; import org.opensearch.migrations.trafficcapture.protos.WriteSegmentObservation; +import com.google.protobuf.ByteString; +import com.google.protobuf.CodedOutputStream; +import com.google.protobuf.Timestamp; import io.netty.buffer.Unpooled; import lombok.AllArgsConstructor; import lombok.Lombok; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; @Slf4j @WrapWithNettyLeakDetection(repetitions = 4) diff --git a/TrafficCapture/captureOffloader/src/testFixtures/java/org/opensearch/migrations/trafficcapture/InMemoryConnectionCaptureFactory.java b/TrafficCapture/captureOffloader/src/testFixtures/java/org/opensearch/migrations/trafficcapture/InMemoryConnectionCaptureFactory.java index 2a5f45f9e..d23586134 100644 --- a/TrafficCapture/captureOffloader/src/testFixtures/java/org/opensearch/migrations/trafficcapture/InMemoryConnectionCaptureFactory.java +++ b/TrafficCapture/captureOffloader/src/testFixtures/java/org/opensearch/migrations/trafficcapture/InMemoryConnectionCaptureFactory.java @@ -6,11 +6,10 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.stream.Stream; -import com.google.protobuf.InvalidProtocolBufferException; - import org.opensearch.migrations.tracing.commoncontexts.IConnectionContext; import org.opensearch.migrations.trafficcapture.protos.TrafficStream; +import com.google.protobuf.InvalidProtocolBufferException; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/RootWireLoggingContext.java b/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/RootWireLoggingContext.java index 3bdd4f3b6..023340a7d 100644 --- a/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/RootWireLoggingContext.java +++ b/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/RootWireLoggingContext.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.trafficcapture.netty.tracing; -import io.opentelemetry.api.OpenTelemetry; - import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.RootOtelContext; +import io.opentelemetry.api.OpenTelemetry; import lombok.Getter; @Getter diff --git a/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/WireCaptureContexts.java b/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/WireCaptureContexts.java index aec642c87..ff9486de7 100644 --- a/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/WireCaptureContexts.java +++ b/TrafficCapture/nettyWireLogging/src/main/java/org/opensearch/migrations/trafficcapture/netty/tracing/WireCaptureContexts.java @@ -1,12 +1,11 @@ package org.opensearch.migrations.trafficcapture.netty.tracing; -import io.opentelemetry.api.metrics.LongCounter; -import io.opentelemetry.api.metrics.Meter; - import org.opensearch.migrations.tracing.BaseNestedSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.commoncontexts.IConnectionContext; +import io.opentelemetry.api.metrics.LongCounter; +import io.opentelemetry.api.metrics.Meter; import lombok.Getter; import lombok.NonNull; diff --git a/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/ConditionallyReliableLoggingHttpHandlerTest.java b/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/ConditionallyReliableLoggingHttpHandlerTest.java index 5427a09a8..141014b51 100644 --- a/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/ConditionallyReliableLoggingHttpHandlerTest.java +++ b/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/ConditionallyReliableLoggingHttpHandlerTest.java @@ -13,12 +13,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - import org.opensearch.migrations.testutils.TestUtilities; import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.trafficcapture.StreamChannelConnectionCaptureSerializer; @@ -30,6 +24,11 @@ import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; @Slf4j @WrapWithNettyLeakDetection diff --git a/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/RootWireLoggingContextTest.java b/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/RootWireLoggingContextTest.java index 682ef9cd1..9a1dc128e 100644 --- a/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/RootWireLoggingContextTest.java +++ b/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/RootWireLoggingContextTest.java @@ -9,10 +9,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import io.opentelemetry.sdk.trace.data.SpanData; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.TestUtilities; import org.opensearch.migrations.trafficcapture.StreamChannelConnectionCaptureSerializer; import org.opensearch.migrations.trafficcapture.protos.TrafficObservation; @@ -21,7 +17,10 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; import io.netty.channel.embedded.EmbeddedChannel; +import io.opentelemetry.sdk.trace.data.SpanData; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j public class RootWireLoggingContextTest { diff --git a/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/TestStreamManager.java b/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/TestStreamManager.java index 36925242d..17ff801b8 100644 --- a/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/TestStreamManager.java +++ b/TrafficCapture/nettyWireLogging/src/test/java/org/opensearch/migrations/trafficcapture/netty/TestStreamManager.java @@ -5,12 +5,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import com.google.protobuf.CodedOutputStream; - import org.opensearch.migrations.trafficcapture.CodedOutputStreamAndByteBufferWrapper; import org.opensearch.migrations.trafficcapture.CodedOutputStreamHolder; import org.opensearch.migrations.trafficcapture.OrderedStreamLifecyleManager; +import com.google.protobuf.CodedOutputStream; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxy.java b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxy.java index 4a82315c0..d208bfd53 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxy.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxy.java @@ -1,5 +1,8 @@ package org.opensearch.migrations.trafficcapture.proxyserver; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLException; + import java.io.File; import java.io.FileReader; import java.io.IOException; @@ -20,17 +23,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; - -import com.google.protobuf.CodedOutputStream; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.apache.kafka.clients.CommonClientConfigs; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.common.config.SaslConfigs; import org.opensearch.common.settings.Settings; import org.opensearch.migrations.jcommander.NoSplitter; @@ -58,6 +50,10 @@ import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import com.google.protobuf.CodedOutputStream; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.socket.SocketChannel; @@ -68,6 +64,10 @@ import lombok.NonNull; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.CommonClientConfigs; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.config.SaslConfigs; @Slf4j public class CaptureProxy { diff --git a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/RootCaptureContext.java b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/RootCaptureContext.java index d832d84f5..253447b2f 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/RootCaptureContext.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/RootCaptureContext.java @@ -1,12 +1,11 @@ package org.opensearch.migrations.trafficcapture.proxyserver; -import io.opentelemetry.api.OpenTelemetry; - import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.trafficcapture.kafkaoffloader.tracing.IRootKafkaOffloaderContext; import org.opensearch.migrations.trafficcapture.kafkaoffloader.tracing.KafkaRecordContext; import org.opensearch.migrations.trafficcapture.netty.tracing.RootWireLoggingContext; +import io.opentelemetry.api.OpenTelemetry; import lombok.Getter; public class RootCaptureContext extends RootWireLoggingContext implements IRootKafkaOffloaderContext { diff --git a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/BacksideConnectionPool.java b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/BacksideConnectionPool.java index 4f2b0f5dd..3c243a80a 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/BacksideConnectionPool.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/BacksideConnectionPool.java @@ -1,9 +1,10 @@ package org.opensearch.migrations.trafficcapture.proxyserver.netty; +import javax.net.ssl.SSLEngine; + import java.net.URI; import java.time.Duration; import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLEngine; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelDuplexHandler; diff --git a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ProxyChannelInitializer.java b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ProxyChannelInitializer.java index 96972ec60..04fd3261f 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ProxyChannelInitializer.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/main/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ProxyChannelInitializer.java @@ -1,8 +1,9 @@ package org.opensearch.migrations.trafficcapture.proxyserver.netty; +import javax.net.ssl.SSLEngine; + import java.io.IOException; import java.util.function.Supplier; -import javax.net.ssl.SSLEngine; import org.opensearch.migrations.trafficcapture.IConnectionCaptureFactory; import org.opensearch.migrations.trafficcapture.netty.ConditionallyReliableLoggingHttpHandler; diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxyConfigurationTest.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxyConfigurationTest.java index 194e1aadc..1a8179b3c 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxyConfigurationTest.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/CaptureProxyConfigurationTest.java @@ -6,17 +6,16 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.SimpleHttpClientForTesting; import org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.CaptureProxyContainer; import org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.HttpdContainerTestBase; import org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.annotations.HttpdContainerTest; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/KafkaConfigurationCaptureProxyTest.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/KafkaConfigurationCaptureProxyTest.java index 98e85baac..0b0d30f35 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/KafkaConfigurationCaptureProxyTest.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/KafkaConfigurationCaptureProxyTest.java @@ -6,17 +6,6 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.function.ThrowingConsumer; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; - import org.opensearch.migrations.testutils.SimpleHttpClientForTesting; import org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.CaptureProxyContainer; import org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.HttpdContainerTestBase; @@ -29,6 +18,16 @@ import eu.rekawek.toxiproxy.Proxy; import eu.rekawek.toxiproxy.model.ToxicDirection; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.ThrowingConsumer; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/TestHeaderRewrites.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/TestHeaderRewrites.java index 20221a807..72ca5c837 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/TestHeaderRewrites.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/TestHeaderRewrites.java @@ -10,9 +10,6 @@ import java.util.Map; import java.util.stream.Collectors; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.HttpRequest; import org.opensearch.migrations.testutils.SimpleHttpClientForTesting; import org.opensearch.migrations.testutils.SimpleHttpResponse; @@ -20,6 +17,8 @@ import org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.CaptureProxyContainer; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j public class TestHeaderRewrites { diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ExpiringSubstitutableItemPoolTest.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ExpiringSubstitutableItemPoolTest.java index b4e11dae3..bf6281723 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ExpiringSubstitutableItemPoolTest.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/ExpiringSubstitutableItemPoolTest.java @@ -12,16 +12,15 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.concurrent.DefaultPromise; import io.netty.util.concurrent.DefaultThreadFactory; import io.netty.util.concurrent.Future; import lombok.Lombok; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; @Slf4j @Tag("isolatedTest") diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderAdderHandlerTest.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderAdderHandlerTest.java index 874af2432..99ccf6ba2 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderAdderHandlerTest.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderAdderHandlerTest.java @@ -7,17 +7,16 @@ import java.util.function.Supplier; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; @WrapWithNettyLeakDetection() @Slf4j diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderRemoverHandlerTest.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderRemoverHandlerTest.java index 133057c06..73480a0d3 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderRemoverHandlerTest.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/HeaderRemoverHandlerTest.java @@ -9,16 +9,15 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import io.netty.buffer.ByteBuf; import io.netty.channel.embedded.EmbeddedChannel; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; @WrapWithNettyLeakDetection(repetitions = 1) @Slf4j diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/NettyScanningHttpProxyTest.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/NettyScanningHttpProxyTest.java index 6579a2501..d074f2aa2 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/NettyScanningHttpProxyTest.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/netty/NettyScanningHttpProxyTest.java @@ -14,9 +14,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.common.collect.Tuple; import org.opensearch.migrations.testutils.HttpRequest; import org.opensearch.migrations.testutils.PortFinder; @@ -33,6 +30,8 @@ import lombok.Lombok; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j class NettyScanningHttpProxyTest { diff --git a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/testcontainers/annotations/TestContainerTest.java b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/testcontainers/annotations/TestContainerTest.java index 1aaab3986..7d001367c 100644 --- a/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/testcontainers/annotations/TestContainerTest.java +++ b/TrafficCapture/trafficCaptureProxyServer/src/test/java/org/opensearch/migrations/trafficcapture/proxyserver/testcontainers/annotations/TestContainerTest.java @@ -7,7 +7,6 @@ import java.lang.annotation.Target; import org.junit.jupiter.api.Tag; - import org.testcontainers.junit.jupiter.Testcontainers; @Inherited diff --git a/TrafficCapture/trafficCaptureProxyServerTest/src/main/java/org/opensearch/migrations/trafficcapture/JMeterLoadTest.java b/TrafficCapture/trafficCaptureProxyServerTest/src/main/java/org/opensearch/migrations/trafficcapture/JMeterLoadTest.java index 8302e2ec1..c6dd37a3e 100644 --- a/TrafficCapture/trafficCaptureProxyServerTest/src/main/java/org/opensearch/migrations/trafficcapture/JMeterLoadTest.java +++ b/TrafficCapture/trafficCaptureProxyServerTest/src/main/java/org/opensearch/migrations/trafficcapture/JMeterLoadTest.java @@ -5,6 +5,10 @@ import java.util.Arrays; import java.util.Optional; +import com.beust.jcommander.JCommander; +import com.beust.jcommander.Parameter; +import com.beust.jcommander.ParameterException; +import lombok.AllArgsConstructor; import org.apache.jmeter.assertions.ResponseAssertion; import org.apache.jmeter.control.LoopController; import org.apache.jmeter.engine.StandardJMeterEngine; @@ -19,11 +23,6 @@ import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.collections.ListedHashTree; - -import com.beust.jcommander.JCommander; -import com.beust.jcommander.Parameter; -import com.beust.jcommander.ParameterException; -import lombok.AllArgsConstructor; import org.jetbrains.annotations.NotNull; public class JMeterLoadTest { diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ClientConnectionPool.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ClientConnectionPool.java index 60aaa9eb2..433ff14a6 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ClientConnectionPool.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ClientConnectionPool.java @@ -4,16 +4,15 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; - import org.opensearch.migrations.NettyFutureBinders; import org.opensearch.migrations.replay.datatypes.ConnectionReplaySession; import org.opensearch.migrations.replay.tracing.IReplayContexts; import org.opensearch.migrations.replay.util.TextTrackedFuture; import org.opensearch.migrations.replay.util.TrackedFuture; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.EventLoop; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/RequestResponsePacketPair.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/RequestResponsePacketPair.java index ffcb8f9c3..81118b754 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/RequestResponsePacketPair.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/RequestResponsePacketPair.java @@ -6,8 +6,6 @@ import java.util.Collections; import java.util.List; -import com.google.common.base.Objects; - import org.opensearch.migrations.replay.datatypes.ISourceTrafficChannelKey; import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.datatypes.UniqueReplayerRequestKey; @@ -15,6 +13,7 @@ import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; import org.opensearch.migrations.tracing.IWithTypedEnclosingScope; +import com.google.common.base.Objects; import lombok.Getter; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ResultsToLogsConsumer.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ResultsToLogsConsumer.java index ddff142c1..765d2405b 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ResultsToLogsConsumer.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ResultsToLogsConsumer.java @@ -11,10 +11,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.opensearch.migrations.replay.datatypes.UniqueSourceRequestKey; +import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.buffer.ByteBuf; import lombok.Lombok; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TransformationLoader.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TransformationLoader.java index 84045ddd3..b05a6d197 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TransformationLoader.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TransformationLoader.java @@ -10,15 +10,14 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.opensearch.migrations.transform.IJsonTransformer; import org.opensearch.migrations.transform.IJsonTransformerProvider; import org.opensearch.migrations.transform.JsonCompositeTransformer; import org.opensearch.migrations.transform.JsonKeysForHttpMessage; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/Utils.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/Utils.java index a9005b107..da18dd938 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/Utils.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/Utils.java @@ -9,12 +9,11 @@ import java.util.stream.Stream; import java.util.zip.GZIPOutputStream; -import com.google.protobuf.ByteString; - import org.opensearch.migrations.trafficcapture.protos.ReadObservation; import org.opensearch.migrations.trafficcapture.protos.TrafficObservation; import org.opensearch.migrations.trafficcapture.protos.TrafficStream; +import com.google.protobuf.ByteString; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulator.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulator.java index f78c0b555..e875fd78d 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulator.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulator.java @@ -11,7 +11,6 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.async.ByteBufferFeeder; - import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonEmitter.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonEmitter.java index d89f43751..4294c2838 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonEmitter.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/JsonEmitter.java @@ -15,7 +15,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; - import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.CompositeByteBuf; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodyAccumulateHandler.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodyAccumulateHandler.java index 395ca84b0..804d9777a 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodyAccumulateHandler.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodyAccumulateHandler.java @@ -3,12 +3,11 @@ import java.util.ArrayList; import java.util.List; -import com.fasterxml.jackson.core.JacksonException; - import org.opensearch.migrations.replay.datahandlers.JsonAccumulator; import org.opensearch.migrations.replay.tracing.IReplayContexts; import org.opensearch.migrations.transform.JsonKeysForHttpMessage; +import com.fasterxml.jackson.core.JacksonException; import io.netty.buffer.CompositeByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetry.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetry.java index 581361c32..7cf32a854 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetry.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetry.java @@ -5,11 +5,6 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.core.async.ByteBufferFeeder; - import org.opensearch.migrations.replay.AggregatedRawResponse; import org.opensearch.migrations.replay.HttpByteBufFormatter; import org.opensearch.migrations.replay.IRequestResponsePacketPair; @@ -17,6 +12,10 @@ import org.opensearch.migrations.replay.util.TextTrackedFuture; import org.opensearch.migrations.replay.util.TrackedFuture; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.core.async.ByteBufferFeeder; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaBehavioralPolicy.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaBehavioralPolicy.java index b63c2318b..624d17f6d 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaBehavioralPolicy.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaBehavioralPolicy.java @@ -1,9 +1,8 @@ package org.opensearch.migrations.replay.kafka; import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.kafka.clients.consumer.ConsumerRecord; - import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.ConsumerRecord; @Slf4j public class KafkaBehavioralPolicy { diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSource.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSource.java index 3621a79b2..25a898c25 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSource.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSource.java @@ -20,11 +20,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.kafka.clients.consumer.Consumer; -import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.clients.consumer.KafkaConsumer; - import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamAndKey; import org.opensearch.migrations.replay.tracing.ChannelContextManager; @@ -35,10 +30,14 @@ import org.opensearch.migrations.replay.traffic.source.ITrafficStreamWithKey; import org.opensearch.migrations.trafficcapture.protos.TrafficStream; +import com.google.protobuf.InvalidProtocolBufferException; import io.netty.util.concurrent.DefaultThreadFactory; import lombok.NonNull; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.consumer.KafkaConsumer; /** * Adapt a Kafka stream into a TrafficCaptureSource. diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/TrackingKafkaConsumer.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/TrackingKafkaConsumer.java index e3e51b9a8..f2f8fc277 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/TrackingKafkaConsumer.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/kafka/TrackingKafkaConsumer.java @@ -18,13 +18,6 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.apache.kafka.clients.consumer.Consumer; -import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.apache.kafka.clients.consumer.OffsetAndMetadata; -import org.apache.kafka.common.TopicPartition; - import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.tracing.IKafkaConsumerContexts; import org.opensearch.migrations.replay.tracing.ITrafficSourceContexts; @@ -36,6 +29,12 @@ import lombok.Getter; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.clients.consumer.OffsetAndMetadata; +import org.apache.kafka.common.TopicPartition; import org.slf4j.event.Level; /** diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/IReplayContexts.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/IReplayContexts.java index b380fc617..1f1b80354 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/IReplayContexts.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/IReplayContexts.java @@ -2,15 +2,15 @@ import java.time.Instant; -import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.api.common.AttributesBuilder; - import org.opensearch.migrations.replay.datatypes.ISourceTrafficChannelKey; import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.datatypes.UniqueReplayerRequestKey; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; import org.opensearch.migrations.tracing.IWithTypedEnclosingScope; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.common.AttributesBuilder; + public interface IReplayContexts { class ActivityNames { diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/KafkaConsumerContexts.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/KafkaConsumerContexts.java index c1f97580d..a64501c5e 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/KafkaConsumerContexts.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/KafkaConsumerContexts.java @@ -2,20 +2,19 @@ import java.util.Collection; -import io.opentelemetry.api.metrics.LongCounter; -import io.opentelemetry.api.metrics.LongUpDownCounter; -import io.opentelemetry.api.metrics.Meter; -import org.apache.kafka.common.TopicPartition; - import org.opensearch.migrations.tracing.BaseNestedSpanContext; import org.opensearch.migrations.tracing.CommonMetricInstruments; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.DirectNestedSpanContext; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; +import io.opentelemetry.api.metrics.LongCounter; +import io.opentelemetry.api.metrics.LongUpDownCounter; +import io.opentelemetry.api.metrics.Meter; import lombok.Getter; import lombok.NonNull; import lombok.Setter; +import org.apache.kafka.common.TopicPartition; public class KafkaConsumerContexts { diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/ReplayContexts.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/ReplayContexts.java index ac7784de2..58e90ce96 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/ReplayContexts.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/ReplayContexts.java @@ -4,14 +4,6 @@ import java.time.Instant; import java.util.Optional; -import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.api.metrics.DoubleHistogram; -import io.opentelemetry.api.metrics.LongCounter; -import io.opentelemetry.api.metrics.LongUpDownCounter; -import io.opentelemetry.api.metrics.Meter; - import org.opensearch.migrations.replay.datatypes.ISourceTrafficChannelKey; import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.datatypes.UniqueReplayerRequestKey; @@ -20,6 +12,13 @@ import org.opensearch.migrations.tracing.DirectNestedSpanContext; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.api.metrics.DoubleHistogram; +import io.opentelemetry.api.metrics.LongCounter; +import io.opentelemetry.api.metrics.LongUpDownCounter; +import io.opentelemetry.api.metrics.Meter; import lombok.Getter; import lombok.NonNull; import lombok.Setter; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/RootReplayerContext.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/RootReplayerContext.java index 1d36e3398..7ed6482ce 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/RootReplayerContext.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/RootReplayerContext.java @@ -1,13 +1,12 @@ package org.opensearch.migrations.replay.tracing; -import io.opentelemetry.api.OpenTelemetry; - import org.opensearch.migrations.replay.datatypes.ISourceTrafficChannelKey; import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.traffic.source.InputStreamOfTraffic; import org.opensearch.migrations.tracing.IContextTracker; import org.opensearch.migrations.tracing.RootOtelContext; +import io.opentelemetry.api.OpenTelemetry; import lombok.Getter; @Getter diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/TrafficSourceContexts.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/TrafficSourceContexts.java index c4a7d7797..60fc0658a 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/TrafficSourceContexts.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/tracing/TrafficSourceContexts.java @@ -1,11 +1,10 @@ package org.opensearch.migrations.replay.tracing; -import io.opentelemetry.api.metrics.Meter; - import org.opensearch.migrations.tracing.BaseNestedSpanContext; import org.opensearch.migrations.tracing.CommonScopedMetricInstruments; import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; +import io.opentelemetry.api.metrics.Meter; import lombok.NonNull; public class TrafficSourceContexts { diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/traffic/source/BlockingTrafficSource.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/traffic/source/BlockingTrafficSource.java index aacafc91c..b25da73f2 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/traffic/source/BlockingTrafficSource.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/traffic/source/BlockingTrafficSource.java @@ -14,14 +14,13 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; -import com.google.protobuf.Timestamp; - import org.opensearch.migrations.replay.Utils; import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.tracing.ITrafficSourceContexts; import org.opensearch.migrations.trafficcapture.protos.TrafficObservation; import org.opensearch.migrations.trafficcapture.protos.TrafficStreamUtils; +import com.google.protobuf.Timestamp; import io.netty.util.concurrent.DefaultThreadFactory; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/NettyUtils.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/NettyUtils.java index 015f5c504..0a7f8166a 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/NettyUtils.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/NettyUtils.java @@ -4,7 +4,6 @@ import java.util.stream.Stream; import com.google.errorprone.annotations.MustBeClosed; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeHolder.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeHolder.java index a9a4d4ef6..483b2c8ee 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeHolder.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeHolder.java @@ -3,7 +3,6 @@ import javax.annotation.Nullable; import com.google.errorprone.annotations.MustBeClosed; - import io.netty.util.ReferenceCountUtil; public class RefSafeHolder implements AutoCloseable { diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeStreamUtils.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeStreamUtils.java index cb664af98..4bc7ec349 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeStreamUtils.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/RefSafeStreamUtils.java @@ -6,7 +6,6 @@ import java.util.stream.Stream; import com.google.errorprone.annotations.MustBeClosed; - import io.netty.util.ReferenceCounted; public final class RefSafeStreamUtils { diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/TrackedFutureJsonFormatter.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/TrackedFutureJsonFormatter.java index 9b8eb6742..26f778269 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/TrackedFutureJsonFormatter.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/util/TrackedFutureJsonFormatter.java @@ -8,7 +8,6 @@ import java.util.stream.Collectors; import com.fasterxml.jackson.databind.ObjectMapper; - import lombok.Lombok; import lombok.NonNull; import lombok.SneakyThrows; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/PruferTreeGeneratorTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/PruferTreeGeneratorTest.java index 65ed5325e..3cbe7346a 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/PruferTreeGeneratorTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/PruferTreeGeneratorTest.java @@ -7,11 +7,11 @@ import java.util.Random; import java.util.stream.IntStream; +import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; - @WrapWithNettyLeakDetection(disableLeakChecks = true) public class PruferTreeGeneratorTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/AWSAuthServiceTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/AWSAuthServiceTest.java index 9bdbc7291..c41a647e9 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/AWSAuthServiceTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/AWSAuthServiceTest.java @@ -2,12 +2,11 @@ import java.util.function.Consumer; +import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; - -import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; - import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/BlockingTrafficSourceTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/BlockingTrafficSourceTest.java index 22260972a..d99be87b6 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/BlockingTrafficSourceTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/BlockingTrafficSourceTest.java @@ -12,10 +12,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import com.google.protobuf.Timestamp; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamAndKey; import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamKeyAndContext; @@ -31,7 +27,10 @@ import org.opensearch.migrations.trafficcapture.protos.TrafficStream; import org.opensearch.migrations.trafficcapture.protos.TrafficStreamUtils; +import com.google.protobuf.Timestamp; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j @WrapWithNettyLeakDetection(disableLeakChecks = true) diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExhaustiveCapturedTrafficToHttpTransactionAccumulatorTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExhaustiveCapturedTrafficToHttpTransactionAccumulatorTest.java index 92be443c7..84f9669d2 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExhaustiveCapturedTrafficToHttpTransactionAccumulatorTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExhaustiveCapturedTrafficToHttpTransactionAccumulatorTest.java @@ -9,12 +9,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; -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.replay.traffic.generator.ExhaustiveTrafficStreamGenerator; import org.opensearch.migrations.tracing.InstrumentationTest; import org.opensearch.migrations.tracing.TestContext; @@ -22,6 +16,11 @@ import org.opensearch.migrations.trafficcapture.protos.TrafficStreamUtils; 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; @Slf4j @Tag("longTest") diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapSequentialTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapSequentialTest.java index 2d623b4c8..726986702 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapSequentialTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapSequentialTest.java @@ -8,14 +8,14 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamKeyAndContext; import org.opensearch.migrations.replay.traffic.expiration.BehavioralPolicy; import org.opensearch.migrations.replay.traffic.expiration.ExpiringTrafficStreamMap; import org.opensearch.migrations.tracing.InstrumentationTest; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + class ExpiringTrafficStreamMapSequentialTest extends InstrumentationTest { public static final String TEST_NODE_ID_STRING = "test_node_id"; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapUnorderedTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapUnorderedTest.java index 69c1961cd..ce3483e47 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapUnorderedTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ExpiringTrafficStreamMapUnorderedTest.java @@ -8,15 +8,15 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamKeyAndContext; import org.opensearch.migrations.replay.traffic.expiration.BehavioralPolicy; import org.opensearch.migrations.replay.traffic.expiration.ExpiringTrafficStreamMap; import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.tracing.InstrumentationTest; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @WrapWithNettyLeakDetection(disableLeakChecks = true) class ExpiringTrafficStreamMapUnorderedTest extends InstrumentationTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HeaderTransformerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HeaderTransformerTest.java index fdd69645f..cbafc3e70 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HeaderTransformerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HeaderTransformerTest.java @@ -10,9 +10,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datahandlers.http.HttpJsonTransformingConsumer; import org.opensearch.migrations.replay.datatypes.HttpRequestTransformationStatus; import org.opensearch.migrations.replay.util.TrackedFuture; @@ -21,6 +18,8 @@ import org.opensearch.migrations.transform.StaticAuthTransformerFactory; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j @WrapWithNettyLeakDetection(repetitions = 2) diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HttpByteBufFormatterTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HttpByteBufFormatterTest.java index a5929530b..a5c45bc8a 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HttpByteBufFormatterTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/HttpByteBufFormatterTest.java @@ -6,6 +6,12 @@ import java.util.List; import java.util.stream.Stream; +import org.opensearch.migrations.replay.util.RefSafeStreamUtils; +import org.opensearch.migrations.testutils.CountingNettyResourceLeakDetector; +import org.opensearch.migrations.testutils.TestUtilities; +import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; + +import io.netty.buffer.Unpooled; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -14,13 +20,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; -import org.opensearch.migrations.replay.util.RefSafeStreamUtils; -import org.opensearch.migrations.testutils.CountingNettyResourceLeakDetector; -import org.opensearch.migrations.testutils.TestUtilities; -import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; - -import io.netty.buffer.Unpooled; - @WrapWithNettyLeakDetection public class HttpByteBufFormatterTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/RequestSenderOrchestratorTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/RequestSenderOrchestratorTest.java index ad82de81e..86f387fcf 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/RequestSenderOrchestratorTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/RequestSenderOrchestratorTest.java @@ -15,12 +15,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Execution; -import org.junit.jupiter.api.parallel.ExecutionMode; - import org.opensearch.migrations.replay.datahandlers.IPacketFinalizingConsumer; import org.opensearch.migrations.replay.datahandlers.NettyPacketToHttpConsumer; import org.opensearch.migrations.replay.datatypes.ByteBufList; @@ -38,6 +32,11 @@ import io.netty.handler.codec.http.FullHttpResponse; import lombok.Lombok; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; import static org.opensearch.migrations.replay.datahandlers.NettyPacketToHttpConsumerTest.REGULAR_RESPONSE_TIMEOUT; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ResultsToLogsConsumerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ResultsToLogsConsumerTest.java index 3dbab055f..b60d4bc7d 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ResultsToLogsConsumerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/ResultsToLogsConsumerTest.java @@ -9,16 +9,6 @@ import java.util.ArrayList; import java.util.stream.Collectors; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.impl.Log4jContextFactory; -import org.apache.logging.log4j.core.selector.ClassLoaderContextSelector; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.ResourceLock; - import org.opensearch.migrations.replay.datatypes.ByteBufList; import org.opensearch.migrations.replay.datatypes.HttpRequestTransformationStatus; import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamKeyAndContext; @@ -27,8 +17,17 @@ import org.opensearch.migrations.tracing.InstrumentationTest; import org.opensearch.migrations.tracing.TestContext; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.impl.Log4jContextFactory; +import org.apache.logging.log4j.core.selector.ClassLoaderContextSelector; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.ResourceLock; @Slf4j @WrapWithNettyLeakDetection(repetitions = 4) diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/SimpleCapturedTrafficToHttpTransactionAccumulatorTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/SimpleCapturedTrafficToHttpTransactionAccumulatorTest.java index 8ff980383..2508de86e 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/SimpleCapturedTrafficToHttpTransactionAccumulatorTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/SimpleCapturedTrafficToHttpTransactionAccumulatorTest.java @@ -12,11 +12,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamAndKey; import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamKeyAndContext; @@ -31,6 +26,10 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; /** * Some things to consider - Reads, Writes, ReadSegments, WriteSegments, EndOfSegment, EndOfMessage diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TimeShifterTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TimeShifterTest.java index 66531bd98..8ee71097e 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TimeShifterTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TimeShifterTest.java @@ -4,11 +4,11 @@ import java.time.Instant; import java.util.Optional; +import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; - @WrapWithNettyLeakDetection(disableLeakChecks = true) class TimeShifterTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TrafficReplayerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TrafficReplayerTest.java index f24843b73..3b7747c04 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TrafficReplayerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/TrafficReplayerTest.java @@ -19,12 +19,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import com.google.protobuf.ByteString; -import com.google.protobuf.Timestamp; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.tracing.IReplayContexts; import org.opensearch.migrations.replay.traffic.source.InputStreamOfTraffic; @@ -38,8 +32,13 @@ import org.opensearch.migrations.trafficcapture.protos.TrafficStream; import org.opensearch.migrations.trafficcapture.protos.WriteObservation; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.slf4j.event.Level; @Slf4j diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/UtilsTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/UtilsTest.java index e1438b675..09ea35ec9 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/UtilsTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/UtilsTest.java @@ -3,12 +3,11 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.Utils; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j class UtilsTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulatorTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulatorTest.java index 6d08b0364..3956f10fb 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulatorTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonAccumulatorTest.java @@ -5,15 +5,15 @@ import java.nio.charset.StandardCharsets; import java.util.Random; +import org.opensearch.migrations.replay.GenerateRandomNestedJsonObject; +import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; + import com.fasterxml.jackson.databind.ObjectMapper; 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.replay.GenerateRandomNestedJsonObject; -import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; - @WrapWithNettyLeakDetection public class JsonAccumulatorTest { public static final String TINY = "tiny"; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonEmitterTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonEmitterTest.java index 7ed9ec743..4ff4bf1d2 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonEmitterTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/JsonEmitterTest.java @@ -5,14 +5,13 @@ import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; +import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.buffer.ByteBufAllocator; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j @WrapWithNettyLeakDetection diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/NettyPacketToHttpConsumerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/NettyPacketToHttpConsumerTest.java index 1c0803db6..53d26914a 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/NettyPacketToHttpConsumerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/NettyPacketToHttpConsumerTest.java @@ -16,13 +16,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; -import org.junit.jupiter.params.provider.ValueSource; - import org.opensearch.migrations.replay.AggregatedRawResponse; import org.opensearch.migrations.replay.ClientConnectionPool; import org.opensearch.migrations.replay.PacketToTransformingHttpHandlerFactory; @@ -52,6 +45,12 @@ import io.netty.util.concurrent.DefaultThreadFactory; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; @Slf4j @WrapWithNettyLeakDetection diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/HttpJsonTransformingConsumerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/HttpJsonTransformingConsumerTest.java index 073d882e4..67033e426 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/HttpJsonTransformingConsumerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/HttpJsonTransformingConsumerTest.java @@ -12,13 +12,6 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - import org.opensearch.migrations.replay.AggregatedRawResponse; import org.opensearch.migrations.replay.TestCapturePacketToHttpHandler; import org.opensearch.migrations.replay.TestUtils; @@ -33,6 +26,12 @@ import org.opensearch.migrations.transform.RemovingAuthTransformerFactory; import io.netty.buffer.ByteBuf; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; @WrapWithNettyLeakDetection class HttpJsonTransformingConsumerTest extends InstrumentationTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/ListKeyAdaptingCaseInsensitiveHeadersMapTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/ListKeyAdaptingCaseInsensitiveHeadersMapTest.java index 9947046c6..8a74a4a09 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/ListKeyAdaptingCaseInsensitiveHeadersMapTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/ListKeyAdaptingCaseInsensitiveHeadersMapTest.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.List; +import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; - @WrapWithNettyLeakDetection(disableLeakChecks = true) class ListKeyAdaptingCaseInsensitiveHeadersMapTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodySerializeHandlerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodySerializeHandlerTest.java index d89797b28..5fa135539 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodySerializeHandlerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonBodySerializeHandlerTest.java @@ -5,20 +5,19 @@ import java.util.Random; import java.util.stream.Stream; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.GenerateRandomNestedJsonObject; import org.opensearch.migrations.replay.ReplayUtils; import org.opensearch.migrations.replay.datahandlers.PayloadAccessFaultingMap; import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.transform.JsonKeysForHttpMessage; +import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.buffer.ByteBuf; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.http.HttpContent; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j @WrapWithNettyLeakDetection diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonToByteBufHandlerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonToByteBufHandlerTest.java index 79ccf10bb..bbe456302 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonToByteBufHandlerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datahandlers/http/NettyJsonToByteBufHandlerTest.java @@ -8,9 +8,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import io.netty.buffer.ByteBuf; @@ -18,6 +15,8 @@ import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.http.DefaultHttpContent; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j @WrapWithNettyLeakDetection diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datatypes/TimeToResponseFulfillmentFutureMapTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datatypes/TimeToResponseFulfillmentFutureMapTest.java index b38b1d540..f1a5dad64 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datatypes/TimeToResponseFulfillmentFutureMapTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/datatypes/TimeToResponseFulfillmentFutureMapTest.java @@ -3,11 +3,11 @@ import java.time.Duration; import java.time.Instant; +import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; - @WrapWithNettyLeakDetection(disableLeakChecks = true) class TimeToResponseFulfillmentFutureMapTest { @Test diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullReplayerWithTracingChecksTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullReplayerWithTracingChecksTest.java index 4d7f7d760..2cd4995de 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullReplayerWithTracingChecksTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullReplayerWithTracingChecksTest.java @@ -10,15 +10,6 @@ import java.util.Random; import java.util.stream.Collectors; -import io.opentelemetry.sdk.trace.data.SpanData; -import com.google.protobuf.ByteString; -import com.google.protobuf.Timestamp; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.parallel.ResourceLock; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - import org.opensearch.migrations.replay.RootReplayerConstructorExtensions; import org.opensearch.migrations.replay.TestHttpServerContext; import org.opensearch.migrations.replay.TimeShifter; @@ -38,7 +29,15 @@ import org.opensearch.migrations.trafficcapture.protos.WriteObservation; import org.opensearch.migrations.transform.StaticAuthTransformerFactory; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; +import io.opentelemetry.sdk.trace.data.SpanData; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.parallel.ResourceLock; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; @Slf4j @WrapWithNettyLeakDetection(disableLeakChecks = true) diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullTrafficReplayerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullTrafficReplayerTest.java index eb31a7762..2c2a884f1 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullTrafficReplayerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/FullTrafficReplayerTest.java @@ -1,5 +1,7 @@ package org.opensearch.migrations.replay.e2etests; +import javax.net.ssl.SSLException; + import java.io.EOFException; import java.io.IOException; import java.net.URI; @@ -13,14 +15,6 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.net.ssl.SSLException; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.ResourceLock; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; import org.opensearch.migrations.replay.CapturedTrafficToHttpTransactionAccumulator; import org.opensearch.migrations.replay.ReplayEngine; @@ -56,6 +50,12 @@ import lombok.Lombok; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.ResourceLock; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; @Slf4j // It would be great to test with leak detection here, but right now this test relies upon TrafficReplayer.shutdown() diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/KafkaRestartingTrafficReplayerTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/KafkaRestartingTrafficReplayerTest.java index 659f55feb..21fc6a585 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/KafkaRestartingTrafficReplayerTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/KafkaRestartingTrafficReplayerTest.java @@ -11,17 +11,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.collect.Streams; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.Producer; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.parallel.ResourceLock; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; - import org.opensearch.migrations.replay.SourceTargetCaptureTuple; import org.opensearch.migrations.replay.TestHttpServerContext; import org.opensearch.migrations.replay.V0_1TrafficCaptureSource; @@ -38,9 +27,19 @@ import org.opensearch.migrations.trafficcapture.protos.TrafficStream; import org.opensearch.migrations.trafficcapture.protos.TrafficStreamUtils; +import com.google.common.collect.Streams; import lombok.Lombok; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.parallel.ResourceLock; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/SlowAndExpiredTrafficStreamBecomesTwoTargetChannelsTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/SlowAndExpiredTrafficStreamBecomesTwoTargetChannelsTest.java index c5ecf5d03..4d8f6d185 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/SlowAndExpiredTrafficStreamBecomesTwoTargetChannelsTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/SlowAndExpiredTrafficStreamBecomesTwoTargetChannelsTest.java @@ -15,12 +15,6 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import com.google.protobuf.ByteString; -import com.google.protobuf.Timestamp; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.RootReplayerConstructorExtensions; import org.opensearch.migrations.replay.TimeShifter; import org.opensearch.migrations.replay.TransformationLoader; @@ -38,7 +32,12 @@ import org.opensearch.migrations.trafficcapture.protos.TrafficStream; import org.opensearch.migrations.transform.StaticAuthTransformerFactory; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; import lombok.SneakyThrows; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; public class SlowAndExpiredTrafficStreamBecomesTwoTargetChannelsTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/TrafficReplayerRunner.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/TrafficReplayerRunner.java index 57fc4a910..d06369331 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/TrafficReplayerRunner.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/e2etests/TrafficReplayerRunner.java @@ -1,5 +1,7 @@ package org.opensearch.migrations.replay.e2etests; +import javax.net.ssl.SSLException; + import java.net.URI; import java.time.Duration; import java.util.ArrayList; @@ -14,10 +16,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.net.ssl.SSLException; - -import com.google.common.base.Strings; -import org.junit.jupiter.api.Assertions; import org.opensearch.migrations.replay.RootReplayerConstructorExtensions; import org.opensearch.migrations.replay.SourceTargetCaptureTuple; @@ -32,8 +30,10 @@ import org.opensearch.migrations.tracing.TestContext; import org.opensearch.migrations.transform.StaticAuthTransformerFactory; +import com.google.common.base.Strings; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; import org.slf4j.event.Level; @Slf4j diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/HttpRetryTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/HttpRetryTest.java index 5a48e599b..416686740 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/HttpRetryTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/HttpRetryTest.java @@ -9,11 +9,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.ClientConnectionPool; import org.opensearch.migrations.replay.RequestSenderOrchestrator; import org.opensearch.migrations.replay.TestHttpServerContext; @@ -37,6 +32,10 @@ import io.netty.util.concurrent.DefaultThreadFactory; import lombok.Lombok; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetryTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetryTest.java index bbda9afa4..0b78e1fa6 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetryTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/http/retries/OpenSearchDefaultRetryTest.java @@ -8,16 +8,15 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; - import org.opensearch.migrations.replay.AggregatedRawResponse; import org.opensearch.migrations.replay.HttpByteBufFormatter; import org.opensearch.migrations.replay.RequestSenderOrchestrator; import org.opensearch.migrations.replay.util.TextTrackedFuture; import io.netty.buffer.Unpooled; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; class OpenSearchDefaultRetryTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaCommitsWorkBetweenLongPollsTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaCommitsWorkBetweenLongPollsTest.java index d6f03c8b8..f5f5ffe13 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaCommitsWorkBetweenLongPollsTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaCommitsWorkBetweenLongPollsTest.java @@ -5,12 +5,6 @@ import java.util.List; import java.util.concurrent.LinkedBlockingQueue; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.clients.producer.Producer; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.traffic.source.BlockingTrafficSource; import org.opensearch.migrations.replay.traffic.source.ITrafficStreamWithKey; import org.opensearch.migrations.testutils.SharedDockerImageNames; @@ -19,6 +13,11 @@ import lombok.Lombok; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.producer.Producer; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaKeepAliveTests.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaKeepAliveTests.java index 304b02d46..4bfad92b2 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaKeepAliveTests.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaKeepAliveTests.java @@ -9,13 +9,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.clients.producer.Producer; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datatypes.ITrafficStreamKey; import org.opensearch.migrations.replay.traffic.source.BlockingTrafficSource; import org.opensearch.migrations.testutils.SharedDockerImageNames; @@ -25,6 +18,12 @@ import lombok.Lombok; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.clients.producer.Producer; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTestUtils.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTestUtils.java index 3fe383abc..8d2c2b1b4 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTestUtils.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTestUtils.java @@ -7,20 +7,19 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import com.google.protobuf.ByteString; -import com.google.protobuf.Timestamp; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.Producer; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.clients.producer.ProducerRecord; - import org.opensearch.migrations.replay.util.TrafficChannelKeyFormatter; import org.opensearch.migrations.trafficcapture.protos.ReadObservation; import org.opensearch.migrations.trafficcapture.protos.TrafficObservation; import org.opensearch.migrations.trafficcapture.protos.TrafficStream; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.clients.producer.ProducerRecord; import org.jetbrains.annotations.NotNull; @Slf4j diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceLongTermTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceLongTermTest.java index 6c5647ab9..b827b2d2c 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceLongTermTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceLongTermTest.java @@ -6,15 +6,14 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.SharedDockerImageNames; import org.opensearch.migrations.tracing.InstrumentationTest; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceTest.java index 4e9b74227..263fb5f19 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/kafka/KafkaTrafficCaptureSourceTest.java @@ -15,16 +15,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import com.google.protobuf.ByteString; -import com.google.protobuf.Timestamp; -import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.consumer.OffsetResetStrategy; -import org.apache.kafka.common.TopicPartition; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.tracing.ChannelContextManager; import org.opensearch.migrations.replay.tracing.ReplayContexts; import org.opensearch.migrations.replay.traffic.source.ITrafficStreamWithKey; @@ -33,7 +23,16 @@ import org.opensearch.migrations.trafficcapture.protos.TrafficObservation; import org.opensearch.migrations.trafficcapture.protos.TrafficStream; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.MockConsumer; +import org.apache.kafka.clients.consumer.OffsetResetStrategy; +import org.apache.kafka.common.TopicPartition; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j class KafkaTrafficCaptureSourceTest extends InstrumentationTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/tracing/TracingTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/tracing/TracingTest.java index b99f82f19..30f4832b7 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/tracing/TracingTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/tracing/TracingTest.java @@ -7,18 +7,17 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import io.opentelemetry.sdk.metrics.data.MetricData; -import io.opentelemetry.sdk.trace.data.SpanData; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datatypes.ISourceTrafficChannelKey; import org.opensearch.migrations.replay.datatypes.PojoTrafficStreamKeyAndContext; import org.opensearch.migrations.replay.datatypes.UniqueReplayerRequestKey; import org.opensearch.migrations.tracing.InstrumentationTest; import org.opensearch.migrations.tracing.TestContext; +import io.opentelemetry.sdk.metrics.data.MetricData; +import io.opentelemetry.sdk.trace.data.SpanData; import lombok.Lombok; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TracingTest extends InstrumentationTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/transform/SigV4AuthTransformerFactoryTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/transform/SigV4AuthTransformerFactoryTest.java index 0f99b4896..e1564956f 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/transform/SigV4AuthTransformerFactoryTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/transform/SigV4AuthTransformerFactoryTest.java @@ -8,16 +8,15 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - import org.opensearch.migrations.replay.TestUtils; import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.tracing.InstrumentationTest; import org.opensearch.migrations.transform.SigV4AuthTransformerFactory; import io.netty.handler.codec.http.DefaultHttpHeaders; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/ActiveContextMonitorTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/ActiveContextMonitorTest.java index c8ab963b1..7f7507c64 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/ActiveContextMonitorTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/ActiveContextMonitorTest.java @@ -10,9 +10,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.tracing.ActiveContextTracker; import org.opensearch.migrations.tracing.ActiveContextTrackerByActivityType; import org.opensearch.migrations.tracing.CompositeContextTracker; @@ -20,6 +17,8 @@ import org.opensearch.migrations.tracing.TestContext; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.slf4j.event.Level; @Slf4j diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/OnlineRadixSorterTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/OnlineRadixSorterTest.java index 2fac899c0..a75accaa6 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/OnlineRadixSorterTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/OnlineRadixSorterTest.java @@ -6,11 +6,10 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import lombok.extern.slf4j.Slf4j; - @Slf4j class OnlineRadixSorterTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/RefSafeStreamUtilsTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/RefSafeStreamUtilsTest.java index 1a328c3ee..2b535a583 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/RefSafeStreamUtilsTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/RefSafeStreamUtilsTest.java @@ -6,10 +6,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; - import io.netty.util.AbstractReferenceCounted; import io.netty.util.ReferenceCounted; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TextTrackedFutureTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TextTrackedFutureTest.java index eb5450c81..d6db04138 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TextTrackedFutureTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TextTrackedFutureTest.java @@ -4,12 +4,11 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import lombok.SneakyThrows; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @WrapWithNettyLeakDetection(disableLeakChecks = true) class TextTrackedFutureTest { diff --git a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TrackedFutureTest.java b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TrackedFutureTest.java index 54107242c..f55c9442c 100644 --- a/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TrackedFutureTest.java +++ b/TrafficCapture/trafficReplayer/src/test/java/org/opensearch/migrations/replay/util/TrackedFutureTest.java @@ -2,10 +2,9 @@ import java.util.concurrent.Semaphore; -import org.junit.jupiter.api.Test; - import lombok.Lombok; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; @Slf4j class TrackedFutureTest { diff --git a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/GenerateRandomNestedJsonObject.java b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/GenerateRandomNestedJsonObject.java index b2ca0630b..29886bba3 100644 --- a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/GenerateRandomNestedJsonObject.java +++ b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/GenerateRandomNestedJsonObject.java @@ -9,11 +9,10 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.opensearch.migrations.PruferTreeGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; public class GenerateRandomNestedJsonObject { diff --git a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/RootReplayerConstructorExtensions.java b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/RootReplayerConstructorExtensions.java index 4519c8c32..fc669c56b 100644 --- a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/RootReplayerConstructorExtensions.java +++ b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/RootReplayerConstructorExtensions.java @@ -1,8 +1,9 @@ package org.opensearch.migrations.replay; +import javax.net.ssl.SSLException; + import java.net.URI; import java.time.Duration; -import javax.net.ssl.SSLException; import org.opensearch.migrations.replay.tracing.IRootReplayerContext; import org.opensearch.migrations.replay.traffic.source.BufferedFlowController; diff --git a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestCapturePacketToHttpHandler.java b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestCapturePacketToHttpHandler.java index fd2e32857..8ae4953ec 100644 --- a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestCapturePacketToHttpHandler.java +++ b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestCapturePacketToHttpHandler.java @@ -7,8 +7,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.jupiter.api.Assertions; - import org.opensearch.migrations.replay.datahandlers.IPacketFinalizingConsumer; import org.opensearch.migrations.replay.util.TextTrackedFuture; import org.opensearch.migrations.replay.util.TrackedFuture; @@ -18,6 +16,7 @@ import lombok.Lombok; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; @Slf4j public class TestCapturePacketToHttpHandler implements IPacketFinalizingConsumer { diff --git a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestUtils.java b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestUtils.java index 92a7645a3..a72338536 100644 --- a/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestUtils.java +++ b/TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestUtils.java @@ -15,8 +15,6 @@ import java.util.function.IntFunction; import java.util.stream.Collectors; -import org.junit.jupiter.api.Assertions; - import org.opensearch.migrations.Utils; import org.opensearch.migrations.replay.datahandlers.IPacketConsumer; import org.opensearch.migrations.replay.datahandlers.http.HttpJsonTransformingConsumer; @@ -35,6 +33,7 @@ import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpRequestDecoder; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; @Slf4j public class TestUtils { diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java index 478f3da81..2885678ab 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java @@ -3,17 +3,16 @@ import java.util.LinkedHashMap; import java.util.Map; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.transform.JsonJMESPathTransformer; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import io.burt.jmespath.jcf.JcfRuntime; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j @WrapWithNettyLeakDetection(disableLeakChecks = true) diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/src/main/java/org/opensearch/migrations/transform/JsonJoltTransformBuilder.java b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/src/main/java/org/opensearch/migrations/transform/JsonJoltTransformBuilder.java index a17282f07..af68db8d1 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/src/main/java/org/opensearch/migrations/transform/JsonJoltTransformBuilder.java +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/src/main/java/org/opensearch/migrations/transform/JsonJoltTransformBuilder.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/AddCompressionEncodingTest.java b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/AddCompressionEncodingTest.java index 743f53ff1..c62878c41 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/AddCompressionEncodingTest.java +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/AddCompressionEncodingTest.java @@ -12,9 +12,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.zip.GZIPInputStream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.replay.datahandlers.http.HttpJsonTransformingConsumer; import org.opensearch.migrations.tracing.InstrumentationTest; import org.opensearch.migrations.transform.JsonJoltTransformBuilder; @@ -26,6 +23,8 @@ import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j public class AddCompressionEncodingTest extends InstrumentationTest { diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java index 8afe1b54c..d037c69d7 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/JsonTransformerTest.java @@ -5,18 +5,17 @@ import java.util.LinkedHashMap; import java.util.Map; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.transform.JsonJoltTransformBuilder; import org.opensearch.migrations.transform.JsonJoltTransformer; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j @WrapWithNettyLeakDetection(disableLeakChecks = true) diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/MultipleJoltScriptsTest.java b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/MultipleJoltScriptsTest.java index 5477903c5..094fd324e 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/MultipleJoltScriptsTest.java +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/MultipleJoltScriptsTest.java @@ -2,13 +2,13 @@ import java.util.Map; +import org.opensearch.migrations.transform.JsonKeysForHttpMessage; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.transform.JsonKeysForHttpMessage; - public class MultipleJoltScriptsTest { private static final ObjectMapper mapper = new ObjectMapper(); diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/PayloadRepackingTest.java b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/PayloadRepackingTest.java index 7f830a8ef..a787349eb 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/PayloadRepackingTest.java +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/src/test/java/org/opensearch/migrations/replay/PayloadRepackingTest.java @@ -8,20 +8,19 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - import org.opensearch.migrations.testutils.WrapWithNettyLeakDetection; import org.opensearch.migrations.tracing.InstrumentationTest; import org.opensearch.migrations.transform.JsonJoltTransformBuilder; import org.opensearch.migrations.transform.JsonJoltTransformer; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.handler.codec.http.DefaultHttpHeaders; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; @Slf4j @WrapWithNettyLeakDetection(repetitions = 1) diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/java/org/opensearch/migrations/transform/TypeMappingsExcisionTest.java b/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/java/org/opensearch/migrations/transform/TypeMappingsExcisionTest.java index 4f9fd36e2..d732b031f 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/java/org/opensearch/migrations/transform/TypeMappingsExcisionTest.java +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/src/test/java/org/opensearch/migrations/transform/TypeMappingsExcisionTest.java @@ -7,14 +7,14 @@ import java.util.LinkedHashMap; import java.util.Map; -import com.google.common.io.CharStreams; +import org.opensearch.migrations.replay.datahandlers.JsonAccumulator; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.io.CharStreams; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.replay.datahandlers.JsonAccumulator; - public class TypeMappingsExcisionTest { static final TypeReference> TYPE_REFERENCE_FOR_MAP_TYPE = new TypeReference<>() { diff --git a/awsUtilities/src/test/java/org/opensearch/migrations/aws/SigV4SigningTransformationTest.java b/awsUtilities/src/test/java/org/opensearch/migrations/aws/SigV4SigningTransformationTest.java index 47b6178c7..77176e742 100644 --- a/awsUtilities/src/test/java/org/opensearch/migrations/aws/SigV4SigningTransformationTest.java +++ b/awsUtilities/src/test/java/org/opensearch/migrations/aws/SigV4SigningTransformationTest.java @@ -11,14 +11,13 @@ import java.util.Optional; import java.util.stream.Stream; +import org.opensearch.migrations.IHttpMessage; + +import lombok.SneakyThrows; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; - -import org.opensearch.migrations.IHttpMessage; - -import lombok.SneakyThrows; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; diff --git a/build.gradle b/build.gradle index a8f54f89f..bb243f136 100644 --- a/build.gradle +++ b/build.gradle @@ -61,17 +61,18 @@ subprojects { apply plugin: 'maven-publish' apply plugin: "com.diffplug.spotless" + // See https://github.com/diffplug/spotless/tree/main/plugin-gradle#java for some documentation, + // though what '#' does is still undocumented from what I can tell spotless { java { target "**/*.java" targetExclude '**/build/**', ".gradle/**" importOrder( - 'java|javax', - 'io.opentelemetry|com.google|com.fasterxml|org.apache|org.hamcrest|org.junit', - 'org.opensearch', - '', - '\\#java|\\#org.apache|\\#org.hamcrest|\\#org.opensearch|\\#' - ) + 'javax', + 'java', + 'org.opensearch', + '', + '\\#') indentWithSpaces() endWithNewline() removeUnusedImports() diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/BaseSpanContext.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/BaseSpanContext.java index ef461922e..b76748a81 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/BaseSpanContext.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/BaseSpanContext.java @@ -7,7 +7,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.trace.Span; - import lombok.Getter; import lombok.NonNull; diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonMetricInstruments.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonMetricInstruments.java index bbe7c3bde..7f546cbea 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonMetricInstruments.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonMetricInstruments.java @@ -2,7 +2,6 @@ import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; - import lombok.AllArgsConstructor; public class CommonMetricInstruments { diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonScopedMetricInstruments.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonScopedMetricInstruments.java index 504e534a0..4f0dab4dc 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonScopedMetricInstruments.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/CommonScopedMetricInstruments.java @@ -7,7 +7,6 @@ import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentConstructor.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentConstructor.java index f2413491f..827db946b 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentConstructor.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentConstructor.java @@ -3,7 +3,6 @@ import java.util.stream.Stream; import io.opentelemetry.api.trace.Span; - import lombok.NonNull; public interface IInstrumentConstructor extends IContextTracker { diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentationAttributes.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentationAttributes.java index 2780c4d52..4ca0df3d4 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentationAttributes.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IInstrumentationAttributes.java @@ -8,7 +8,6 @@ import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.LongUpDownCounter; - import lombok.NonNull; public interface IInstrumentationAttributes { diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IScopedInstrumentationAttributes.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IScopedInstrumentationAttributes.java index 712ba157f..30eb254fb 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IScopedInstrumentationAttributes.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/IScopedInstrumentationAttributes.java @@ -2,6 +2,8 @@ import java.util.ArrayDeque; +import org.opensearch.migrations.Utils; + import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; @@ -11,9 +13,6 @@ import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.trace.Span; import io.opentelemetry.semconv.SemanticAttributes; - -import org.opensearch.migrations.Utils; - import lombok.NonNull; public interface IScopedInstrumentationAttributes extends IWithStartTimeAndAttributes, AutoCloseable { diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/RootOtelContext.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/RootOtelContext.java index 3aafc7876..f877f73af 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/RootOtelContext.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/RootOtelContext.java @@ -5,6 +5,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; +import org.opensearch.migrations.Utils; + import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.api.trace.Span; @@ -19,9 +21,6 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.semconv.ResourceAttributes; - -import org.opensearch.migrations.Utils; - import lombok.Getter; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IConnectionContext.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IConnectionContext.java index f6532e396..201e8cd40 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IConnectionContext.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IConnectionContext.java @@ -1,10 +1,10 @@ package org.opensearch.migrations.tracing.commoncontexts; +import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; + import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; -import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; - public interface IConnectionContext extends IScopedInstrumentationAttributes { static final AttributeKey CONNECTION_ID_ATTR = AttributeKey.stringKey("connectionId"); static final AttributeKey NODE_ID_ATTR = AttributeKey.stringKey("nodeId"); diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IHttpTransactionContext.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IHttpTransactionContext.java index c24981389..6ee3b2597 100644 --- a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IHttpTransactionContext.java +++ b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/commoncontexts/IHttpTransactionContext.java @@ -1,10 +1,10 @@ package org.opensearch.migrations.tracing.commoncontexts; +import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; + import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; -import org.opensearch.migrations.tracing.IScopedInstrumentationAttributes; - public interface IHttpTransactionContext extends IScopedInstrumentationAttributes { static final AttributeKey SOURCE_REQUEST_INDEX_KEY = AttributeKey.longKey("sourceRequestIndex"); diff --git a/coreUtilities/src/testFixtures/java/org/opensearch/migrations/tracing/InMemoryInstrumentationBundle.java b/coreUtilities/src/testFixtures/java/org/opensearch/migrations/tracing/InMemoryInstrumentationBundle.java index e671d5cb4..6d4b7c096 100644 --- a/coreUtilities/src/testFixtures/java/org/opensearch/migrations/tracing/InMemoryInstrumentationBundle.java +++ b/coreUtilities/src/testFixtures/java/org/opensearch/migrations/tracing/InMemoryInstrumentationBundle.java @@ -20,7 +20,6 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; - import lombok.Getter; import lombok.Lombok; import lombok.SneakyThrows; diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/Sanitizer.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/Sanitizer.java index d7aac4545..a0e488a7f 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/Sanitizer.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/Sanitizer.java @@ -6,8 +6,6 @@ import java.util.Queue; import java.util.Set; -import com.fasterxml.jackson.core.JsonProcessingException; - import org.opensearch.migrations.dashboards.converter.DashboardConverter; import org.opensearch.migrations.dashboards.converter.IndexPatternConverter; import org.opensearch.migrations.dashboards.converter.QueryConverter; @@ -19,6 +17,7 @@ import org.opensearch.migrations.dashboards.savedobjects.SavedObjectParser; import org.opensearch.migrations.dashboards.util.Stats; +import com.fasterxml.jackson.core.JsonProcessingException; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/DashboardConverter.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/DashboardConverter.java index 0664d8c85..c85ad379a 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/DashboardConverter.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/DashboardConverter.java @@ -7,17 +7,16 @@ import java.util.UUID; import java.util.stream.Collectors; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.dashboards.Sanitizer; import org.opensearch.migrations.dashboards.savedobjects.Dashboard; import org.opensearch.migrations.dashboards.savedobjects.Dashboard.Panel; import org.opensearch.migrations.dashboards.savedobjects.Reference; import org.opensearch.migrations.dashboards.savedobjects.SavedObject; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/SavedObjectConverter.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/SavedObjectConverter.java index db54e751d..7fca238b7 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/SavedObjectConverter.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/SavedObjectConverter.java @@ -8,11 +8,10 @@ import java.util.SortedMap; import java.util.function.Consumer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.dashboards.savedobjects.SavedObject; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; import org.semver4j.Semver; diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/UrlConverter.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/UrlConverter.java index ba7e22df8..bf36d168c 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/UrlConverter.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/UrlConverter.java @@ -1,9 +1,8 @@ package org.opensearch.migrations.dashboards.converter; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.dashboards.savedobjects.SavedObject; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; /** diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/VisualizationConverter.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/VisualizationConverter.java index 2d20e9a56..6b5aa370c 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/VisualizationConverter.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/converter/VisualizationConverter.java @@ -3,10 +3,10 @@ import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.dashboards.savedobjects.SavedObject; +import com.fasterxml.jackson.databind.node.ObjectNode; + // // Class Visualization defined the migration for the search object type between ES and OpenSearch // diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Dashboard.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Dashboard.java index b3e688337..c1bf4b6be 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Dashboard.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Dashboard.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; - import lombok.Getter; import lombok.ToString; diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Reference.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Reference.java index b4e0b01ad..daa186239 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Reference.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/Reference.java @@ -1,7 +1,6 @@ package org.opensearch.migrations.dashboards.savedobjects; import com.fasterxml.jackson.databind.node.ObjectNode; - import lombok.ToString; @ToString(includeFieldNames = true) diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObject.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObject.java index fdf9df49e..74e569cf2 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObject.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObject.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; - import lombok.Getter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObjectParser.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObjectParser.java index 034aff255..7de95cd06 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObjectParser.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/savedobjects/SavedObjectParser.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; - import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/util/Stats.java b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/util/Stats.java index fd378fb21..30e2711b5 100644 --- a/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/util/Stats.java +++ b/dashboardsSanitizer/src/main/java/org/opensearch/migrations/dashboards/util/Stats.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - import lombok.Data; import lombok.Getter; diff --git a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/DashboardConverterTest.java b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/DashboardConverterTest.java index 547e5717c..140b2b5f8 100644 --- a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/DashboardConverterTest.java +++ b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/DashboardConverterTest.java @@ -3,6 +3,11 @@ import java.util.ArrayList; import java.util.List; +import org.opensearch.migrations.dashboards.Sanitizer; +import org.opensearch.migrations.dashboards.converter.DashboardConverter; +import org.opensearch.migrations.dashboards.savedobjects.Dashboard; +import org.opensearch.migrations.dashboards.savedobjects.SavedObject; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonNode; @@ -10,11 +15,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.dashboards.Sanitizer; -import org.opensearch.migrations.dashboards.converter.DashboardConverter; -import org.opensearch.migrations.dashboards.savedobjects.Dashboard; -import org.opensearch.migrations.dashboards.savedobjects.SavedObject; - import static org.junit.jupiter.api.Assertions.*; public class DashboardConverterTest extends SavedObjectsBase { diff --git a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/IndexPatternConverterTest.java b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/IndexPatternConverterTest.java index aca3ccc33..b63c2a061 100644 --- a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/IndexPatternConverterTest.java +++ b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/IndexPatternConverterTest.java @@ -1,14 +1,14 @@ package org.opensearch.migrations.dashboards.converters; +import org.opensearch.migrations.dashboards.converter.IndexPatternConverter; +import org.opensearch.migrations.dashboards.savedobjects.SavedObject; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.dashboards.converter.IndexPatternConverter; -import org.opensearch.migrations.dashboards.savedobjects.SavedObject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/QueryConverterTest.java b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/QueryConverterTest.java index 0c9d50203..ba93dd7ef 100644 --- a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/QueryConverterTest.java +++ b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/QueryConverterTest.java @@ -1,12 +1,12 @@ package org.opensearch.migrations.dashboards.converters; +import org.opensearch.migrations.dashboards.converter.QueryConverter; +import org.opensearch.migrations.dashboards.savedobjects.SavedObject; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.dashboards.converter.QueryConverter; -import org.opensearch.migrations.dashboards.savedobjects.SavedObject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SavedObjectsBase.java b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SavedObjectsBase.java index 68300abb0..ee1b11984 100644 --- a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SavedObjectsBase.java +++ b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SavedObjectsBase.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.io.InputStream; +import org.opensearch.migrations.dashboards.Sanitizer; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.BeforeEach; -import org.opensearch.migrations.dashboards.Sanitizer; - public abstract class SavedObjectsBase { protected static final ObjectMapper objectMapper = new ObjectMapper(); diff --git a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SearchConverterTest.java b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SearchConverterTest.java index bd8cf902f..1f0a6034c 100644 --- a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SearchConverterTest.java +++ b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/SearchConverterTest.java @@ -1,12 +1,12 @@ package org.opensearch.migrations.dashboards.converters; +import org.opensearch.migrations.dashboards.converter.SearchConverter; +import org.opensearch.migrations.dashboards.savedobjects.SavedObject; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.dashboards.converter.SearchConverter; -import org.opensearch.migrations.dashboards.savedobjects.SavedObject; - import static org.junit.jupiter.api.Assertions.assertEquals; public class SearchConverterTest extends SavedObjectsBase { diff --git a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/UrlConverterTest.java b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/UrlConverterTest.java index f0a1fc41f..3efcc244f 100644 --- a/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/UrlConverterTest.java +++ b/dashboardsSanitizer/src/test/java/org/opensearch/migrations/dashboards/converters/UrlConverterTest.java @@ -1,12 +1,12 @@ package org.opensearch.migrations.dashboards.converters; +import org.opensearch.migrations.dashboards.converter.UrlConverter; +import org.opensearch.migrations.dashboards.savedobjects.SavedObject; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.Test; -import org.opensearch.migrations.dashboards.converter.UrlConverter; -import org.opensearch.migrations.dashboards.savedobjects.SavedObject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/ContainsStringCount.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/ContainsStringCount.java index 0cec5c714..1646becc4 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/ContainsStringCount.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/ContainsStringCount.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.matchers; +import lombok.AllArgsConstructor; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; -import lombok.AllArgsConstructor; - @AllArgsConstructor public class ContainsStringCount extends TypeSafeMatcher { private final String expectedString; diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/HasLineCount.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/HasLineCount.java index 09203d8b1..be837dad6 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/HasLineCount.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/matchers/HasLineCount.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.matchers; +import lombok.AllArgsConstructor; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; -import lombok.AllArgsConstructor; - @AllArgsConstructor public class HasLineCount extends TypeSafeMatcher { private int expectedLineCount; diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/CloseableLogSetup.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/CloseableLogSetup.java index 7df66c256..897489c8a 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/CloseableLogSetup.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/CloseableLogSetup.java @@ -5,12 +5,11 @@ import java.util.List; import com.google.errorprone.annotations.MustBeClosed; +import lombok.Getter; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; - -import lombok.Getter; import org.slf4j.LoggerFactory; /** diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/HeapDumper.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/HeapDumper.java index df34596e7..4f7748086 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/HeapDumper.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/HeapDumper.java @@ -1,8 +1,9 @@ package org.opensearch.migrations.testutils; -import java.lang.management.ManagementFactory; import javax.management.MBeanServer; +import java.lang.management.ManagementFactory; + import com.sun.management.HotSpotDiagnosticMXBean; public class HeapDumper { diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/NettyLeakCheckTestExtension.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/NettyLeakCheckTestExtension.java index ac61e0fbd..7fd1b33e1 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/NettyLeakCheckTestExtension.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/NettyLeakCheckTestExtension.java @@ -4,13 +4,12 @@ import java.util.Optional; import java.util.concurrent.Callable; +import lombok.Lombok; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.InvocationInterceptor; import org.junit.jupiter.api.extension.ReflectiveInvocationContext; -import lombok.Lombok; - public class NettyLeakCheckTestExtension implements InvocationInterceptor { public static final int DEFAULT_NUM_REPETITIONS = 16; private final boolean allLeakChecksAreDisabled; diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SelfSignedSSLContextBuilder.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SelfSignedSSLContextBuilder.java index 01ffbb794..20d82a184 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SelfSignedSSLContextBuilder.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SelfSignedSSLContextBuilder.java @@ -1,5 +1,9 @@ package org.opensearch.migrations.testutils; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManagerFactory; + import java.math.BigInteger; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -10,9 +14,6 @@ import java.time.Duration; import java.time.Instant; import java.util.Date; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManagerFactory; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleHttpClientForTesting.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleHttpClientForTesting.java index bef187b18..b9a6ee5e8 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleHttpClientForTesting.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleHttpClientForTesting.java @@ -11,6 +11,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import lombok.AllArgsConstructor; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.config.RequestConfig; @@ -28,8 +29,6 @@ import org.apache.hc.core5.ssl.SSLContexts; import org.apache.hc.core5.util.Timeout; -import lombok.AllArgsConstructor; - /** * This is an HTTP client that is capable of making GET requests (developers are * encouraged to extend this) to either hosts that may be using TLS with a self=signed diff --git a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleNettyHttpServer.java b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleNettyHttpServer.java index 41c2fc260..0cf4dc576 100644 --- a/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleNettyHttpServer.java +++ b/testHelperFixtures/src/testFixtures/java/org/opensearch/migrations/testutils/SimpleNettyHttpServer.java @@ -1,5 +1,8 @@ package org.opensearch.migrations.testutils; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLEngine; + import java.net.URI; import java.net.URISyntaxException; import java.time.Duration; @@ -8,8 +11,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLEngine; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.Unpooled; diff --git a/transformation/src/main/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemoval.java b/transformation/src/main/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemoval.java index 5ada91268..5755616e2 100644 --- a/transformation/src/main/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemoval.java +++ b/transformation/src/main/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemoval.java @@ -2,13 +2,13 @@ import java.util.Map.Entry; -import com.fasterxml.jackson.databind.node.ObjectNode; - import org.opensearch.migrations.transformation.CanApplyResult; import org.opensearch.migrations.transformation.CanApplyResult.Unsupported; import org.opensearch.migrations.transformation.TransformationRule; import org.opensearch.migrations.transformation.entity.Index; +import com.fasterxml.jackson.databind.node.ObjectNode; + /** * Supports transformation of the Index Mapping types that were changed from mutliple types to a single type between ES 6 to ES 7 * diff --git a/transformation/src/test/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemovalTest.java b/transformation/src/test/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemovalTest.java index 3d9e77068..28004107a 100644 --- a/transformation/src/test/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemovalTest.java +++ b/transformation/src/test/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemovalTest.java @@ -3,15 +3,14 @@ import java.util.function.BiFunction; import java.util.function.Function; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.jupiter.api.Test; - import org.opensearch.migrations.transformation.CanApplyResult; import org.opensearch.migrations.transformation.CanApplyResult.Unsupported; import org.opensearch.migrations.transformation.entity.Index; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import static org.hamcrest.CoreMatchers.instanceOf;