You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by co...@apache.org on 2018/06/20 21:00:01 UTC
[3/6] jena git commit: various cleanup per @kinow
various cleanup per @kinow
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fee01519
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fee01519
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fee01519
Branch: refs/heads/master
Commit: fee015197ccd58002e8af33fe7d39aff767d8a42
Parents: 8349217
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Fri Jun 15 09:07:10 2018 -0500
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Fri Jun 15 09:07:10 2018 -0500
----------------------------------------------------------------------
.../apache/jena/query/text/TextIndexLucene.java | 4 +-
.../analyzer/IndexingMultilingualAnalyzer.java | 47 ++++++------
.../analyzer/QueryMultilingualAnalyzer.java | 75 ++++++++++----------
.../apache/jena/query/text/analyzer/Util.java | 2 +-
.../assembler/DefineAnalyzersAssembler.java | 2 +-
5 files changed, 66 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fee01519/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index 0e70688..120e83f 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -102,6 +102,8 @@ public class TextIndexLucene implements TextIndex {
private final String queryParserType ;
private final FieldType ftText ;
private final boolean isMultilingual ;
+
+ private Map<String, Analyzer> multilingualQueryAnalyzers = new HashMap<>();
// The IndexWriter can't be final because we may have to recreate it if rollback() is called.
// However, it needs to be volatile in case the next write transaction is on a different thread,
@@ -568,8 +570,6 @@ public class TextIndexLucene implements TextIndex {
return results ;
}
- private Map<String, Analyzer> multilingualQueryAnalyzers = new HashMap<>();
-
private Analyzer getQueryAnalyzer(boolean usingSearchFor, String lang) {
if (usingSearchFor) {
Analyzer qa = multilingualQueryAnalyzers.get(lang);
http://git-wip-us.apache.org/repos/asf/jena/blob/fee01519/jena-text/src/main/java/org/apache/jena/query/text/analyzer/IndexingMultilingualAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/IndexingMultilingualAnalyzer.java b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/IndexingMultilingualAnalyzer.java
index 6faf82a..3bab0d2 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/IndexingMultilingualAnalyzer.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/IndexingMultilingualAnalyzer.java
@@ -18,6 +18,7 @@
package org.apache.jena.query.text.analyzer ;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.lucene.analysis.Analyzer ;
import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
import org.slf4j.Logger;
@@ -30,31 +31,31 @@ import org.slf4j.LoggerFactory;
*/
public class IndexingMultilingualAnalyzer extends DelegatingAnalyzerWrapper {
- private static Logger log = LoggerFactory.getLogger(IndexingMultilingualAnalyzer.class);
-
- private Analyzer defaultAnalyzer;
+ private static Logger log = LoggerFactory.getLogger(IndexingMultilingualAnalyzer.class);
- public IndexingMultilingualAnalyzer(Analyzer defaultAnalyzer) {
- super(PER_FIELD_REUSE_STRATEGY);
- this.defaultAnalyzer = defaultAnalyzer;
- }
+ private Analyzer defaultAnalyzer;
- @Override
- protected Analyzer getWrappedAnalyzer(String fieldName) {
- int idx = fieldName.lastIndexOf("_");
- if (idx == -1) { // not language-specific, e.g. "label"
- return defaultAnalyzer;
- }
- String lang = fieldName.substring(idx+1);
- Analyzer analyzer = Util.getIndexAnalyzer(lang);
- analyzer = analyzer != null ? analyzer : Util.getLocalizedAnalyzer(lang);
- analyzer = analyzer != null ? analyzer : defaultAnalyzer;
- log.trace("getWrappedAnalyzer fieldName: {}, analyzer: {}", fieldName, analyzer);
- return analyzer;
- }
+ public IndexingMultilingualAnalyzer(Analyzer defaultAnalyzer) {
+ super(PER_FIELD_REUSE_STRATEGY);
+ this.defaultAnalyzer = defaultAnalyzer;
+ }
- @Override
- public String toString() {
- return "IndexingMultilingualAnalyzer(default=" + defaultAnalyzer + ")";
+ @Override
+ protected Analyzer getWrappedAnalyzer(String fieldName) {
+ int idx = fieldName.lastIndexOf("_");
+ if (idx == -1) { // not language-specific, e.g. "label"
+ return defaultAnalyzer;
}
+ String lang = fieldName.substring(idx+1);
+ Analyzer analyzer = Util.getIndexAnalyzer(lang);
+ analyzer = ObjectUtils.defaultIfNull(analyzer, Util.getLocalizedAnalyzer(lang));
+ analyzer = ObjectUtils.defaultIfNull(analyzer, defaultAnalyzer);
+ log.trace("getWrappedAnalyzer fieldName: {}, analyzer: {}", fieldName, analyzer);
+ return analyzer;
+ }
+
+ @Override
+ public String toString() {
+ return "IndexingMultilingualAnalyzer(default=" + defaultAnalyzer + ")";
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/fee01519/jena-text/src/main/java/org/apache/jena/query/text/analyzer/QueryMultilingualAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/QueryMultilingualAnalyzer.java b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/QueryMultilingualAnalyzer.java
index 33005cf..de16c7a 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/QueryMultilingualAnalyzer.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/QueryMultilingualAnalyzer.java
@@ -18,6 +18,7 @@
package org.apache.jena.query.text.analyzer ;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.lucene.analysis.Analyzer ;
import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
import org.slf4j.Logger;
@@ -30,46 +31,46 @@ import org.slf4j.LoggerFactory;
*/
public class QueryMultilingualAnalyzer extends DelegatingAnalyzerWrapper {
- private static Logger log = LoggerFactory.getLogger(QueryMultilingualAnalyzer.class);
- private Analyzer defaultAnalyzer;
- private String langTag;
+ private static Logger log = LoggerFactory.getLogger(QueryMultilingualAnalyzer.class);
+ private Analyzer defaultAnalyzer;
+ private String langTag;
- public QueryMultilingualAnalyzer(Analyzer defaultAnalyzer) {
- super(PER_FIELD_REUSE_STRATEGY);
- this.defaultAnalyzer = defaultAnalyzer;
- this.langTag = null;
- }
+ public QueryMultilingualAnalyzer(Analyzer defaultAnalyzer) {
+ super(PER_FIELD_REUSE_STRATEGY);
+ this.defaultAnalyzer = defaultAnalyzer;
+ this.langTag = null;
+ }
- public QueryMultilingualAnalyzer(Analyzer defaultAnalyzer, String tag) {
- super(PER_FIELD_REUSE_STRATEGY);
- this.defaultAnalyzer = defaultAnalyzer;
- this.langTag = tag;
- }
+ public QueryMultilingualAnalyzer(Analyzer defaultAnalyzer, String tag) {
+ super(PER_FIELD_REUSE_STRATEGY);
+ this.defaultAnalyzer = defaultAnalyzer;
+ this.langTag = tag;
+ }
- @Override
- /**
- * The analyzer corresponding to the langTag supplied at instantiation
- * is used to retrieve the analyzer to use regardless of the tag on the
- * fieldName. If no langTag is supplied then the tag on fieldName is
- * used to retrieve the analyzer as with the MultilingualAnalyzer
- *
- * @param fieldName
- * @return the analyzer to use in the search
- */
- protected Analyzer getWrappedAnalyzer(String fieldName) {
- int idx = fieldName.lastIndexOf("_");
- if (idx == -1) { // not language-specific, e.g. "label"
- return defaultAnalyzer;
- }
- String lang = langTag != null ? langTag : fieldName.substring(idx+1);
- Analyzer analyzer = Util.getLocalizedAnalyzer(lang);
- analyzer = analyzer != null ? analyzer : defaultAnalyzer;
- log.trace("getWrappedAnalyzer langTag: {}, fieldName: {}, analyzer: {}", langTag, fieldName, analyzer);
- return analyzer;
+ @Override
+ /**
+ * The analyzer corresponding to the langTag supplied at instantiation
+ * is used to retrieve the analyzer to use regardless of the tag on the
+ * fieldName. If no langTag is supplied then the tag on fieldName is
+ * used to retrieve the analyzer as with the MultilingualAnalyzer
+ *
+ * @param fieldName
+ * @return the analyzer to use in the search
+ */
+ protected Analyzer getWrappedAnalyzer(String fieldName) {
+ int idx = fieldName.lastIndexOf("_");
+ if (idx == -1) { // not language-specific, e.g. "label"
+ return defaultAnalyzer;
}
+ String lang = ObjectUtils.defaultIfNull(langTag, fieldName.substring(idx+1));
+ Analyzer analyzer = Util.getLocalizedAnalyzer(lang);
+ analyzer = ObjectUtils.defaultIfNull(analyzer, defaultAnalyzer);
+ log.trace("getWrappedAnalyzer langTag: {}, fieldName: {}, analyzer: {}", langTag, fieldName, analyzer);
+ return analyzer;
+ }
- @Override
- public String toString() {
- return "QueryMultilingualAnalyzer(default=" + defaultAnalyzer + ")";
- }
+ @Override
+ public String toString() {
+ return "QueryMultilingualAnalyzer(default=" + defaultAnalyzer + ")";
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/fee01519/jena-text/src/main/java/org/apache/jena/query/text/analyzer/Util.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/Util.java b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/Util.java
index b41baa1..1e7b85d 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/Util.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/Util.java
@@ -108,7 +108,7 @@ public class Util {
}
public static List<String> getAuxIndexes(String tag) {
- return StringUtils.isNotEmpty(tag) ? auxIndexes.get(tag) : new ArrayList<>();
+ return StringUtils.isNotEmpty(tag) ? auxIndexes.get(tag) : null;
}
public static void addAuxIndexes(String tag, List<String> tags) {
http://git-wip-us.apache.org/repos/asf/jena/blob/fee01519/jena-text/src/main/java/org/apache/jena/query/text/assembler/DefineAnalyzersAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/DefineAnalyzersAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/DefineAnalyzersAssembler.java
index c9dc9fe..876ca74 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/DefineAnalyzersAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/DefineAnalyzersAssembler.java
@@ -44,7 +44,7 @@ public class DefineAnalyzersAssembler {
text:analyzer [ . . . ]]
)
*/
- private static Logger log = LoggerFactory.getLogger(DefineAnalyzersAssembler.class) ;
+ private static Logger log = LoggerFactory.getLogger(DefineAnalyzersAssembler.class) ;
private static List<String> getStringList(Statement stmt, String p) {
List<String> tags = new ArrayList<String>();