Update spotless

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Feb 26, 2025 · 0299b5f · 0299b5f
1 parent aa800b3
commit 0299b5f
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 64 deletions.
diff --git a/src/integrationTest/java/org/opensearch/index/codec/rest/CreateIndexWithCodecIT.java b/src/integrationTest/java/org/opensearch/index/codec/rest/CreateIndexWithCodecIT.java
@@ -26,8 +26,8 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.common.Strings;
-import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatCodec;
 import org.opensearch.index.codec.customcodecs.QatZipperFactory;
+import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatCodec;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
 
 import javax.net.ssl.SSLEngine;

diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/Lucene101CustomStoredFieldsFormat.java b/src/main/java/org/opensearch/index/codec/customcodecs/Lucene101CustomStoredFieldsFormat.java
@@ -17,8 +17,6 @@
 import org.apache.lucene.index.SegmentInfo;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.IOContext;
-import org.opensearch.index.codec.customcodecs.ZstdCompressionMode;
-import org.opensearch.index.codec.customcodecs.ZstdNoDictCompressionMode;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -97,7 +95,7 @@ public StoredFieldsWriter fieldsWriter(Directory directory, SegmentInfo si, IOCo
         String previous = si.putAttribute(MODE_KEY, mode.name());
         if (previous != null && previous.equals(mode.name()) == false) {
             throw new IllegalStateException(
-                    "found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
+                "found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
             );
         }
         return impl(mode).fieldsWriter(directory, si, context);
@@ -116,11 +114,11 @@ StoredFieldsFormat impl(Lucene101CustomCodec.Mode mode) {
 
     private StoredFieldsFormat getCustomCompressingStoredFieldsFormat(String formatName, CompressionMode compressionMode) {
         return new Lucene90CompressingStoredFieldsFormat(
-                formatName,
-                compressionMode,
-                ZSTD_BLOCK_LENGTH,
-                ZSTD_MAX_DOCS_PER_BLOCK,
-                ZSTD_BLOCK_SHIFT
+            formatName,
+            compressionMode,
+            ZSTD_BLOCK_LENGTH,
+            ZSTD_MAX_DOCS_PER_BLOCK,
+            ZSTD_BLOCK_SHIFT
         );
     }
 

diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/Lucene101QatCodec.java b/src/main/java/org/opensearch/index/codec/customcodecs/Lucene101QatCodec.java
@@ -123,11 +123,11 @@ public Lucene101QatCodec(Mode mode, int compressionLevel, MapperService mapperSe
      * @param supplier supplier for QAT mode.
      */
     public Lucene101QatCodec(
-            Mode mode,
-            int compressionLevel,
-            MapperService mapperService,
-            Logger logger,
-            Supplier<QatZipper.Mode> supplier
+        Mode mode,
+        int compressionLevel,
+        MapperService mapperService,
+        Logger logger,
+        Supplier<QatZipper.Mode> supplier
     ) {
         super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene101Codec.Mode.BEST_SPEED, mapperService, logger));
         this.storedFieldsFormat = new Lucene101QatStoredFieldsFormat(mode, compressionLevel, supplier);

diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/Lucene101QatStoredFieldsFormat.java b/src/main/java/org/opensearch/index/codec/customcodecs/Lucene101QatStoredFieldsFormat.java
@@ -23,7 +23,6 @@
 import java.util.function.Supplier;
 
 import com.intel.qat.QatZipper;
-import org.opensearch.index.codec.customcodecs.QatCompressionMode;
 
 import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_COMPRESSION_LEVEL;
 import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_QAT_MODE;
@@ -122,7 +121,7 @@ public StoredFieldsWriter fieldsWriter(Directory directory, SegmentInfo si, IOCo
         String previous = si.putAttribute(MODE_KEY, mode.name());
         if (previous != null && previous.equals(mode.name()) == false) {
             throw new IllegalStateException(
-                    "found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
+                "found existing value for " + MODE_KEY + " for segment: " + si.name + " old = " + previous + ", new = " + mode.name()
             );
         }
         return impl(mode).fieldsWriter(directory, si, context);
@@ -132,31 +131,31 @@ private StoredFieldsFormat impl(Lucene101QatCodec.Mode mode) {
         switch (mode) {
             case QAT_LZ4:
                 return getQatCompressingStoredFieldsFormat(
-                        "QatStoredFieldsLz4",
-                        qatCompressionMode,
-                        QAT_LZ4_BLOCK_LENGTH,
-                        QAT_LZ4_MAX_DOCS_PER_BLOCK,
-                        QAT_LZ4_BLOCK_SHIFT
+                    "QatStoredFieldsLz4",
+                    qatCompressionMode,
+                    QAT_LZ4_BLOCK_LENGTH,
+                    QAT_LZ4_MAX_DOCS_PER_BLOCK,
+                    QAT_LZ4_BLOCK_SHIFT
                 );
             case QAT_DEFLATE:
                 return getQatCompressingStoredFieldsFormat(
-                        "QatStoredFieldsDeflate",
-                        qatCompressionMode,
-                        QAT_DEFLATE_BLOCK_LENGTH,
-                        QAT_DEFLATE_MAX_DOCS_PER_BLOCK,
-                        QAT_DEFLATE_BLOCK_SHIFT
+                    "QatStoredFieldsDeflate",
+                    qatCompressionMode,
+                    QAT_DEFLATE_BLOCK_LENGTH,
+                    QAT_DEFLATE_MAX_DOCS_PER_BLOCK,
+                    QAT_DEFLATE_BLOCK_SHIFT
                 );
             default:
                 throw new IllegalStateException("Unsupported compression mode: " + mode);
         }
     }
 
     private StoredFieldsFormat getQatCompressingStoredFieldsFormat(
-            String formatName,
-            CompressionMode compressionMode,
-            int blockSize,
-            int maxDocs,
-            int blockShift
+        String formatName,
+        CompressionMode compressionMode,
+        int blockSize,
+        int maxDocs,
+        int blockShift
     ) {
         return new Lucene90CompressingStoredFieldsFormat(formatName, compressionMode, blockSize, maxDocs, blockShift);
     }

diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/QatDeflate101Codec.java b/src/main/java/org/opensearch/index/codec/customcodecs/QatDeflate101Codec.java
@@ -12,7 +12,6 @@
 import org.opensearch.common.settings.Setting;
 import org.opensearch.index.codec.CodecAliases;
 import org.opensearch.index.codec.CodecSettings;
-import org.opensearch.index.codec.customcodecs.QatZipperFactory;
 import org.opensearch.index.engine.EngineConfig;
 import org.opensearch.index.mapper.MapperService;
 

diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/QatLz4101Codec.java b/src/main/java/org/opensearch/index/codec/customcodecs/QatLz4101Codec.java
@@ -12,7 +12,6 @@
 import org.opensearch.common.settings.Setting;
 import org.opensearch.index.codec.CodecAliases;
 import org.opensearch.index.codec.CodecSettings;
-import org.opensearch.index.codec.customcodecs.QatZipperFactory;
 import org.opensearch.index.engine.EngineConfig;
 import org.opensearch.index.mapper.MapperService;
 

diff --git a/...g/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912CustomCodec.java b/...g/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912CustomCodec.java
@@ -9,9 +9,9 @@
 package org.opensearch.index.codec.customcodecs.backward_codecs.lucene912;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.FilterCodec;
 import org.apache.lucene.codecs.StoredFieldsFormat;
-import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.lucene101.Lucene101Codec;
 import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec;
 import org.opensearch.index.mapper.MapperService;

diff --git a/...index/codec/customcodecs/backward_codecs/lucene912/Lucene912CustomStoredFieldsFormat.java b/...index/codec/customcodecs/backward_codecs/lucene912/Lucene912CustomStoredFieldsFormat.java
@@ -64,9 +64,9 @@ public Lucene912CustomStoredFieldsFormat(Lucene912CustomCodec.Mode mode) {
     public Lucene912CustomStoredFieldsFormat(Lucene912CustomCodec.Mode mode, int compressionLevel) {
         this.mode = Objects.requireNonNull(mode);
         this.compressionLevel = compressionLevel;
-        zstdCompressionMode = new ZstdCompressionMode(compressionLevel){
+        zstdCompressionMode = new ZstdCompressionMode(compressionLevel) {
         };
-        zstdNoDictCompressionMode = new ZstdNoDictCompressionMode(compressionLevel){
+        zstdNoDictCompressionMode = new ZstdNoDictCompressionMode(compressionLevel) {
         };
     }
 

diff --git a/.../org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912QatCodec.java b/.../org/opensearch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912QatCodec.java
@@ -9,9 +9,9 @@
 package org.opensearch.index.codec.customcodecs.backward_codecs.lucene912;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.FilterCodec;
 import org.apache.lucene.codecs.StoredFieldsFormat;
-import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.lucene101.Lucene101Codec;
 import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec;
 import org.opensearch.index.mapper.MapperService;

diff --git a/...ch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912QatStoredFieldsFormat.java b/...ch/index/codec/customcodecs/backward_codecs/lucene912/Lucene912QatStoredFieldsFormat.java
@@ -17,13 +17,13 @@
 import org.apache.lucene.index.SegmentInfo;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.IOContext;
+import org.opensearch.index.codec.customcodecs.QatCompressionMode;
 
 import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Supplier;
 
 import com.intel.qat.QatZipper;
-import org.opensearch.index.codec.customcodecs.QatCompressionMode;
 
 import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_COMPRESSION_LEVEL;
 import static org.opensearch.index.codec.customcodecs.backward_codecs.lucene99.Lucene99QatCodec.DEFAULT_QAT_MODE;
@@ -88,7 +88,7 @@ public Lucene912QatStoredFieldsFormat(Lucene912QatCodec.Mode mode, Supplier<QatZ
      */
     public Lucene912QatStoredFieldsFormat(Lucene912QatCodec.Mode mode, int compressionLevel, Supplier<QatZipper.Mode> supplier) {
         this.mode = Objects.requireNonNull(mode);
-        qatCompressionMode = new QatCompressionMode(getAlgorithm(mode), compressionLevel, supplier){
+        qatCompressionMode = new QatCompressionMode(getAlgorithm(mode), compressionLevel, supplier) {
         };
     }
 

diff --git a/src/test/java/org/opensearch/index/codec/customcodecs/CustomCodecTests.java b/src/test/java/org/opensearch/index/codec/customcodecs/CustomCodecTests.java
@@ -33,9 +33,9 @@
 package org.opensearch.index.codec.customcodecs;
 
 import org.apache.logging.log4j.LogManager;
+import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat;
-import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;

diff --git a/.../java/org/opensearch/index/codec/customcodecs/Lucene101CustomStoredFieldsFormatTests.java b/.../java/org/opensearch/index/codec/customcodecs/Lucene101CustomStoredFieldsFormatTests.java
@@ -8,10 +8,6 @@
 
 package org.opensearch.index.codec.customcodecs;
 
-import org.opensearch.index.codec.customcodecs.ZstdCompressionMode;
-import org.opensearch.index.codec.customcodecs.ZstdNoDictCompressionMode;
-import org.opensearch.index.codec.customcodecs.Lucene101CustomCodec;
-import org.opensearch.index.codec.customcodecs.Lucene101CustomStoredFieldsFormat;
 import org.opensearch.test.OpenSearchTestCase;
 
 public class Lucene101CustomStoredFieldsFormatTests extends OpenSearchTestCase {
@@ -23,16 +19,16 @@ public void testDefaultLucene101CustomCodecMode() {
 
     public void testZstdNoDictLucene101CustomCodecMode() {
         Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
-                Lucene101CustomCodec.Mode.ZSTD_NO_DICT
+            Lucene101CustomCodec.Mode.ZSTD_NO_DICT
         );
         assertEquals(Lucene101CustomCodec.Mode.ZSTD_NO_DICT, lucene101CustomStoredFieldsFormat.getMode());
     }
 
     public void testZstdModeWithCompressionLevel() {
         int randomCompressionLevel = randomIntBetween(1, 6);
         Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
-                Lucene101CustomCodec.Mode.ZSTD,
-                randomCompressionLevel
+            Lucene101CustomCodec.Mode.ZSTD,
+            randomCompressionLevel
         );
         assertEquals(Lucene101CustomCodec.Mode.ZSTD, lucene101CustomStoredFieldsFormat.getMode());
         assertEquals(randomCompressionLevel, lucene101CustomStoredFieldsFormat.getCompressionLevel());
@@ -41,8 +37,8 @@ public void testZstdModeWithCompressionLevel() {
     public void testZstdNoDictLucene101CustomCodecModeWithCompressionLevel() {
         int randomCompressionLevel = randomIntBetween(1, 6);
         Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
-                Lucene101CustomCodec.Mode.ZSTD_NO_DICT,
-                randomCompressionLevel
+            Lucene101CustomCodec.Mode.ZSTD_NO_DICT,
+            randomCompressionLevel
         );
         assertEquals(Lucene101CustomCodec.Mode.ZSTD_NO_DICT, lucene101CustomStoredFieldsFormat.getMode());
         assertEquals(randomCompressionLevel, lucene101CustomStoredFieldsFormat.getCompressionLevel());
@@ -55,7 +51,7 @@ public void testCompressionModes() {
 
     public void testZstdNoDictCompressionModes() {
         Lucene101CustomStoredFieldsFormat lucene101CustomStoredFieldsFormat = new Lucene101CustomStoredFieldsFormat(
-                Lucene101CustomCodec.Mode.ZSTD_NO_DICT
+            Lucene101CustomCodec.Mode.ZSTD_NO_DICT
         );
         assertTrue(lucene101CustomStoredFieldsFormat.getCompressionMode() instanceof ZstdNoDictCompressionMode);
     }

diff --git a/...est/java/org/opensearch/index/codec/customcodecs/Lucene101QatStoredFieldsFormatTests.java b/...est/java/org/opensearch/index/codec/customcodecs/Lucene101QatStoredFieldsFormatTests.java
@@ -8,10 +8,6 @@
 
 package org.opensearch.index.codec.customcodecs;
 
-import org.opensearch.index.codec.customcodecs.QatCompressionMode;
-import org.opensearch.index.codec.customcodecs.QatZipperFactory;
-import org.opensearch.index.codec.customcodecs.Lucene101QatCodec;
-import org.opensearch.index.codec.customcodecs.Lucene101QatStoredFieldsFormat;
 import org.opensearch.test.OpenSearchTestCase;
 
 import static org.hamcrest.Matchers.is;
@@ -28,7 +24,7 @@ public void testLz4Lucene101QatCodecMode() {
     public void testDeflateLucene101QatCodecMode() {
         assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
         Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
-                Lucene101QatCodec.Mode.QAT_DEFLATE
+            Lucene101QatCodec.Mode.QAT_DEFLATE
         );
         assertEquals(Lucene101QatCodec.Mode.QAT_DEFLATE, lucene101QatStoredFieldsFormat.getMode());
     }
@@ -37,8 +33,8 @@ public void testLz4Lucene101QatCodecModeWithCompressionLevel() {
         assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
         int randomCompressionLevel = randomIntBetween(1, 6);
         Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
-                Lucene101QatCodec.Mode.QAT_LZ4,
-                randomCompressionLevel
+            Lucene101QatCodec.Mode.QAT_LZ4,
+            randomCompressionLevel
         );
         assertEquals(Lucene101QatCodec.Mode.QAT_LZ4, lucene101QatStoredFieldsFormat.getMode());
         assertEquals(randomCompressionLevel, lucene101QatStoredFieldsFormat.getCompressionMode().getCompressionLevel());
@@ -48,8 +44,8 @@ public void testDeflateLucene101QatCodecModeWithCompressionLevel() {
         assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
         int randomCompressionLevel = randomIntBetween(1, 6);
         Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
-                Lucene101QatCodec.Mode.QAT_DEFLATE,
-                randomCompressionLevel
+            Lucene101QatCodec.Mode.QAT_DEFLATE,
+            randomCompressionLevel
         );
         assertEquals(Lucene101QatCodec.Mode.QAT_DEFLATE, lucene101QatStoredFieldsFormat.getMode());
         assertEquals(randomCompressionLevel, lucene101QatStoredFieldsFormat.getCompressionMode().getCompressionLevel());
@@ -64,7 +60,7 @@ public void testLz4CompressionModes() {
     public void testDeflateCompressionModes() {
         assumeThat("Qat library is available", QatZipperFactory.isQatAvailable(), is(true));
         Lucene101QatStoredFieldsFormat lucene101QatStoredFieldsFormat = new Lucene101QatStoredFieldsFormat(
-                Lucene101QatCodec.Mode.QAT_DEFLATE
+            Lucene101QatCodec.Mode.QAT_DEFLATE
         );
         assertTrue(lucene101QatStoredFieldsFormat.getCompressionMode() instanceof QatCompressionMode);
     }

diff --git a/.../codec/customcodecs/backward_codecs/lucene912/Lucene912CustomStoredFieldsFormatTests.java b/.../codec/customcodecs/backward_codecs/lucene912/Lucene912CustomStoredFieldsFormatTests.java
@@ -10,8 +10,6 @@
 
 import org.opensearch.index.codec.customcodecs.ZstdCompressionMode;
 import org.opensearch.index.codec.customcodecs.ZstdNoDictCompressionMode;
-import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912CustomCodec;
-import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912CustomStoredFieldsFormat;
 import org.opensearch.test.OpenSearchTestCase;
 
 public class Lucene912CustomStoredFieldsFormatTests extends OpenSearchTestCase {

diff --git a/...dex/codec/customcodecs/backward_codecs/lucene912/Lucene912QatStoredFieldsFormatTests.java b/...dex/codec/customcodecs/backward_codecs/lucene912/Lucene912QatStoredFieldsFormatTests.java
@@ -10,8 +10,6 @@
 
 import org.opensearch.index.codec.customcodecs.QatCompressionMode;
 import org.opensearch.index.codec.customcodecs.QatZipperFactory;
-import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatCodec;
-import org.opensearch.index.codec.customcodecs.backward_codecs.lucene912.Lucene912QatStoredFieldsFormat;
 import org.opensearch.test.OpenSearchTestCase;
 
 import static org.hamcrest.Matchers.is;