From dfc661ec0e7f384b5ca314611881a8ba0e8cacd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Swen=20Th=C3=BCmmler?= Date: Mon, 3 Aug 2020 16:23:34 +0200 Subject: [PATCH 1/2] changes for elasticsearch 7.7.x --- build.gradle | 4 +++- gradle.properties | 6 +++--- .../plugin/bundle/BundlePlugin.java | 12 ++++++------ .../plugin/bundle/common/fst/FstCompiler.java | 16 ++++++++-------- .../standardnumber/StandardnumberService.java | 2 +- .../autophrase/AutoPhrasingTokenFilter.java | 4 ++-- .../AutoPhrasingTokenFilterFactory.java | 4 ++-- .../index/analysis/hyphen/HyphenAnalyzer.java | 1 + .../analysis/sortform/SortFormAnalyzer.java | 1 + .../StandardnumberTokenFilterFactory.java | 2 +- .../worddelimiter/WordDelimiterFilter.java | 2 +- .../mapper/icu/IcuCollationKeyFieldMapper.java | 2 +- .../mapper/reference/ReferenceMapper.java | 2 +- .../decompound/ExactPhraseQueryBuilder.java | 6 +++--- .../isbnformat/RestISBNFormatterAction.java | 16 +++++++++------- .../langdetect/RestLangdetectAction.java | 18 +++++++++--------- 16 files changed, 52 insertions(+), 46 deletions(-) diff --git a/build.gradle b/build.gradle index 0c12aff5..b6a7db81 100644 --- a/build.gradle +++ b/build.gradle @@ -227,4 +227,6 @@ licenseHeaders.enabled = false dependencyLicenses.enabled = false thirdPartyAudit.enabled = false loggerUsageCheck.enabled = false -testingConventions.enabled = false \ No newline at end of file +testingConventions.enabled = false +//generatePomFileForNebulaPublication = false +validateNebulaPom.enabled = false diff --git a/gradle.properties b/gradle.properties index 774343fb..29f74ec1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ group = org.xbib.elasticsearch name = elasticsearch-plugin-bundle -version = 7.6.1.0 +version = 7.7.1.0 -elasticsearch.version = 7.6.1 -lucene.version = 8.4.0 +elasticsearch.version = 7.7.1 +lucene.version = 8.5.1 icu4j.version = 67.1 standardnumber.version = 1.0.1 diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java index cb4e35a2..164e8473 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java @@ -31,13 +31,14 @@ import org.xbib.elasticsearch.plugin.bundle.action.isbnformat.TransportISBNFormatAction; import org.xbib.elasticsearch.plugin.bundle.action.langdetect.LangdetectAction; import org.xbib.elasticsearch.plugin.bundle.action.langdetect.TransportLangdetectAction; +import org.xbib.elasticsearch.plugin.bundle.common.reference.ReferenceService; +import org.xbib.elasticsearch.plugin.bundle.common.standardnumber.StandardnumberService; import org.xbib.elasticsearch.plugin.bundle.index.analysis.autophrase.AutoPhrasingTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.baseform.BaseformTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.concat.ConcatTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.concat.PairTokenFilterFactory; -import org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.patricia.DecompoundTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.fst.FstDecompoundTokenFilterFactory; -import org.xbib.elasticsearch.plugin.bundle.index.analysis.lemmatize.LemmatizeTokenFilterFactory; +import org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.patricia.DecompoundTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.german.GermanNormalizationFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.hyphen.HyphenAnalyzerProvider; import org.xbib.elasticsearch.plugin.bundle.index.analysis.hyphen.HyphenTokenFilterFactory; @@ -51,6 +52,7 @@ import org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.IcuNumberFormatTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.IcuTransformTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.segmentation.IcuTokenizerFactory; +import org.xbib.elasticsearch.plugin.bundle.index.analysis.lemmatize.LemmatizeTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.naturalsort.NaturalSortKeyAnalyzerProvider; import org.xbib.elasticsearch.plugin.bundle.index.analysis.naturalsort.NaturalSortKeyTokenizerFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.sortform.SortformAnalyzerProvider; @@ -66,11 +68,9 @@ import org.xbib.elasticsearch.plugin.bundle.index.mapper.reference.ReferenceMapper; import org.xbib.elasticsearch.plugin.bundle.index.mapper.reference.ReferenceMapperModule; import org.xbib.elasticsearch.plugin.bundle.index.mapper.reference.ReferenceMapperTypeParser; -import org.xbib.elasticsearch.plugin.bundle.common.reference.ReferenceService; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapperModule; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapperTypeParser; -import org.xbib.elasticsearch.plugin.bundle.common.standardnumber.StandardnumberService; import org.xbib.elasticsearch.plugin.bundle.query.decompound.ExactPhraseQueryBuilder; import org.xbib.elasticsearch.plugin.bundle.rest.action.isbnformat.RestISBNFormatterAction; import org.xbib.elasticsearch.plugin.bundle.rest.action.langdetect.RestLangdetectAction; @@ -281,10 +281,10 @@ public List getRestHandlers(Settings settings, Supplier nodesInCluster) { List extra = new ArrayList<>(); if (settings.getAsBoolean("plugins.xbib.isbnformat.enabled", true)) { - extra.add(new RestISBNFormatterAction(restController)); + extra.add(new RestISBNFormatterAction()); } if (settings.getAsBoolean("plugins.xbib.langdetect.enabled", true)) { - extra.add(new RestLangdetectAction( restController)); + extra.add(new RestLangdetectAction()); } return extra; } diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java index 7f6a4acf..556d1c09 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java @@ -1,5 +1,13 @@ package org.xbib.elasticsearch.plugin.bundle.common.fst; +import org.apache.lucene.store.OutputStreamDataOutput; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.IntsRefBuilder; +import org.apache.lucene.util.fst.Builder; +import org.apache.lucene.util.fst.FST; +import org.apache.lucene.util.fst.FST.INPUT_TYPE; +import org.apache.lucene.util.fst.NoOutputs; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -11,14 +19,6 @@ import java.util.Locale; import java.util.regex.Pattern; -import org.apache.lucene.store.OutputStreamDataOutput; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.fst.Builder; -import org.apache.lucene.util.fst.FST; -import org.apache.lucene.util.fst.FST.INPUT_TYPE; -import org.apache.lucene.util.fst.NoOutputs; - /** * Compile an FSA from an UTF-8 text file (must be properly sorted). diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java index 36c8a9e2..aec893d5 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java @@ -5,8 +5,8 @@ import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.settings.Settings; import org.xbib.elasticsearch.plugin.bundle.action.isbnformat.ISBNFormatResponse; -import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; import org.xbib.elasticsearch.plugin.bundle.index.analysis.standardnumber.StandardnumberTokenFilter; +import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; import org.xbib.standardnumber.ISBN; import org.xbib.standardnumber.NoSuchStandardNumberException; import org.xbib.standardnumber.StandardNumber; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java index b5024226..247f43bb 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java @@ -1,12 +1,12 @@ package org.xbib.elasticsearch.plugin.bundle.index.analysis.autophrase; +import org.apache.lucene.analysis.CharArrayMap; +import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.analysis.CharArrayMap; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.util.AttributeImpl; import java.io.IOException; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java index c73e6580..3e29d78c 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java @@ -1,11 +1,11 @@ package org.xbib.elasticsearch.plugin.bundle.index.analysis.autophrase; +import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.WordlistLoader; import org.apache.lucene.analysis.core.StopFilter; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; -import org.apache.lucene.analysis.WordlistLoader; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java index 13e2f677..dab7f233 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java @@ -4,6 +4,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.index.analysis.TokenFilterFactory; + import java.util.Collections; /** diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java index f24db96d..7a0d8161 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java @@ -5,6 +5,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; + import java.util.Collections; public class SortFormAnalyzer extends Analyzer { diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java index 42b2cf59..b45c88ff 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java @@ -5,8 +5,8 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; import org.xbib.elasticsearch.plugin.bundle.common.standardnumber.StandardnumberService; +import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; /** * Standard number token filter factory. diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java index 14437e6f..6c76a438 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java @@ -1,5 +1,6 @@ package org.xbib.elasticsearch.plugin.bundle.index.analysis.worddelimiter; +import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.WhitespaceTokenizer; @@ -8,7 +9,6 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.util.ArrayUtil; import java.io.IOException; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/icu/IcuCollationKeyFieldMapper.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/icu/IcuCollationKeyFieldMapper.java index cf3dc729..e5d7b420 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/icu/IcuCollationKeyFieldMapper.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/icu/IcuCollationKeyFieldMapper.java @@ -147,7 +147,7 @@ protected BytesRef indexedValueForSearch(Object value) { @Override public Query fuzzyQuery(Object value, Fuzziness fuzziness, int prefixLength, int maxExpansions, - boolean transpositions) { + boolean transpositions, QueryShardContext context) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/reference/ReferenceMapper.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/reference/ReferenceMapper.java index 120c51b6..083906e9 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/reference/ReferenceMapper.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/reference/ReferenceMapper.java @@ -306,7 +306,7 @@ public Query existsQuery(QueryShardContext context) { @Override public Query fuzzyQuery(Object value, Fuzziness fuzziness, int prefixLength, int maxExpansions, - boolean transpositions) { + boolean transpositions, QueryShardContext context) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java index 728d408c..c93994f7 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java @@ -1,8 +1,5 @@ package org.xbib.elasticsearch.plugin.bundle.query.decompound; -import java.io.IOException; -import java.util.Objects; - import org.apache.lucene.search.Query; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; @@ -15,6 +12,9 @@ import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; +import java.io.IOException; +import java.util.Objects; + public class ExactPhraseQueryBuilder extends AbstractQueryBuilder { public static final String NAME = "exact_phrase"; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/isbnformat/RestISBNFormatterAction.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/isbnformat/RestISBNFormatterAction.java index f0c72366..4571de87 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/isbnformat/RestISBNFormatterAction.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/isbnformat/RestISBNFormatterAction.java @@ -1,16 +1,17 @@ package org.xbib.elasticsearch.plugin.bundle.rest.action.isbnformat; import org.elasticsearch.client.node.NodeClient; -import org.elasticsearch.common.inject.Inject; import org.elasticsearch.rest.BaseRestHandler; -import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestStatusToXContentListener; import org.xbib.elasticsearch.plugin.bundle.action.isbnformat.ISBNFormatAction; import org.xbib.elasticsearch.plugin.bundle.action.isbnformat.ISBNFormatRequest; import java.io.IOException; +import java.util.List; +import static java.util.Arrays.asList; +import static java.util.Collections.unmodifiableList; import static org.elasticsearch.rest.RestRequest.Method.GET; /** @@ -18,11 +19,12 @@ */ public class RestISBNFormatterAction extends BaseRestHandler { - @Inject - public RestISBNFormatterAction(RestController controller) { - super(); - controller.registerHandler(GET, "/_isbn", this); - controller.registerHandler(GET, "/_isbn/{value}", this); + @Override + public List routes() + { + return unmodifiableList(asList( + new Route(GET, "/_isbn"), + new Route(GET, "/_isbn/{value}"))); } @Override diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/langdetect/RestLangdetectAction.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/langdetect/RestLangdetectAction.java index c0c4a9c5..3788f0a9 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/langdetect/RestLangdetectAction.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/rest/action/langdetect/RestLangdetectAction.java @@ -3,19 +3,20 @@ import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.rest.BaseRestHandler; -import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestStatusToXContentListener; import org.xbib.elasticsearch.plugin.bundle.action.langdetect.LangdetectAction; import org.xbib.elasticsearch.plugin.bundle.action.langdetect.LangdetectRequest; import java.io.IOException; +import java.util.List; +import static java.util.Arrays.asList; +import static java.util.Collections.unmodifiableList; import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestRequest.Method.POST; @@ -24,13 +25,12 @@ */ public class RestLangdetectAction extends BaseRestHandler { - @Inject - public RestLangdetectAction(RestController controller) { - super(); - controller.registerHandler(GET, "/_langdetect", this); - controller.registerHandler(GET, "/_langdetect/{profile}", this); - controller.registerHandler(POST, "/_langdetect", this); - controller.registerHandler(POST, "/_langdetect/{profile}", this); + @Override + public List routes() { + return unmodifiableList(asList(new Route(GET, "/_langdetect/health"), + new Route(GET, "/_langdetect/{profile}"), + new Route(POST, "/_langdetect"), + new Route(POST, "/_langdetect/{profile}"))); } @Override From 6cc21515e37e2cb30393486cd282e7a1ea44ef76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Swen=20Th=C3=BCmmler?= Date: Mon, 3 Aug 2020 18:42:58 +0200 Subject: [PATCH 2/2] revert changes from 'optimize imports' --- .../plugin/bundle/BundlePlugin.java | 8 ++++---- .../plugin/bundle/common/fst/FstCompiler.java | 16 ++++++++-------- .../standardnumber/StandardnumberService.java | 2 +- .../autophrase/AutoPhrasingTokenFilter.java | 4 ++-- .../AutoPhrasingTokenFilterFactory.java | 4 ++-- .../index/analysis/hyphen/HyphenAnalyzer.java | 1 - .../analysis/sortform/SortFormAnalyzer.java | 1 - .../StandardnumberTokenFilterFactory.java | 2 +- .../worddelimiter/WordDelimiterFilter.java | 2 +- .../decompound/ExactPhraseQueryBuilder.java | 6 +++--- 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java index 164e8473..2320f51b 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java @@ -31,14 +31,13 @@ import org.xbib.elasticsearch.plugin.bundle.action.isbnformat.TransportISBNFormatAction; import org.xbib.elasticsearch.plugin.bundle.action.langdetect.LangdetectAction; import org.xbib.elasticsearch.plugin.bundle.action.langdetect.TransportLangdetectAction; -import org.xbib.elasticsearch.plugin.bundle.common.reference.ReferenceService; -import org.xbib.elasticsearch.plugin.bundle.common.standardnumber.StandardnumberService; import org.xbib.elasticsearch.plugin.bundle.index.analysis.autophrase.AutoPhrasingTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.baseform.BaseformTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.concat.ConcatTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.concat.PairTokenFilterFactory; -import org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.fst.FstDecompoundTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.patricia.DecompoundTokenFilterFactory; +import org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.fst.FstDecompoundTokenFilterFactory; +import org.xbib.elasticsearch.plugin.bundle.index.analysis.lemmatize.LemmatizeTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.german.GermanNormalizationFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.hyphen.HyphenAnalyzerProvider; import org.xbib.elasticsearch.plugin.bundle.index.analysis.hyphen.HyphenTokenFilterFactory; @@ -52,7 +51,6 @@ import org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.IcuNumberFormatTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.IcuTransformTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.segmentation.IcuTokenizerFactory; -import org.xbib.elasticsearch.plugin.bundle.index.analysis.lemmatize.LemmatizeTokenFilterFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.naturalsort.NaturalSortKeyAnalyzerProvider; import org.xbib.elasticsearch.plugin.bundle.index.analysis.naturalsort.NaturalSortKeyTokenizerFactory; import org.xbib.elasticsearch.plugin.bundle.index.analysis.sortform.SortformAnalyzerProvider; @@ -68,9 +66,11 @@ import org.xbib.elasticsearch.plugin.bundle.index.mapper.reference.ReferenceMapper; import org.xbib.elasticsearch.plugin.bundle.index.mapper.reference.ReferenceMapperModule; import org.xbib.elasticsearch.plugin.bundle.index.mapper.reference.ReferenceMapperTypeParser; +import org.xbib.elasticsearch.plugin.bundle.common.reference.ReferenceService; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapperModule; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapperTypeParser; +import org.xbib.elasticsearch.plugin.bundle.common.standardnumber.StandardnumberService; import org.xbib.elasticsearch.plugin.bundle.query.decompound.ExactPhraseQueryBuilder; import org.xbib.elasticsearch.plugin.bundle.rest.action.isbnformat.RestISBNFormatterAction; import org.xbib.elasticsearch.plugin.bundle.rest.action.langdetect.RestLangdetectAction; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java index 556d1c09..7f6a4acf 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/fst/FstCompiler.java @@ -1,13 +1,5 @@ package org.xbib.elasticsearch.plugin.bundle.common.fst; -import org.apache.lucene.store.OutputStreamDataOutput; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.fst.Builder; -import org.apache.lucene.util.fst.FST; -import org.apache.lucene.util.fst.FST.INPUT_TYPE; -import org.apache.lucene.util.fst.NoOutputs; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -19,6 +11,14 @@ import java.util.Locale; import java.util.regex.Pattern; +import org.apache.lucene.store.OutputStreamDataOutput; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.IntsRefBuilder; +import org.apache.lucene.util.fst.Builder; +import org.apache.lucene.util.fst.FST; +import org.apache.lucene.util.fst.FST.INPUT_TYPE; +import org.apache.lucene.util.fst.NoOutputs; + /** * Compile an FSA from an UTF-8 text file (must be properly sorted). diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java index aec893d5..36c8a9e2 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/common/standardnumber/StandardnumberService.java @@ -5,8 +5,8 @@ import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.settings.Settings; import org.xbib.elasticsearch.plugin.bundle.action.isbnformat.ISBNFormatResponse; -import org.xbib.elasticsearch.plugin.bundle.index.analysis.standardnumber.StandardnumberTokenFilter; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; +import org.xbib.elasticsearch.plugin.bundle.index.analysis.standardnumber.StandardnumberTokenFilter; import org.xbib.standardnumber.ISBN; import org.xbib.standardnumber.NoSuchStandardNumberException; import org.xbib.standardnumber.StandardNumber; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java index 247f43bb..b5024226 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilter.java @@ -1,12 +1,12 @@ package org.xbib.elasticsearch.plugin.bundle.index.analysis.autophrase; -import org.apache.lucene.analysis.CharArrayMap; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.analysis.CharArrayMap; +import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.util.AttributeImpl; import java.io.IOException; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java index 3e29d78c..c73e6580 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/autophrase/AutoPhrasingTokenFilterFactory.java @@ -1,11 +1,11 @@ package org.xbib.elasticsearch.plugin.bundle.index.analysis.autophrase; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.WordlistLoader; import org.apache.lucene.analysis.core.StopFilter; +import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.analysis.WordlistLoader; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java index dab7f233..13e2f677 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/hyphen/HyphenAnalyzer.java @@ -4,7 +4,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.index.analysis.TokenFilterFactory; - import java.util.Collections; /** diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java index 7a0d8161..f24db96d 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/sortform/SortFormAnalyzer.java @@ -5,7 +5,6 @@ import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; - import java.util.Collections; public class SortFormAnalyzer extends Analyzer { diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java index b45c88ff..42b2cf59 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/standardnumber/StandardnumberTokenFilterFactory.java @@ -5,8 +5,8 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.xbib.elasticsearch.plugin.bundle.common.standardnumber.StandardnumberService; import org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber.StandardnumberMapper; +import org.xbib.elasticsearch.plugin.bundle.common.standardnumber.StandardnumberService; /** * Standard number token filter factory. diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java index 6c76a438..14437e6f 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/index/analysis/worddelimiter/WordDelimiterFilter.java @@ -1,6 +1,5 @@ package org.xbib.elasticsearch.plugin.bundle.index.analysis.worddelimiter; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.WhitespaceTokenizer; @@ -9,6 +8,7 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.util.ArrayUtil; import java.io.IOException; diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java index c93994f7..728d408c 100644 --- a/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java +++ b/src/main/java/org/xbib/elasticsearch/plugin/bundle/query/decompound/ExactPhraseQueryBuilder.java @@ -1,5 +1,8 @@ package org.xbib.elasticsearch.plugin.bundle.query.decompound; +import java.io.IOException; +import java.util.Objects; + import org.apache.lucene.search.Query; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; @@ -12,9 +15,6 @@ import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; -import java.io.IOException; -import java.util.Objects; - public class ExactPhraseQueryBuilder extends AbstractQueryBuilder { public static final String NAME = "exact_phrase";