You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/05/25 14:10:57 UTC
[6/6] jena git commit: Add back constructor to EntityDefinition for
compatibility.
Add back constructor to EntityDefinition for compatibility.
Fix un-generics.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/66a1eda8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/66a1eda8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/66a1eda8
Branch: refs/heads/master
Commit: 66a1eda82eeee2d8f551fac06d6b0a2672decdc2
Parents: 086b05c
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 25 13:10:34 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 25 13:10:34 2015 +0100
----------------------------------------------------------------------
.../jena/query/text/EntityDefinition.java | 70 +++++++++++++++++---
.../org/apache/jena/query/text/TextQueryPF.java | 4 +-
.../apache/jena/query/text/analyzer/Util.java | 4 +-
...ractTestDatasetWithLuceneGraphTextIndex.java | 2 +-
.../jena/query/text/TestBuildTextDataset.java | 2 +-
.../text/TestLuceneWithMultipleThreads.java | 2 +-
6 files changed, 68 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/66a1eda8/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java b/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
index 30b048a..2a68247 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/EntityDefinition.java
@@ -33,17 +33,16 @@ import org.apache.lucene.analysis.Analyzer ;
* Definition of a "document"
*/
public class EntityDefinition {
- private final Map<Node, String> predicateToField = new HashMap<>() ;
- private final Map<String, Analyzer> fieldToAnalyzer = new HashMap<>();
+ private final Map<Node, String> predicateToField = new HashMap<>() ;
+ private final Map<String, Analyzer> fieldToAnalyzer = new HashMap<>() ;
private final ListMultimap<String, Node> fieldToPredicate = ArrayListMultimap.create() ;
- private final Collection<String> fields = Collections.unmodifiableCollection(fieldToPredicate.keys()) ;
+ private final Collection<String> fields = Collections.unmodifiableCollection(fieldToPredicate.keys()) ;
// private final Collection<String> fields =
// Collections.unmodifiableCollection(fieldToPredicate.keySet()) ;
- private final String entityField ;
- private final String primaryField ;
- private String graphField ;
- private String langField ;
- //private final Node primaryPredicate ;
+ private final String entityField ;
+ private final String primaryField ;
+ private String graphField = null ;
+ private String langField ;
/**
* @param entityField
@@ -56,6 +55,61 @@ public class EntityDefinition {
this.primaryField = primaryField ;
}
+ /**
+ * @param entityField
+ * The entity being indexed (e.g. it's URI).
+ * @param primaryField
+ * The primary/default field to search
+ * @param graphField
+ * The field that stores graph URI, or null
+ */
+ public EntityDefinition(String entityField, String primaryField, String graphField) {
+ this(entityField, primaryField) ;
+ setGraphField(graphField);
+ }
+
+ /**
+ * @param entityField
+ * The entity being indexed (e.g. it's URI).
+ * @param primaryField
+ * The primary/default field to search
+ * @param primaryPredicate
+ * The property associated with the primary/default field
+ */
+ public EntityDefinition(String entityField, String primaryField, Resource primaryPredicate) {
+ this(entityField, primaryField) ;
+ setPrimaryPredicate(primaryPredicate);
+ }
+
+ /**
+ * @param entityField
+ * The entity being indexed (e.g. it's URI).
+ * @param primaryField
+ * The primary/default field to search
+ * @param primaryPredicate
+ * The property associated with the primary/default field
+ */
+ public EntityDefinition(String entityField, String primaryField, Node primaryPredicate) {
+ this(entityField, primaryField) ;
+ setPrimaryPredicate(primaryPredicate);
+ }
+
+ /**
+ * @param entityField
+ * The entity being indexed (e.g. it's URI).
+ * @param primaryField
+ * The primary/default field to search
+ * @param graphField
+ * The field that stores graph URI, or null
+ * @param primaryPredicate
+ * The property associated with the primary/default field
+ */
+ public EntityDefinition(String entityField, String primaryField, String graphField, Node primaryPredicate) {
+ this(entityField, primaryField) ;
+ setGraphField(graphField);
+ setPrimaryPredicate(primaryPredicate) ;
+ }
+
public String getEntityField() {
return entityField ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/66a1eda8/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index d568232..81dc412 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -18,7 +18,6 @@
package org.apache.jena.query.text ;
-import java.util.Iterator;
import java.util.List ;
import org.apache.jena.atlas.iterator.Iter ;
@@ -110,8 +109,7 @@ public class TextQueryPF extends PropertyFunctionBase {
private String extractArg(String prefix, PropFuncArg argObject) {
String value = null;
int pos = 0;
- for (Iterator it = argObject.getArgList().iterator(); it.hasNext(); ) {
- Node node = (Node)it.next();
+ for (Node node : argObject.getArgList()) {
if (node.isLiteral()) {
String arg = node.getLiteral().toString();
if (arg.startsWith(prefix + ":")) {
http://git-wip-us.apache.org/repos/asf/jena/blob/66a1eda8/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 11dd683..c8e3490 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
@@ -26,7 +26,7 @@ import java.util.Hashtable;
public class Util {
- private static Hashtable<String, Class> analyzersClasses; //mapping between ISO2-letter language and lucene existing analyzersClasses
+ private static Hashtable<String, Class<?>> analyzersClasses; //mapping between ISO2-letter language and lucene existing analyzersClasses
private static Hashtable<String, Analyzer> cache = new Hashtable<>(); //to avoid unnecessary multi instantiation
static {
@@ -48,7 +48,7 @@ public class Util {
Class<?> className = analyzersClasses.get(lang);
if (className == null)
return null;
- Constructor constructor = className.getConstructor(Version.class);
+ Constructor<?> constructor = className.getConstructor(Version.class);
Analyzer analyzer = (Analyzer)constructor.newInstance(ver);
cache.put(lang, analyzer);
return analyzer;
http://git-wip-us.apache.org/repos/asf/jena/blob/66a1eda8/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
index 1670f63..720e372 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java
@@ -38,7 +38,7 @@ public class AbstractTestDatasetWithLuceneGraphTextIndex extends AbstractTestDat
Directory dir = new RAMDirectory() ;
EntityDefinition eDef = new EntityDefinition("iri", "text");
eDef.setGraphField("graph");
- eDef.setPrimaryPredicate(RDFS.label.asNode());
+ eDef.setPrimaryPredicate(RDFS.label);
eDef.set("comment", RDFS.comment.asNode()) ; // some tests require indexing rdfs:comment
TextIndex tidx = new TextIndexLucene(dir, new TextIndexConfig(eDef)) ;
dataset = TextDatasetFactory.create(ds1, tidx) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/66a1eda8/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
index 02d02f9..2335e40 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
@@ -111,7 +111,7 @@ public class TestBuildTextDataset extends BaseTest
// Define the index mapping
EntityDefinition entDef = new EntityDefinition("uri", "text");
- entDef.setPrimaryPredicate(RDFS.label.asNode());
+ entDef.setPrimaryPredicate(RDFS.label);
// Lucene, in memory.
Directory dir = new RAMDirectory() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/66a1eda8/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
index 6e743a2..5bbe7c3 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
@@ -50,7 +50,7 @@ public class TestLuceneWithMultipleThreads
static {
entDef = new EntityDefinition("uri", "label");
entDef.setGraphField("graph");
- entDef.setPrimaryPredicate(RDFS.label.asNode());
+ entDef.setPrimaryPredicate(RDFS.label);
StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_46);
entDef.setAnalyzer("label", analyzer);
}