[BUG] The spotless should take care of unified imports ordering (modu…

…les/ subprojects) (#9346) Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Aug 15, 2023 · 34c860d · 34c860d
1 parent e151776
commit 34c860d
Show file tree

Hide file tree

Showing 273 changed files with 776 additions and 715 deletions.
diff --git a/.../src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java b/.../src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java
@@ -33,19 +33,19 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.ScoreMode;
+import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.ObjectArray;
-import org.opensearch.common.lease.Releasables;
 import org.opensearch.index.fielddata.NumericDoubleValues;
 import org.opensearch.search.MultiValueMode;
 import org.opensearch.search.aggregations.Aggregator;
 import org.opensearch.search.aggregations.InternalAggregation;
 import org.opensearch.search.aggregations.LeafBucketCollector;
 import org.opensearch.search.aggregations.LeafBucketCollectorBase;
 import org.opensearch.search.aggregations.metrics.MetricsAggregator;
+import org.opensearch.search.aggregations.support.ArrayValuesSource;
 import org.opensearch.search.aggregations.support.ValuesSource;
 import org.opensearch.search.internal.SearchContext;
-import org.opensearch.search.aggregations.support.ArrayValuesSource;
 
 import java.io.IOException;
 import java.util.Map;

diff --git a/...tats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsParser.java b/...tats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsParser.java
@@ -34,10 +34,10 @@
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.MultiValueMode;
-import org.opensearch.search.aggregations.support.ValueType;
-import org.opensearch.search.aggregations.support.ValuesSourceType;
 import org.opensearch.search.aggregations.support.ArrayValuesSourceAggregationBuilder;
 import org.opensearch.search.aggregations.support.ArrayValuesSourceParser;
+import org.opensearch.search.aggregations.support.ValueType;
+import org.opensearch.search.aggregations.support.ValuesSourceType;
 
 import java.io.IOException;
 import java.util.Map;

diff --git a/...c/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java b/...c/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java
@@ -31,13 +31,13 @@
 
 package org.opensearch.search.aggregations.matrix.stats;
 
-import org.opensearch.core.ParseField;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.MockBigArrays;
 import org.opensearch.common.util.MockPageCacheRecycler;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
 import org.opensearch.core.xcontent.ContextParser;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
-import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
 import org.opensearch.plugins.SearchPlugin;
 import org.opensearch.script.ScriptService;
 import org.opensearch.search.aggregations.Aggregation;

diff --git a/...test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java b/...test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java
@@ -36,10 +36,10 @@
 import org.apache.lucene.document.SortedNumericDocValuesField;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.tests.index.RandomIndexWriter;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.store.Directory;
+import org.apache.lucene.tests.index.RandomIndexWriter;
 import org.apache.lucene.util.NumericUtils;
 import org.opensearch.index.mapper.MappedFieldType;
 import org.opensearch.index.mapper.NumberFieldMapper;

diff --git a/...Test/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java b/...Test/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java
@@ -33,6 +33,7 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
 import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
 

diff --git a/...s-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java b/...s-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java
@@ -34,8 +34,8 @@
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
-import org.opensearch.core.ParseField;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.ParseField;
 import org.opensearch.env.Environment;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.AbstractTokenFilterFactory;

diff --git a/...alysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java b/...alysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java
@@ -32,9 +32,9 @@
 
 package org.opensearch.analysis.common;
 
-import org.opensearch.painless.spi.PainlessExtension;
 import org.opensearch.painless.spi.Allowlist;
 import org.opensearch.painless.spi.AllowlistLoader;
+import org.opensearch.painless.spi.PainlessExtension;
 import org.opensearch.script.ScriptContext;
 
 import java.util.Collections;

diff --git a/...-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java b/...-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java
@@ -32,10 +32,10 @@
 
 package org.opensearch.analysis.common;
 
+import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.br.BrazilianStemFilter;
 import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter;
-import org.apache.lucene.analysis.CharArraySet;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.env.Environment;
 import org.opensearch.index.IndexSettings;

diff --git a/...lysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java b/...lysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java
@@ -128,10 +128,10 @@
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.SetOnce;
-import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
@@ -154,8 +154,6 @@
 import org.opensearch.script.ScriptService;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.watcher.ResourceWatcherService;
-import org.tartarus.snowball.ext.DutchStemmer;
-import org.tartarus.snowball.ext.FrenchStemmer;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -165,6 +163,9 @@
 import java.util.TreeMap;
 import java.util.function.Supplier;
 
+import org.tartarus.snowball.ext.DutchStemmer;
+import org.tartarus.snowball.ext.FrenchStemmer;
+
 import static org.opensearch.plugins.AnalysisPlugin.requiresAnalysisSettings;
 
 public class CommonAnalysisModulePlugin extends Plugin implements AnalysisPlugin, ScriptPlugin {

diff --git a/...ysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java b/...ysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java
@@ -41,6 +41,7 @@
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.AbstractTokenFilterFactory;
 import org.opensearch.index.analysis.Analysis;
+
 import org.tartarus.snowball.ext.DutchStemmer;
 
 public class DutchStemTokenFilterFactory extends AbstractTokenFilterFactory {

diff --git a/...ysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java b/...ysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java
@@ -34,8 +34,8 @@
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
-import org.opensearch.core.ParseField;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.ParseField;
 import org.opensearch.env.Environment;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider;

diff --git a/...sis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java b/...sis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java
@@ -41,6 +41,7 @@
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.AbstractTokenFilterFactory;
 import org.opensearch.index.analysis.Analysis;
+
 import org.tartarus.snowball.ext.FrenchStemmer;
 
 public class FrenchStemTokenFilterFactory extends AbstractTokenFilterFactory {

diff --git a/...c/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java b/...c/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java
@@ -40,12 +40,13 @@
 import org.opensearch.env.Environment;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.Analysis;
-import org.xml.sax.InputSource;
 
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import org.xml.sax.InputSource;
+
 /**
  * Uses the {@link org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter} to decompound tokens based on hyphenation rules.
  *

diff --git a/...ysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParser.java b/...ysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParser.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.analysis.common;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.synonym.SolrSynonymParser;
 import org.apache.lucene.util.CharsRef;

diff --git a/...s-common/src/main/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParser.java b/...s-common/src/main/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParser.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.analysis.common;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.synonym.WordnetSynonymParser;
 import org.apache.lucene.util.CharsRef;

diff --git a/...alysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java b/...alysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java
@@ -72,6 +72,9 @@
 import org.opensearch.env.Environment;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.AbstractTokenFilterFactory;
+
+import java.io.IOException;
+
 import org.tartarus.snowball.ext.ArmenianStemmer;
 import org.tartarus.snowball.ext.BasqueStemmer;
 import org.tartarus.snowball.ext.CatalanStemmer;
@@ -97,8 +100,6 @@
 import org.tartarus.snowball.ext.SwedishStemmer;
 import org.tartarus.snowball.ext.TurkishStemmer;
 
-import java.io.IOException;
-
 public class StemmerTokenFilterFactory extends AbstractTokenFilterFactory {
 
     private static final TokenStream EMPTY_TOKEN_STREAM = new EmptyTokenStream();

diff --git a/...is-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java b/...is-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java
@@ -33,8 +33,8 @@
 package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.analysis.email.UAX29URLEmailTokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.env.Environment;
 import org.opensearch.index.IndexSettings;

diff --git a/...on/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java b/...on/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java
@@ -47,6 +47,7 @@
 import java.util.List;
 import java.util.Set;
 
+import static org.opensearch.analysis.common.WordDelimiterTokenFilterFactory.parseTypes;
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.CATENATE_ALL;
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.CATENATE_NUMBERS;
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.CATENATE_WORDS;
@@ -57,7 +58,6 @@
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.SPLIT_ON_CASE_CHANGE;
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.SPLIT_ON_NUMERICS;
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.STEM_ENGLISH_POSSESSIVE;
-import static org.opensearch.analysis.common.WordDelimiterTokenFilterFactory.parseTypes;
 
 public class WordDelimiterGraphTokenFilterFactory extends AbstractTokenFilterFactory {
     private final byte[] charTypeTable;

diff --git a/...s-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java b/...s-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java
@@ -33,13 +33,14 @@
 package org.opensearch.analysis.common;
 
 import com.carrotsearch.randomizedtesting.generators.RandomStrings;
+
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.util.CharTokenizer;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.index.Index;
 import org.opensearch.index.IndexSettings;
-import org.opensearch.test.OpenSearchTokenStreamTestCase;
 import org.opensearch.test.IndexSettingsModule;
+import org.opensearch.test.OpenSearchTokenStreamTestCase;
 
 import java.io.IOException;
 import java.io.Reader;

diff --git a/...s/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java b/...s/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java
@@ -47,8 +47,8 @@
 import org.opensearch.indices.analysis.AnalysisModule;
 import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider;
 import org.opensearch.plugins.AnalysisPlugin;
-import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.IndexSettingsModule;
+import org.opensearch.test.OpenSearchTestCase;
 import org.hamcrest.MatcherAssert;
 
 import java.io.IOException;

diff --git a/...src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java b/...src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java
@@ -8,11 +8,11 @@
 
 package org.opensearch.analysis.common;
 
-import org.apache.lucene.tests.analysis.CannedTokenStream;
-import org.apache.lucene.tests.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
+import org.apache.lucene.tests.analysis.CannedTokenStream;
+import org.apache.lucene.tests.analysis.Token;
 import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.env.Environment;

diff --git a/.../analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java b/.../analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java
@@ -33,13 +33,13 @@
 package org.opensearch.analysis.common;
 
 import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.MultiPhraseQuery;
+import org.apache.lucene.search.PhraseQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.SynonymQuery;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.MultiPhraseQuery;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexService;
 import org.opensearch.index.query.MatchPhraseQueryBuilder;

diff --git a/...analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java b/...analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java
@@ -36,15 +36,15 @@
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.index.Index;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
-import org.opensearch.core.index.Index;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.IndexAnalyzers;
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.indices.analysis.AnalysisModule;
-import org.opensearch.test.OpenSearchTokenStreamTestCase;
 import org.opensearch.test.IndexSettingsModule;
+import org.opensearch.test.OpenSearchTokenStreamTestCase;
 import org.opensearch.test.VersionUtils;
 
 import java.io.IOException;

diff --git a/...mon/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java b/...mon/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
@@ -32,14 +32,14 @@
 
 package org.opensearch.analysis.common;
 
+import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.tests.analysis.CannedTokenStream;
 import org.apache.lucene.tests.analysis.Token;
-import org.apache.lucene.analysis.TokenStream;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.index.Index;
 import org.opensearch.index.IndexSettings;
-import org.opensearch.test.OpenSearchTokenStreamTestCase;
 import org.opensearch.test.IndexSettingsModule;
+import org.opensearch.test.OpenSearchTokenStreamTestCase;
 
 import java.io.IOException;
 

diff --git a/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.query.Operator;
 import org.opensearch.plugins.Plugin;
@@ -59,10 +59,10 @@
 import static org.opensearch.search.builder.SearchSourceBuilder.searchSource;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHighlight;
+import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
-import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
 
 public class HighlighterWithAnalyzersTests extends OpenSearchIntegTestCase {
     @Override

diff --git a/...ysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java b/...ysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java
@@ -41,8 +41,8 @@
 import org.opensearch.index.analysis.IndexAnalyzers;
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.indices.analysis.AnalysisModule;
-import org.opensearch.test.OpenSearchTokenStreamTestCase;
 import org.opensearch.test.IndexSettingsModule;
+import org.opensearch.test.OpenSearchTokenStreamTestCase;
 
 import java.io.IOException;
 import java.util.Collections;

diff --git a/...lysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java b/...lysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java
@@ -32,27 +32,27 @@
 
 package org.opensearch.analysis.common;
 
-import org.apache.lucene.tests.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
 import org.apache.lucene.analysis.reverse.ReverseStringFilter;
+import org.apache.lucene.tests.analysis.MockTokenizer;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.Settings.Builder;
 import org.opensearch.core.index.Index;
 import org.opensearch.index.IndexSettings;
-import org.opensearch.test.OpenSearchTokenStreamTestCase;
 import org.opensearch.test.IndexSettingsModule;
+import org.opensearch.test.OpenSearchTokenStreamTestCase;
 import org.opensearch.test.VersionUtils;
 
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Arrays;
 
-import static com.carrotsearch.randomizedtesting.RandomizedTest.scaledRandomIntBetween;
 import static org.hamcrest.Matchers.instanceOf;
+import static com.carrotsearch.randomizedtesting.RandomizedTest.scaledRandomIntBetween;
 
 public class NGramTokenizerFactoryTests extends OpenSearchTokenStreamTestCase {
     public void testParseTokenChars() {