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/19 23:03:00 UTC
[2/5] jena git commit: cleanup per comments from afs
cleanup per comments from afs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/83492171
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/83492171
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/83492171
Branch: refs/heads/JENA-1556-MutilingualEnhancements-3.8.0
Commit: 83492171b8e61e42ebde29293809d2c8a2d80d0a
Parents: 0d07ca9
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Thu Jun 14 08:42:03 2018 -0500
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Thu Jun 14 08:42:03 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/text/TextIndexLucene.java | 1 -
.../org/apache/jena/query/text/analyzer/ConfigurableAnalyzer.java | 1 -
.../jena/query/text/analyzer/IndexingMultilingualAnalyzer.java | 1 -
.../apache/jena/query/text/analyzer/LowerCaseKeywordAnalyzer.java | 1 -
.../org/apache/jena/query/text/analyzer/MultilingualAnalyzer.java | 1 -
.../jena/query/text/analyzer/QueryMultilingualAnalyzer.java | 1 -
.../jena/query/text/assembler/DefineAnalyzersAssembler.java | 3 +--
.../main/java/org/apache/jena/query/text/assembler/TextVocab.java | 1 -
8 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/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 cd4d63f..0e70688 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
@@ -433,7 +433,6 @@ public class TextIndexLucene implements TextIndex {
throw new TextIndexParseException(qs, ex.getMessage()) ;
}
catch (Exception ex) {
- ex.printStackTrace(); // TEMPORARY
throw new TextIndexException("query", ex) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/jena-text/src/main/java/org/apache/jena/query/text/analyzer/ConfigurableAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/ConfigurableAnalyzer.java b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/ConfigurableAnalyzer.java
index 8d54d2c..b5bbeea 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/ConfigurableAnalyzer.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/ConfigurableAnalyzer.java
@@ -40,7 +40,6 @@ import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
-
/**
* Lucene Analyzer implementation that can be configured with different
* Tokenizer and (optionally) TokenFilter implementations.
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/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 9f3b890..6faf82a 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
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Lucene Analyzer implementation that delegates to a language-specific
* Analyzer based on a field name suffix: e.g. field="label_en" will use
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/jena-text/src/main/java/org/apache/jena/query/text/analyzer/LowerCaseKeywordAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/LowerCaseKeywordAnalyzer.java b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/LowerCaseKeywordAnalyzer.java
index 071569b..63852fd 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/LowerCaseKeywordAnalyzer.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/LowerCaseKeywordAnalyzer.java
@@ -22,7 +22,6 @@ import org.apache.lucene.analysis.Analyzer ;
import org.apache.lucene.analysis.core.KeywordTokenizer ;
import org.apache.lucene.analysis.core.LowerCaseFilter ;
-
/**
* Lucene Analyzer implementation that works like KeywordAnalyzer (i.e.
* doesn't tokenize the input, keeps it as a single token), but forces text
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/jena-text/src/main/java/org/apache/jena/query/text/analyzer/MultilingualAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/MultilingualAnalyzer.java b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/MultilingualAnalyzer.java
index f3fb451..de67f9a 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/analyzer/MultilingualAnalyzer.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/analyzer/MultilingualAnalyzer.java
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Lucene Analyzer implementation that delegates to a language-specific
* Analyzer based on a field name suffix: e.g. field="label_en" will use
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/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 de35e9e..33005cf 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
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Lucene Analyzer implementation that delegates to a language-specific
* Analyzer based on a field name suffix: e.g. field="label_en" will use
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/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 6977f13..c9dc9fe 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
@@ -143,8 +143,7 @@ public class DefineAnalyzersAssembler {
Util.addAuxIndexes(langCode, tags);
log.trace("addAuxIndexes for {} with tags: {}", langCode, tags);
}
-
-
+
if (adding.hasProperty(TextVocab.pIndexAnalyzer)) {
Statement indexStmt = adding.getProperty(TextVocab.pIndexAnalyzer);
Resource key = indexStmt.getResource();
http://git-wip-us.apache.org/repos/asf/jena/blob/83492171/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
index 973a3a4..6a2922b 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
@@ -111,7 +111,6 @@ public class TextVocab
public static final Property pSearchFor = Vocab.property(NS, "searchFor");
public static final Property pAuxIndex = Vocab.property(NS, "auxIndex");
public static final Property pIndexAnalyzer = Vocab.property(NS, "indexAnalyzer");
- public static final Property indexAnalyzer = Vocab.property(NS, "IndexAnalyzer");
// Query Cache
public static final Property pCacheQueries = Vocab.property(NS, "cacheQueries");