Gehel has uploaded a new change for review. (
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/SetHandler.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
21 files changed, 82 insertions(+), 125 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/extra
refs/changes/39/342639/1
diff --git a/src/dev-tools/checkstyle.xml b/src/dev-tools/checkstyle.xml
index 6e97cc5..2fcae90 100644
--- a/src/dev-tools/checkstyle.xml
+++ b/src/dev-tools/checkstyle.xml
@@ -10,6 +10,15 @@
<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="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..63045b7 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;
@@ -19,14 +11,11 @@
import org.wikimedia.search.extra.fuzzylike.FuzzyLikeThisQueryBuilder;
import org.wikimedia.search.extra.levenshtein.LevenshteinDistanceScoreBuilder;
import org.wikimedia.search.extra.regex.SourceRegexQueryBuilder;
-import org.wikimedia.search.extra.superdetectnoop.ChangeHandler;
-import org.wikimedia.search.extra.superdetectnoop.SetHandler;
-import org.wikimedia.search.extra.superdetectnoop.SuperDetectNoopScript;
-import org.wikimedia.search.extra.superdetectnoop.VersionedDocumentHandler;
-import org.wikimedia.search.extra.superdetectnoop.WithinAbsoluteHandler;
-import org.wikimedia.search.extra.superdetectnoop.WithinPercentageHandler;
+import org.wikimedia.search.extra.superdetectnoop.*;
import org.wikimedia.search.extra.tokencount.TokenCountRouterQueryBuilder;
+import java.util.*;
+
/**
* 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..cde7daa 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;
@@ -29,16 +25,7 @@
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.BoostAttribute;
-import org.apache.lucene.search.BoostQuery;
-import org.apache.lucene.search.ConstantScoreQuery;
-import org.apache.lucene.search.FuzzyTermsEnum;
-import org.apache.lucene.search.MatchNoDocsQuery;
-import org.apache.lucene.search.MaxNonCompetitiveBoostAttribute;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.*;
import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
import org.apache.lucene.util.AttributeSource;
@@ -46,7 +33,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..36c2552 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,11 @@
import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.QueryShardException;
+import java.io.IOException;
+import java.util.*;
+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..785f581 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
@@ -1,21 +1,16 @@
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;
-import org.apache.lucene.search.ConstantScoreScorer;
-import org.apache.lucene.search.ConstantScoreWeight;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Weight;
+import org.apache.lucene.search.*;
import org.apache.lucene.util.mutable.MutableValueInt;
import org.wikimedia.search.extra.regex.SourceRegexQuery.Rechecker;
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..614b11a 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
@@ -1,9 +1,6 @@
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.*;
@@ -14,6 +11,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..3f200de 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,15 +1,11 @@
package org.wikimedia.search.extra.regex.expression;
-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;
+import java.util.*;
+
/**
* Abstract parent for composite expressions like And and Or.
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..9354517 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,23 +1,12 @@
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;
-import org.wikimedia.search.extra.regex.expression.And;
-import org.wikimedia.search.extra.regex.expression.Expression;
-import org.wikimedia.search.extra.regex.expression.ExpressionSource;
-import org.wikimedia.search.extra.regex.expression.False;
-import org.wikimedia.search.extra.regex.expression.Leaf;
-import org.wikimedia.search.extra.regex.expression.Or;
-import org.wikimedia.search.extra.regex.expression.True;
+import org.wikimedia.search.extra.regex.expression.*;
-import com.google.common.collect.ImmutableSet;
+import java.util.*;
/**
* 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/SetHandler.java
b/src/main/java/org/wikimedia/search/extra/superdetectnoop/SetHandler.java
index 1edabad..9c9176b 100644
--- a/src/main/java/org/wikimedia/search/extra/superdetectnoop/SetHandler.java
+++ b/src/main/java/org/wikimedia/search/extra/superdetectnoop/SetHandler.java
@@ -1,10 +1,6 @@
package org.wikimedia.search.extra.superdetectnoop;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Implements Set-like behavior for lists.
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..1952bbb 100644
---
a/src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
+++
b/src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
@@ -1,17 +1,13 @@
package org.wikimedia.search.extra.superdetectnoop;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
import org.elasticsearch.script.AbstractExecutableScript;
import org.elasticsearch.script.ExecutableScript;
import org.elasticsearch.script.NativeScriptFactory;
+import java.util.*;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
/**
* Like the detect_noop option on updates but with pluggable "close enough"
* detectors! So much power!
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.
--
To view, visit https://gerrit.wikimedia.org/r/342639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97bd3ec1fbdcfb7c0b11b82cab7d13f4120ac6cf
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
