jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342639 )
Change subject: check import order at build time
......................................................................
check import order at build time
Import order changing randomly is painful for code reviews as it adds non
relevant information to diffs.
This configures a checkstyle check that conforms to the default IntelliJ
configuration. It will make the build fail if this import order is not
respected.
It is still the responsibility of each developer to configure its IDE
correctly.
Change-Id: I97bd3ec1fbdcfb7c0b11b82cab7d13f4120ac6cf
---
M src/dev-tools/checkstyle.xml
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
M
src/main/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilter.java
M src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQuery.java
M
src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQueryBuilder.java
M
src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScore.java
M
src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreBuilder.java
M
src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
M
src/main/java/org/wikimedia/search/extra/regex/ExpressionToQueryTransformer.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
M
src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
M
src/main/java/org/wikimedia/search/extra/regex/expression/AbstractCompositeExpression.java
M
src/main/java/org/wikimedia/search/extra/regex/expression/ExpressionRewriter.java
M src/main/java/org/wikimedia/search/extra/regex/expression/Leaf.java
M src/main/java/org/wikimedia/search/extra/regex/expression/Or.java
M src/main/java/org/wikimedia/search/extra/regex/ngram/NGramAutomaton.java
M
src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
M
src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java
M src/main/java/org/wikimedia/search/extra/util/FieldValues.java
M src/test/java/org/wikimedia/search/extra/AbstractPluginIntegrationTest.java
M
src/test/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilterTest.java
M
src/test/java/org/wikimedia/search/extra/analysis/filters/PreserverOriginalIntegrationTest.java
M
src/test/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisIntegrationTest.java
M
src/test/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreIntegrationTest.java
M
src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryIntegrationTest.java
M
src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryRecheckTest.java
M src/test/java/org/wikimedia/search/extra/regex/TimeoutCheckerTest.java
M src/test/java/org/wikimedia/search/extra/regex/expression/ExpressionTest.java
M src/test/java/org/wikimedia/search/extra/regex/ngram/NGramAutomatonTest.java
M src/test/java/org/wikimedia/search/extra/regex/ngram/NGramExtractorTest.java
M
src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerMonteCarlo.java
M src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerTest.java
M
src/test/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScriptIntegrationTest.java
M
src/test/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryIntegrationTest.java
35 files changed, 227 insertions(+), 190 deletions(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/src/dev-tools/checkstyle.xml b/src/dev-tools/checkstyle.xml
index 6e97cc5..9cfbf29 100644
--- a/src/dev-tools/checkstyle.xml
+++ b/src/dev-tools/checkstyle.xml
@@ -10,6 +10,16 @@
<property name="allowEmptyLambdas" value="true"/>
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO,
LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT,
MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR_ASSIGN, LITERAL_ASSERT,
TYPE_EXTENSION_AND"/>
</module>
-
+ <module name="AvoidStarImport"/>
+ <module name="CustomImportOrder">
+ <property name="customImportOrderRules"
+
value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+ <property name="specialImportsRegExp" value="^javax\."/>
+ <property name="standardPackageRegExp" value="^java\."/>
+ <property name="sortImportsInGroupAlphabetically" value="true"/>
+ <property name="separateLineBetweenGroups" value="false"/>
+ </module>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
</module>
</module>
\ No newline at end of file
diff --git a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
index ff7f149..acbb84f 100644
--- a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
+++ b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
@@ -1,13 +1,5 @@
package org.wikimedia.search.extra;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.elasticsearch.index.analysis.TokenFilterFactory;
import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider;
import org.elasticsearch.plugins.AnalysisPlugin;
@@ -27,6 +19,14 @@
import org.wikimedia.search.extra.superdetectnoop.WithinPercentageHandler;
import org.wikimedia.search.extra.tokencount.TokenCountRouterQueryBuilder;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* Setup the Elasticsearch plugin.
*/
diff --git
a/src/main/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilter.java
b/src/main/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilter.java
index 9a24c69..d59b8cd 100644
---
a/src/main/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilter.java
+++
b/src/main/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilter.java
@@ -1,7 +1,5 @@
package org.wikimedia.search.extra.analysis.filters;
-import java.io.IOException;
-
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.KeywordRepeatFilter;
@@ -11,6 +9,8 @@
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.util.TokenFilterFactory;
+import java.io.IOException;
+
/**
* A token filter that wraps another one to preserve original terms at the same
* position. The purpose is very similar to {@link KeywordRepeatFilter}+{@link
RemoveDuplicatesTokenFilter}
diff --git
a/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQuery.java
b/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQuery.java
index c55e014..176e08b 100644
--- a/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQuery.java
+++ b/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQuery.java
@@ -17,11 +17,7 @@
* limitations under the License.
*/
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-
+import lombok.EqualsAndHashCode;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -46,7 +42,10 @@
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.PriorityQueue;
-import lombok.EqualsAndHashCode;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
/**
* Fuzzifies ALL terms provided as strings and then picks the best n
differentiating terms.
diff --git
a/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQueryBuilder.java
b/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQueryBuilder.java
index c2addbe..e08b2c9 100644
---
a/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQueryBuilder.java
+++
b/src/main/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisQueryBuilder.java
@@ -19,18 +19,6 @@
package org.wikimedia.search.extra.fuzzylike;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
@@ -51,6 +39,18 @@
import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.QueryShardException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
/**
* @deprecated this query was too costly and has been removed
*/
diff --git
a/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScore.java
b/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScore.java
index 02fd6ca..6bfd9a1 100644
---
a/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScore.java
+++
b/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScore.java
@@ -1,8 +1,5 @@
package org.wikimedia.search.extra.levenshtein;
-import java.io.IOException;
-import java.util.Objects;
-
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.spell.LevensteinDistance;
@@ -15,6 +12,9 @@
import org.elasticsearch.search.lookup.LeafSearchLookup;
import org.elasticsearch.search.lookup.SearchLookup;
+import java.io.IOException;
+import java.util.Objects;
+
/**
* Function score based on levenshtein distance.
* This function is slow because it loads string field data for <b>each</b>
doc.
diff --git
a/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreBuilder.java
b/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreBuilder.java
index e880a15..46862f4 100644
---
a/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreBuilder.java
+++
b/src/main/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreBuilder.java
@@ -1,8 +1,7 @@
package org.wikimedia.search.extra.levenshtein;
-import java.io.IOException;
-import java.util.Objects;
-
+import lombok.Setter;
+import lombok.experimental.Accessors;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
@@ -16,8 +15,8 @@
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import lombok.Setter;
-import lombok.experimental.Accessors;
+import java.io.IOException;
+import java.util.Objects;
/**
* Builds the levenshtein_distance_score score function.
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
b/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
index 98f6ac7..5847af0 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
@@ -1,7 +1,5 @@
package org.wikimedia.search.extra.regex;
-import java.io.IOException;
-
import lombok.EqualsAndHashCode;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
@@ -16,6 +14,8 @@
import org.wikimedia.search.extra.regex.SourceRegexQueryBuilder.Settings;
import org.wikimedia.search.extra.util.FieldValues.Loader;
+import java.io.IOException;
+
/**
* Accelerated version of the source_regex query.
*/
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/ExpressionToQueryTransformer.java
b/src/main/java/org/wikimedia/search/extra/regex/ExpressionToQueryTransformer.java
index cc4e806..b3dd7a5 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/ExpressionToQueryTransformer.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/ExpressionToQueryTransformer.java
@@ -1,8 +1,6 @@
package org.wikimedia.search.extra.regex;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.google.common.collect.ImmutableSet;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.TermsQuery;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -12,7 +10,8 @@
import org.apache.lucene.util.BytesRef;
import org.wikimedia.search.extra.regex.expression.Expression;
-import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
+import java.util.List;
/**
* Transforms expressions to queries.
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
index 9665459..c4380c4 100644
--- a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
+++ b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
@@ -1,9 +1,5 @@
package org.wikimedia.search.extra.regex;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Objects;
-
import lombok.EqualsAndHashCode;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Query;
@@ -19,6 +15,10 @@
import org.wikimedia.search.extra.regex.ngram.NGramExtractor;
import org.wikimedia.search.extra.util.FieldValues;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Objects;
+
@EqualsAndHashCode(callSuper = false)
public class SourceRegexQuery extends Query {
private final String fieldPath;
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
index c682f9d..773b585 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
@@ -1,11 +1,5 @@
package org.wikimedia.search.extra.regex;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-
-import org.elasticsearch.common.unit.TimeValue;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
@@ -16,6 +10,7 @@
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.LocaleUtils;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
@@ -25,6 +20,11 @@
import org.wikimedia.search.extra.regex.expression.ExpressionRewriter;
import org.wikimedia.search.extra.util.FieldValues;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+
/**
* Builds source_regex filters.
*/
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
b/src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
index ccf302c..0a6b136 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
@@ -1,12 +1,20 @@
package org.wikimedia.search.extra.regex;
-import java.io.IOException;
-import java.util.List;
-
import lombok.EqualsAndHashCode;
import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.Collector;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.LeafCollector;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.SimpleCollector;
+import org.apache.lucene.search.TimeLimitingCollector;
+import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Counter;
import org.apache.lucene.util.mutable.MutableValueInt;
import org.wikimedia.search.extra.regex.SourceRegexQuery.Rechecker;
@@ -14,6 +22,9 @@
import org.wikimedia.search.extra.util.FieldValues;
import org.wikimedia.search.extra.util.FieldValues.Loader;
+import java.io.IOException;
+import java.util.List;
+
/**
* Unaccelerated source_regex query.
* It will scan all the docs in the index.
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/expression/AbstractCompositeExpression.java
b/src/main/java/org/wikimedia/search/extra/regex/expression/AbstractCompositeExpression.java
index e0400cc..6d4dfc7 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/expression/AbstractCompositeExpression.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/expression/AbstractCompositeExpression.java
@@ -1,14 +1,14 @@
package org.wikimedia.search.extra.regex.expression;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import lombok.EqualsAndHashCode;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-import lombok.EqualsAndHashCode;
/**
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/expression/ExpressionRewriter.java
b/src/main/java/org/wikimedia/search/extra/regex/expression/ExpressionRewriter.java
index ba0f3c6..61e3eab 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/expression/ExpressionRewriter.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/expression/ExpressionRewriter.java
@@ -1,9 +1,9 @@
package org.wikimedia.search.extra.regex.expression;
+import com.google.common.collect.ImmutableSet;
+
import java.util.HashSet;
import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
/**
* Boolean expression rewriter
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/expression/Leaf.java
b/src/main/java/org/wikimedia/search/extra/regex/expression/Leaf.java
index 8e3f204..4b71688 100644
--- a/src/main/java/org/wikimedia/search/extra/regex/expression/Leaf.java
+++ b/src/main/java/org/wikimedia/search/extra/regex/expression/Leaf.java
@@ -1,9 +1,10 @@
package org.wikimedia.search.extra.regex.expression;
-import static com.google.common.base.Preconditions.*;
import com.google.common.collect.ImmutableSet;
import lombok.EqualsAndHashCode;
+import static com.google.common.base.Preconditions.checkNotNull;
+
/**
* A leaf expression.
*/
diff --git a/src/main/java/org/wikimedia/search/extra/regex/expression/Or.java
b/src/main/java/org/wikimedia/search/extra/regex/expression/Or.java
index a7c02b5..2cb243d 100644
--- a/src/main/java/org/wikimedia/search/extra/regex/expression/Or.java
+++ b/src/main/java/org/wikimedia/search/extra/regex/expression/Or.java
@@ -1,9 +1,9 @@
package org.wikimedia.search.extra.regex.expression;
-import java.util.List;
-
import com.google.common.collect.ImmutableSet;
+import java.util.List;
+
/**
* Disjunction.
*/
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/ngram/NGramAutomaton.java
b/src/main/java/org/wikimedia/search/extra/regex/ngram/NGramAutomaton.java
index 6dfe859..60eac20 100644
--- a/src/main/java/org/wikimedia/search/extra/regex/ngram/NGramAutomaton.java
+++ b/src/main/java/org/wikimedia/search/extra/regex/ngram/NGramAutomaton.java
@@ -1,11 +1,6 @@
package org.wikimedia.search.extra.regex.ngram;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.ImmutableSet;
import lombok.EqualsAndHashCode;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.Transition;
@@ -17,7 +12,11 @@
import org.wikimedia.search.extra.regex.expression.Or;
import org.wikimedia.search.extra.regex.expression.True;
-import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
/**
* A finite automaton who's transitions are ngrams that must be in the string
or
diff --git
a/src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
b/src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
index 76631ab..b271c89 100644
---
a/src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
+++
b/src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
@@ -1,6 +1,8 @@
package org.wikimedia.search.extra.superdetectnoop;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.elasticsearch.script.AbstractExecutableScript;
+import org.elasticsearch.script.ExecutableScript;
+import org.elasticsearch.script.NativeScriptFactory;
import java.util.Collections;
import java.util.HashMap;
@@ -8,9 +10,7 @@
import java.util.Map;
import java.util.Set;
-import org.elasticsearch.script.AbstractExecutableScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.NativeScriptFactory;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* Like the detect_noop option on updates but with pluggable "close enough"
diff --git
a/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java
b/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java
index 892938d..4d3b171 100644
---
a/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java
+++
b/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java
@@ -1,6 +1,9 @@
package org.wikimedia.search.extra.tokencount;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
import lombok.experimental.Accessors;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -14,7 +17,10 @@
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.query.*;
+import org.elasticsearch.index.query.AbstractQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryParseContext;
+import org.elasticsearch.index.query.QueryShardContext;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/src/main/java/org/wikimedia/search/extra/util/FieldValues.java
b/src/main/java/org/wikimedia/search/extra/util/FieldValues.java
index bc7580d..80f8127 100644
--- a/src/main/java/org/wikimedia/search/extra/util/FieldValues.java
+++ b/src/main/java/org/wikimedia/search/extra/util/FieldValues.java
@@ -1,18 +1,17 @@
package org.wikimedia.search.extra.util;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.google.common.collect.ImmutableSet;
import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.index.fieldvisitor.CustomFieldsVisitor;
-import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* Hub for fetching field values.
diff --git
a/src/test/java/org/wikimedia/search/extra/AbstractPluginIntegrationTest.java
b/src/test/java/org/wikimedia/search/extra/AbstractPluginIntegrationTest.java
index da84936..8493310 100644
---
a/src/test/java/org/wikimedia/search/extra/AbstractPluginIntegrationTest.java
+++
b/src/test/java/org/wikimedia/search/extra/AbstractPluginIntegrationTest.java
@@ -1,12 +1,12 @@
package org.wikimedia.search.extra;
-import java.util.Collection;
-import java.util.Collections;
-
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
+import java.util.Collection;
+import java.util.Collections;
+
@ClusterScope(scope = ESIntegTestCase.Scope.SUITE, transportClientRatio = 0.0)
public class AbstractPluginIntegrationTest extends ESIntegTestCase {
@Override
diff --git
a/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilterTest.java
b/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilterTest.java
index a8296a2..e306c45 100644
---
a/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilterTest.java
+++
b/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserveOriginalFilterTest.java
@@ -1,14 +1,13 @@
package org.wikimedia.search.extra.analysis.filters;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.lucene.analysis.*;
+import com.google.common.base.Charsets;
+import com.google.common.primitives.Ints;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.CharArraySet;
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
@@ -25,8 +24,13 @@
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.junit.Test;
-import com.google.common.base.Charsets;
-import com.google.common.primitives.Ints;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
public class PreserveOriginalFilterTest extends BaseTokenStreamTestCase {
private final int shingleMaxSize = random().nextInt(3) + 3;
diff --git
a/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserverOriginalIntegrationTest.java
b/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserverOriginalIntegrationTest.java
index ffb2d88..d3d3a38 100644
---
a/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserverOriginalIntegrationTest.java
+++
b/src/test/java/org/wikimedia/search/extra/analysis/filters/PreserverOriginalIntegrationTest.java
@@ -1,11 +1,5 @@
package org.wikimedia.search.extra.analysis.filters;
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -14,6 +8,15 @@
import org.junit.Test;
import org.wikimedia.search.extra.AbstractPluginIntegrationTest;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoSearchHits;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertOrderedSearchHits;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
+
public class PreserverOriginalIntegrationTest extends
AbstractPluginIntegrationTest {
@Before
public void init() throws IOException, InterruptedException,
ExecutionException {
diff --git
a/src/test/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisIntegrationTest.java
b/src/test/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisIntegrationTest.java
index 4a11c9f..a7aa0d4 100644
---
a/src/test/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisIntegrationTest.java
+++
b/src/test/java/org/wikimedia/search/extra/fuzzylike/FuzzyLikeThisIntegrationTest.java
@@ -1,12 +1,5 @@
package org.wikimedia.search.extra.fuzzylike;
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-import static org.hamcrest.Matchers.containsString;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.unit.Fuzziness;
@@ -16,6 +9,19 @@
import org.junit.Test;
import org.wikimedia.search.extra.AbstractPluginIntegrationTest;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFirstHit;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoSearchHits;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
+import static org.hamcrest.Matchers.containsString;
+
@Deprecated
public class FuzzyLikeThisIntegrationTest extends
AbstractPluginIntegrationTest {
diff --git
a/src/test/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreIntegrationTest.java
b/src/test/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreIntegrationTest.java
index b724039..c18c13c 100644
---
a/src/test/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreIntegrationTest.java
+++
b/src/test/java/org/wikimedia/search/extra/levenshtein/LevenshteinDistanceScoreIntegrationTest.java
@@ -1,15 +1,5 @@
package org.wikimedia.search.extra.levenshtein;
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertOrderedSearchHits;
-
-import java.io.IOException;
-
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.lucene.search.function.CombineFunction;
@@ -18,6 +8,16 @@
import org.junit.Test;
import org.wikimedia.search.extra.AbstractPluginIntegrationTest;
+import java.io.IOException;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertOrderedSearchHits;
+
public class LevenshteinDistanceScoreIntegrationTest extends
AbstractPluginIntegrationTest {
@Test
public void testLevenshteinScore() throws ElasticsearchException,
IOException {
diff --git
a/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryIntegrationTest.java
b/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryIntegrationTest.java
index bbc2bf7..97cd4aa 100644
---
a/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryIntegrationTest.java
+++
b/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryIntegrationTest.java
@@ -1,19 +1,5 @@
package org.wikimedia.search.extra.regex;
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.containsString;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.ExecutionException;
-
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
@@ -25,6 +11,20 @@
import org.junit.Test;
import org.wikimedia.search.extra.AbstractPluginIntegrationTest;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.ExecutionException;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.containsString;
+
public class SourceRegexQueryIntegrationTest extends
AbstractPluginIntegrationTest {
@Test
public void basicUnacceleratedRegex() throws InterruptedException,
ExecutionException, IOException {
diff --git
a/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryRecheckTest.java
b/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryRecheckTest.java
index cea79ce..c5e79e2 100644
---
a/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryRecheckTest.java
+++
b/src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryRecheckTest.java
@@ -1,22 +1,21 @@
package org.wikimedia.search.extra.regex;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Locale;
-
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.Resources;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.Test;
import
org.wikimedia.search.extra.regex.SourceRegexQuery.NonBacktrackingOnTheFlyCaseConvertingRechecker;
import
org.wikimedia.search.extra.regex.SourceRegexQuery.NonBacktrackingRechecker;
import org.wikimedia.search.extra.regex.SourceRegexQuery.Rechecker;
-import org.wikimedia.search.extra.regex.SourceRegexQueryBuilder.Settings;
import org.wikimedia.search.extra.regex.SourceRegexQuery.SlowRechecker;
+import org.wikimedia.search.extra.regex.SourceRegexQueryBuilder.Settings;
-import com.google.common.base.Charsets;
-import com.google.common.collect.ImmutableList;
-import com.google.common.io.Resources;
+import java.io.IOException;
+import java.util.Locale;
+
+import static org.junit.Assert.assertTrue;
public class SourceRegexQueryRecheckTest {
private static final Logger log =
LogManager.getLogger(SourceRegexQueryRecheckTest.class.getPackage().getName());
diff --git
a/src/test/java/org/wikimedia/search/extra/regex/TimeoutCheckerTest.java
b/src/test/java/org/wikimedia/search/extra/regex/TimeoutCheckerTest.java
index f59b12c..f30db2e 100644
--- a/src/test/java/org/wikimedia/search/extra/regex/TimeoutCheckerTest.java
+++ b/src/test/java/org/wikimedia/search/extra/regex/TimeoutCheckerTest.java
@@ -1,7 +1,10 @@
package org.wikimedia.search.extra.regex;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.*;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.NoMergePolicy;
+import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TimeLimitingCollector;
import org.apache.lucene.store.Directory;
diff --git
a/src/test/java/org/wikimedia/search/extra/regex/expression/ExpressionTest.java
b/src/test/java/org/wikimedia/search/extra/regex/expression/ExpressionTest.java
index f7fd7e8..828145e 100644
---
a/src/test/java/org/wikimedia/search/extra/regex/expression/ExpressionTest.java
+++
b/src/test/java/org/wikimedia/search/extra/regex/expression/ExpressionTest.java
@@ -1,14 +1,16 @@
package org.wikimedia.search.extra.regex.expression;
+import org.apache.lucene.util.automaton.Automaton;
+import org.apache.lucene.util.automaton.RegExp;
import org.junit.Test;
import org.wikimedia.search.extra.regex.ngram.NGramExtractor;
-import static org.junit.Assert.*;
-
import java.util.Locale;
-import org.apache.lucene.util.automaton.Automaton;
-import org.apache.lucene.util.automaton.RegExp;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
public class ExpressionTest {
private final Leaf<String> foo = new Leaf<>("foo");
diff --git
a/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramAutomatonTest.java
b/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramAutomatonTest.java
index 4a4ef6f..c3b0389 100644
---
a/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramAutomatonTest.java
+++
b/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramAutomatonTest.java
@@ -1,9 +1,8 @@
package org.wikimedia.search.extra.regex.ngram;
-import static org.wikimedia.search.extra.regex.expression.Leaf.leaves;
-
import com.carrotsearch.randomizedtesting.RandomizedRunner;
import com.carrotsearch.randomizedtesting.RandomizedTest;
+import com.carrotsearch.randomizedtesting.annotations.Repeat;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.AutomatonTestUtil;
import org.apache.lucene.util.automaton.RegExp;
@@ -17,7 +16,7 @@
import org.wikimedia.search.extra.regex.expression.Or;
import org.wikimedia.search.extra.regex.expression.True;
-import com.carrotsearch.randomizedtesting.annotations.Repeat;
+import static org.wikimedia.search.extra.regex.expression.Leaf.leaves;
@RunWith(RandomizedRunner.class)
public class NGramAutomatonTest extends RandomizedTest {
diff --git
a/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramExtractorTest.java
b/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramExtractorTest.java
index 781e07b..b6b3049 100644
---
a/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramExtractorTest.java
+++
b/src/test/java/org/wikimedia/search/extra/regex/ngram/NGramExtractorTest.java
@@ -1,7 +1,5 @@
package org.wikimedia.search.extra.regex.ngram;
-import static org.wikimedia.search.extra.regex.expression.Leaf.leaves;
-
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.RegExp;
import org.junit.Test;
@@ -10,6 +8,7 @@
import org.wikimedia.search.extra.regex.expression.True;
import static org.junit.Assert.assertEquals;
+import static org.wikimedia.search.extra.regex.expression.Leaf.leaves;
public class NGramExtractorTest {
@Test
diff --git
a/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerMonteCarlo.java
b/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerMonteCarlo.java
index 2f3ac4e..a74a7e2 100644
---
a/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerMonteCarlo.java
+++
b/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerMonteCarlo.java
@@ -1,17 +1,5 @@
package org.wikimedia.search.extra.superdetectnoop;
-import static org.apache.lucene.util.TestUtil.randomSimpleString;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.common.logging.ESLoggerFactory;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import com.carrotsearch.randomizedtesting.RandomizedRunner;
import com.carrotsearch.randomizedtesting.RandomizedTest;
import com.google.common.base.Function;
@@ -19,6 +7,17 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Ordering;
+import org.apache.logging.log4j.Logger;
+import org.elasticsearch.common.logging.ESLoggerFactory;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import static org.apache.lucene.util.TestUtil.randomSimpleString;
/**
* Runs Monte Carlo method to help you pick the best parameters for
diff --git
a/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerTest.java
b/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerTest.java
index 189f370..3e0420f 100644
---
a/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerTest.java
+++
b/src/test/java/org/wikimedia/search/extra/superdetectnoop/SetHandlerTest.java
@@ -1,15 +1,14 @@
package org.wikimedia.search.extra.superdetectnoop;
-import static org.junit.Assert.assertEquals;
+import com.google.common.collect.ImmutableList;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
+import static org.junit.Assert.assertEquals;
public class SetHandlerTest {
@Test
diff --git
a/src/test/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScriptIntegrationTest.java
b/src/test/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScriptIntegrationTest.java
index e54c9d0..1ea6d2b 100644
---
a/src/test/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScriptIntegrationTest.java
+++
b/src/test/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScriptIntegrationTest.java
@@ -1,17 +1,8 @@
package org.wikimedia.search.extra.superdetectnoop;
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows;
-import static org.hamcrest.Matchers.anything;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.not;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import org.elasticsearch.action.DocWriteResponse;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.action.support.WriteRequest;
@@ -25,9 +16,17 @@
import org.junit.Test;
import org.wikimedia.search.extra.AbstractPluginIntegrationTest;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows;
+import static org.hamcrest.Matchers.anything;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.not;
public class SuperDetectNoopScriptIntegrationTest extends
AbstractPluginIntegrationTest {
@Test
diff --git
a/src/test/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryIntegrationTest.java
b/src/test/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryIntegrationTest.java
index f80de3e..3db2301 100644
---
a/src/test/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryIntegrationTest.java
+++
b/src/test/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryIntegrationTest.java
@@ -1,8 +1,5 @@
package org.wikimedia.search.extra.tokencount;
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.QueryBuilders;
import org.junit.Test;
@@ -10,6 +7,11 @@
import java.io.IOException;
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoSearchHits;
+import static
org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
+
public class TokenCountRouterQueryIntegrationTest extends
AbstractPluginIntegrationTest {
private void init() throws IOException {
assertAcked(prepareCreate("test")
--
To view, visit https://gerrit.wikimedia.org/r/342639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97bd3ec1fbdcfb7c0b11b82cab7d13f4120ac6cf
Gerrit-PatchSet: 2
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
