You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by pu...@apache.org on 2018/04/23 13:21:26 UTC
[21/48] incubator-rya git commit: RYA-405 Migration of OpenRDF Sesame
libraries to RDF4J
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java
index a2cc08d..a353de8 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java
@@ -18,18 +18,14 @@ package org.apache.rya.indexing.statement.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
import org.apache.accumulo.core.client.Connector;
import org.apache.rya.accumulo.AccumuloRdfConfiguration;
import org.apache.rya.accumulo.AccumuloRyaDAO;
-import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine;
import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
-import org.apache.rya.api.RdfCloudTripleStoreUtils;
import org.apache.rya.api.domain.RyaStatement;
import org.apache.rya.api.domain.RyaType;
import org.apache.rya.api.domain.RyaURI;
@@ -37,25 +33,25 @@ import org.apache.rya.api.domain.StatementMetadata;
import org.apache.rya.api.persist.RyaDAOException;
import org.apache.rya.indexing.accumulo.ConfigUtils;
import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataNode;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector;
+import org.eclipse.rdf4j.query.parser.ParsedQuery;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.algebra.helpers.StatementPatternCollector;
-import org.openrdf.query.parser.ParsedQuery;
-import org.openrdf.query.parser.sparql.SPARQLParser;
-
-import info.aduna.iteration.CloseableIteration;
public class AccumuloStatementMetadataNodeTest {
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
private AccumuloRyaDAO dao;
private AccumuloRdfConfiguration conf;
@@ -99,8 +95,8 @@ public class AccumuloStatementMetadataNodeTest {
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(new QueryBindingSet());
QueryBindingSet bs = new QueryBindingSet();
- bs.addBinding("x", new LiteralImpl("CoffeeShop"));
- bs.addBinding("y", new LiteralImpl("Joe"));
+ bs.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bs.addBinding("y", VF.createLiteral("Joe"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -166,15 +162,15 @@ public class AccumuloStatementMetadataNodeTest {
StatementMetadataNode<AccumuloRdfConfiguration> node = new StatementMetadataNode<>(spList, conf);
QueryBindingSet bsConstraint = new QueryBindingSet();
- bsConstraint.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint.addBinding("z", VF.createLiteral("Virginia"));
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsConstraint);
QueryBindingSet expected = new QueryBindingSet();
- expected.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected.addBinding("y", new LiteralImpl("Joe"));
- expected.addBinding("z", new LiteralImpl("Virginia"));
+ expected.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected.addBinding("y", VF.createLiteral("Joe"));
+ expected.addBinding("z", VF.createLiteral("Virginia"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -223,21 +219,21 @@ public class AccumuloStatementMetadataNodeTest {
List<BindingSet> bsCollection = new ArrayList<>();
QueryBindingSet bsConstraint1 = new QueryBindingSet();
- bsConstraint1.addBinding("y", new LiteralImpl("CoffeeShop"));
- bsConstraint1.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint1.addBinding("y", VF.createLiteral("CoffeeShop"));
+ bsConstraint1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet bsConstraint2 = new QueryBindingSet();
- bsConstraint2.addBinding("y", new LiteralImpl("HardwareStore"));
- bsConstraint2.addBinding("z", new LiteralImpl("Maryland"));
+ bsConstraint2.addBinding("y", VF.createLiteral("HardwareStore"));
+ bsConstraint2.addBinding("z", VF.createLiteral("Maryland"));
bsCollection.add(bsConstraint1);
bsCollection.add(bsConstraint2);
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsCollection);
QueryBindingSet expected = new QueryBindingSet();
- expected.addBinding("y", new LiteralImpl("CoffeeShop"));
- expected.addBinding("x", new URIImpl("http://Joe"));
- expected.addBinding("z", new LiteralImpl("Virginia"));
+ expected.addBinding("y", VF.createLiteral("CoffeeShop"));
+ expected.addBinding("x", VF.createIRI("http://Joe"));
+ expected.addBinding("z", VF.createLiteral("Virginia"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -281,8 +277,8 @@ public class AccumuloStatementMetadataNodeTest {
StatementMetadataNode<AccumuloRdfConfiguration> node = new StatementMetadataNode<>(spList, conf);
QueryBindingSet bsConstraint = new QueryBindingSet();
- bsConstraint.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint.addBinding("y", new LiteralImpl("Doug"));
+ bsConstraint.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint.addBinding("y", VF.createLiteral("Doug"));
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsConstraint);
@@ -328,16 +324,16 @@ public class AccumuloStatementMetadataNodeTest {
List<BindingSet> bsCollection = new ArrayList<>();
QueryBindingSet bsConstraint1 = new QueryBindingSet();
- bsConstraint1.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint1.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet bsConstraint2 = new QueryBindingSet();
- bsConstraint2.addBinding("x", new LiteralImpl("HardwareStore"));
- bsConstraint2.addBinding("z", new LiteralImpl("Maryland"));
+ bsConstraint2.addBinding("x", VF.createLiteral("HardwareStore"));
+ bsConstraint2.addBinding("z", VF.createLiteral("Maryland"));
QueryBindingSet bsConstraint3 = new QueryBindingSet();
- bsConstraint3.addBinding("x", new LiteralImpl("BurgerShack"));
- bsConstraint3.addBinding("z", new LiteralImpl("Delaware"));
+ bsConstraint3.addBinding("x", VF.createLiteral("BurgerShack"));
+ bsConstraint3.addBinding("z", VF.createLiteral("Delaware"));
bsCollection.add(bsConstraint1);
bsCollection.add(bsConstraint2);
bsCollection.add(bsConstraint3);
@@ -345,14 +341,14 @@ public class AccumuloStatementMetadataNodeTest {
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsCollection);
QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected1.addBinding("y", new LiteralImpl("Joe"));
- expected1.addBinding("z", new LiteralImpl("Virginia"));
+ expected1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected1.addBinding("y", VF.createLiteral("Joe"));
+ expected1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet expected2 = new QueryBindingSet();
- expected2.addBinding("x", new LiteralImpl("HardwareStore"));
- expected2.addBinding("y", new LiteralImpl("Joe"));
- expected2.addBinding("z", new LiteralImpl("Maryland"));
+ expected2.addBinding("x", VF.createLiteral("HardwareStore"));
+ expected2.addBinding("y", VF.createLiteral("Joe"));
+ expected2.addBinding("z", VF.createLiteral("Maryland"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -406,16 +402,16 @@ public class AccumuloStatementMetadataNodeTest {
List<BindingSet> bsCollection = new ArrayList<>();
QueryBindingSet bsConstraint1 = new QueryBindingSet();
- bsConstraint1.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint1.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet bsConstraint2 = new QueryBindingSet();
- bsConstraint2.addBinding("x", new LiteralImpl("HardwareStore"));
- bsConstraint2.addBinding("z", new LiteralImpl("Maryland"));
+ bsConstraint2.addBinding("x", VF.createLiteral("HardwareStore"));
+ bsConstraint2.addBinding("z", VF.createLiteral("Maryland"));
QueryBindingSet bsConstraint3 = new QueryBindingSet();
- bsConstraint3.addBinding("x", new LiteralImpl("BurgerShack"));
- bsConstraint3.addBinding("z", new LiteralImpl("Delaware"));
+ bsConstraint3.addBinding("x", VF.createLiteral("BurgerShack"));
+ bsConstraint3.addBinding("z", VF.createLiteral("Delaware"));
bsCollection.add(bsConstraint1);
bsCollection.add(bsConstraint2);
bsCollection.add(bsConstraint3);
@@ -423,9 +419,9 @@ public class AccumuloStatementMetadataNodeTest {
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsCollection);
QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected1.addBinding("y", new LiteralImpl("Joe"));
- expected1.addBinding("z", new LiteralImpl("Virginia"));
+ expected1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected1.addBinding("y", VF.createLiteral("Joe"));
+ expected1.addBinding("z", VF.createLiteral("Virginia"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -478,16 +474,16 @@ public class AccumuloStatementMetadataNodeTest {
List<BindingSet> bsCollection = new ArrayList<>();
QueryBindingSet bsConstraint1 = new QueryBindingSet();
- bsConstraint1.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint1.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet bsConstraint2 = new QueryBindingSet();
- bsConstraint2.addBinding("x", new LiteralImpl("HardwareStore"));
- bsConstraint2.addBinding("z", new LiteralImpl("Maryland"));
+ bsConstraint2.addBinding("x", VF.createLiteral("HardwareStore"));
+ bsConstraint2.addBinding("z", VF.createLiteral("Maryland"));
QueryBindingSet bsConstraint3 = new QueryBindingSet();
- bsConstraint3.addBinding("x", new LiteralImpl("BurgerShack"));
- bsConstraint3.addBinding("z", new LiteralImpl("Delaware"));
+ bsConstraint3.addBinding("x", VF.createLiteral("BurgerShack"));
+ bsConstraint3.addBinding("z", VF.createLiteral("Delaware"));
bsCollection.add(bsConstraint1);
bsCollection.add(bsConstraint2);
bsCollection.add(bsConstraint3);
@@ -495,16 +491,16 @@ public class AccumuloStatementMetadataNodeTest {
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsCollection);
QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected1.addBinding("y", new LiteralImpl("Joe"));
- expected1.addBinding("z", new LiteralImpl("Virginia"));
- expected1.addBinding("c", new URIImpl("http://context_1"));
+ expected1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected1.addBinding("y", VF.createLiteral("Joe"));
+ expected1.addBinding("z", VF.createLiteral("Virginia"));
+ expected1.addBinding("c", VF.createIRI("http://context_1"));
QueryBindingSet expected2 = new QueryBindingSet();
- expected2.addBinding("x", new LiteralImpl("HardwareStore"));
- expected2.addBinding("y", new LiteralImpl("Joe"));
- expected2.addBinding("z", new LiteralImpl("Maryland"));
- expected2.addBinding("c", new URIImpl("http://context_2"));
+ expected2.addBinding("x", VF.createLiteral("HardwareStore"));
+ expected2.addBinding("y", VF.createLiteral("Joe"));
+ expected2.addBinding("z", VF.createLiteral("Maryland"));
+ expected2.addBinding("c", VF.createIRI("http://context_2"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -560,24 +556,24 @@ public class AccumuloStatementMetadataNodeTest {
List<BindingSet> bsCollection = new ArrayList<>();
QueryBindingSet bsConstraint1 = new QueryBindingSet();
- bsConstraint1.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint1.addBinding("z", new LiteralImpl("Virginia"));
- bsConstraint1.addBinding("c", new URIImpl("http://context_1"));
+ bsConstraint1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint1.addBinding("z", VF.createLiteral("Virginia"));
+ bsConstraint1.addBinding("c", VF.createIRI("http://context_1"));
QueryBindingSet bsConstraint2 = new QueryBindingSet();
- bsConstraint2.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint2.addBinding("z", new LiteralImpl("Maryland"));
- bsConstraint2.addBinding("c", new URIImpl("http://context_2"));
+ bsConstraint2.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint2.addBinding("z", VF.createLiteral("Maryland"));
+ bsConstraint2.addBinding("c", VF.createIRI("http://context_2"));
QueryBindingSet bsConstraint4 = new QueryBindingSet();
- bsConstraint4.addBinding("x", new LiteralImpl("HardwareStore"));
- bsConstraint4.addBinding("z", new LiteralImpl("WestVirginia"));
- bsConstraint4.addBinding("c", new URIImpl("http://context_2"));
+ bsConstraint4.addBinding("x", VF.createLiteral("HardwareStore"));
+ bsConstraint4.addBinding("z", VF.createLiteral("WestVirginia"));
+ bsConstraint4.addBinding("c", VF.createIRI("http://context_2"));
QueryBindingSet bsConstraint3 = new QueryBindingSet();
- bsConstraint3.addBinding("x", new LiteralImpl("BurgerShack"));
- bsConstraint3.addBinding("z", new LiteralImpl("Delaware"));
- bsConstraint3.addBinding("c", new URIImpl("http://context_1"));
+ bsConstraint3.addBinding("x", VF.createLiteral("BurgerShack"));
+ bsConstraint3.addBinding("z", VF.createLiteral("Delaware"));
+ bsConstraint3.addBinding("c", VF.createIRI("http://context_1"));
bsCollection.add(bsConstraint1);
bsCollection.add(bsConstraint2);
bsCollection.add(bsConstraint3);
@@ -596,16 +592,16 @@ public class AccumuloStatementMetadataNodeTest {
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsCollection);
QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected1.addBinding("y", new LiteralImpl("Joe"));
- expected1.addBinding("z", new LiteralImpl("Virginia"));
- expected1.addBinding("c", new URIImpl("http://context_1"));
+ expected1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected1.addBinding("y", VF.createLiteral("Joe"));
+ expected1.addBinding("z", VF.createLiteral("Virginia"));
+ expected1.addBinding("c", VF.createIRI("http://context_1"));
QueryBindingSet expected2 = new QueryBindingSet();
- expected2.addBinding("x", new LiteralImpl("HardwareStore"));
- expected2.addBinding("y", new LiteralImpl("Joe"));
- expected2.addBinding("z", new LiteralImpl("WestVirginia"));
- expected2.addBinding("c", new URIImpl("http://context_2"));
+ expected2.addBinding("x", VF.createLiteral("HardwareStore"));
+ expected2.addBinding("y", VF.createLiteral("Joe"));
+ expected2.addBinding("z", VF.createLiteral("WestVirginia"));
+ expected2.addBinding("c", VF.createIRI("http://context_2"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java
index 48a0f28..d887bc6 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java
@@ -17,6 +17,7 @@ package org.apache.rya.indexing.statement.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -34,24 +35,25 @@ import org.apache.rya.api.domain.StatementMetadata;
import org.apache.rya.api.persist.RyaDAOException;
import org.apache.rya.indexing.accumulo.ConfigUtils;
import org.apache.rya.sail.config.RyaSailFactory;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.sail.Sail;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
public class AccumuloStatementMetadataOptimizerIT {
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
private RdfCloudTripleStoreConfiguration conf;
private Sail sail;
@@ -100,8 +102,8 @@ public class AccumuloStatementMetadataOptimizerIT {
TupleQueryResult result = conn.prepareTupleQuery(QueryLanguage.SPARQL, query1).evaluate();
QueryBindingSet bs = new QueryBindingSet();
- bs.addBinding("x", new LiteralImpl("CoffeeShop"));
- bs.addBinding("y", new LiteralImpl("Joe"));
+ bs.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bs.addBinding("y", VF.createLiteral("Joe"));
List<BindingSet> bsList = new ArrayList<>();
while (result.hasNext()) {
@@ -162,11 +164,11 @@ public class AccumuloStatementMetadataOptimizerIT {
Set<BindingSet> expected = new HashSet<>();
QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected1.addBinding("y", new LiteralImpl("Joe"));
+ expected1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected1.addBinding("y", VF.createLiteral("Joe"));
QueryBindingSet expected2 = new QueryBindingSet();
- expected2.addBinding("x", new LiteralImpl("HardwareStore"));
- expected2.addBinding("y", new LiteralImpl("Joe"));
+ expected2.addBinding("x", VF.createLiteral("HardwareStore"));
+ expected2.addBinding("y", VF.createLiteral("Joe"));
expected.add(expected1);
expected.add(expected2);
@@ -221,9 +223,9 @@ public class AccumuloStatementMetadataOptimizerIT {
Set<BindingSet> expected = new HashSet<>();
QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("b", new URIImpl("http://Betty"));
- expected1.addBinding("a", new URIImpl("http://Joe"));
- expected1.addBinding("c", new URIImpl("http://Doug"));
+ expected1.addBinding("b", VF.createIRI("http://Betty"));
+ expected1.addBinding("a", VF.createIRI("http://Joe"));
+ expected1.addBinding("c", VF.createIRI("http://Doug"));
expected.add(expected1);
Set<BindingSet> bsSet = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java
index 647e3cc..0797033 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java
@@ -35,21 +35,22 @@ import org.apache.rya.mongodb.MongoDBRdfConfiguration;
import org.apache.rya.mongodb.MongoDBRyaDAO;
import org.apache.rya.mongodb.MongoITBase;
import org.apache.rya.sail.config.RyaSailFactory;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.sail.Sail;
import org.junit.Test;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
public class MongoStatementMetadataIT extends MongoITBase {
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
private final String query1 = "prefix owl: <http://www.w3.org/2002/07/owl#> prefix ano: <http://www.w3.org/2002/07/owl#annotated> prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> select ?x ?y where {_:blankNode rdf:type owl:Annotation; ano:Source <http://Joe>; "
+ "ano:Property <http://worksAt>; ano:Target ?x; <http://createdBy> ?y; <http://createdOn> \'2017-01-04\'^^xsd:date }";
@@ -86,8 +87,8 @@ public class MongoStatementMetadataIT extends MongoITBase {
final TupleQueryResult result = conn.prepareTupleQuery(QueryLanguage.SPARQL, query1).evaluate();
final QueryBindingSet bs = new QueryBindingSet();
- bs.addBinding("x", new LiteralImpl("CoffeeShop"));
- bs.addBinding("y", new LiteralImpl("Joe"));
+ bs.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bs.addBinding("y", VF.createLiteral("Joe"));
final List<BindingSet> bsList = new ArrayList<>();
while (result.hasNext()) {
@@ -165,11 +166,11 @@ public class MongoStatementMetadataIT extends MongoITBase {
final Set<BindingSet> expected = new HashSet<>();
final QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected1.addBinding("y", new LiteralImpl("Joe"));
+ expected1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected1.addBinding("y", VF.createLiteral("Joe"));
final QueryBindingSet expected2 = new QueryBindingSet();
- expected2.addBinding("x", new LiteralImpl("HardwareStore"));
- expected2.addBinding("y", new LiteralImpl("Joe"));
+ expected2.addBinding("x", VF.createLiteral("HardwareStore"));
+ expected2.addBinding("y", VF.createLiteral("Joe"));
expected.add(expected1);
expected.add(expected2);
@@ -233,9 +234,9 @@ public class MongoStatementMetadataIT extends MongoITBase {
final Set<BindingSet> expected = new HashSet<>();
final QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("b", new URIImpl("http://Betty"));
- expected1.addBinding("a", new URIImpl("http://Joe"));
- expected1.addBinding("c", new URIImpl("http://Doug"));
+ expected1.addBinding("b", VF.createIRI("http://Betty"));
+ expected1.addBinding("a", VF.createIRI("http://Joe"));
+ expected1.addBinding("c", VF.createIRI("http://Doug"));
expected.add(expected1);
final Set<BindingSet> bsSet = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java
index cab6c35..20fa32d 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java
@@ -31,23 +31,24 @@ import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataNode
import org.apache.rya.mongodb.MongoDBRdfConfiguration;
import org.apache.rya.mongodb.MongoDBRyaDAO;
import org.apache.rya.mongodb.MongoITBase;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector;
+import org.eclipse.rdf4j.query.parser.ParsedQuery;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.algebra.helpers.StatementPatternCollector;
-import org.openrdf.query.parser.ParsedQuery;
-import org.openrdf.query.parser.sparql.SPARQLParser;
-
-import info.aduna.iteration.CloseableIteration;
public class MongoStatementMetadataNodeIT extends MongoITBase {
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
+
private final String query = "prefix owl: <http://www.w3.org/2002/07/owl#> prefix ano: <http://www.w3.org/2002/07/owl#annotated> prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> select ?x ?y where {_:blankNode rdf:type owl:Annotation; ano:Source <http://Joe>; "
+ "ano:Property <http://worksAt>; ano:Target ?x; <http://createdBy> ?y; <http://createdOn> \'2017-01-04\'^^xsd:date }";
private final String query2 = "prefix owl: <http://www.w3.org/2002/07/owl#> prefix ano: <http://www.w3.org/2002/07/owl#annotated> prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> select ?x ?y where {_:blankNode rdf:type owl:Annotation; ano:Source ?x; "
@@ -82,8 +83,8 @@ public class MongoStatementMetadataNodeIT extends MongoITBase {
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(new QueryBindingSet());
QueryBindingSet bs = new QueryBindingSet();
- bs.addBinding("x", new LiteralImpl("CoffeeShop"));
- bs.addBinding("y", new LiteralImpl("Joe"));
+ bs.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bs.addBinding("y", VF.createLiteral("Joe"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -158,15 +159,15 @@ public class MongoStatementMetadataNodeIT extends MongoITBase {
StatementMetadataNode<MongoDBRdfConfiguration> node = new StatementMetadataNode<>(spList, conf);
QueryBindingSet bsConstraint = new QueryBindingSet();
- bsConstraint.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint.addBinding("z", VF.createLiteral("Virginia"));
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsConstraint);
QueryBindingSet expected = new QueryBindingSet();
- expected.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected.addBinding("y", new LiteralImpl("Joe"));
- expected.addBinding("z", new LiteralImpl("Virginia"));
+ expected.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected.addBinding("y", VF.createLiteral("Joe"));
+ expected.addBinding("z", VF.createLiteral("Virginia"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -216,21 +217,21 @@ public class MongoStatementMetadataNodeIT extends MongoITBase {
List<BindingSet> bsCollection = new ArrayList<>();
QueryBindingSet bsConstraint1 = new QueryBindingSet();
- bsConstraint1.addBinding("y", new LiteralImpl("CoffeeShop"));
- bsConstraint1.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint1.addBinding("y", VF.createLiteral("CoffeeShop"));
+ bsConstraint1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet bsConstraint2 = new QueryBindingSet();
- bsConstraint2.addBinding("y", new LiteralImpl("HardwareStore"));
- bsConstraint2.addBinding("z", new LiteralImpl("Maryland"));
+ bsConstraint2.addBinding("y", VF.createLiteral("HardwareStore"));
+ bsConstraint2.addBinding("z", VF.createLiteral("Maryland"));
bsCollection.add(bsConstraint1);
bsCollection.add(bsConstraint2);
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsCollection);
QueryBindingSet expected = new QueryBindingSet();
- expected.addBinding("y", new LiteralImpl("CoffeeShop"));
- expected.addBinding("x", new URIImpl("http://Joe"));
- expected.addBinding("z", new LiteralImpl("Virginia"));
+ expected.addBinding("y", VF.createLiteral("CoffeeShop"));
+ expected.addBinding("x", VF.createIRI("http://Joe"));
+ expected.addBinding("z", VF.createLiteral("Virginia"));
List<BindingSet> bsList = new ArrayList<>();
while (iteration.hasNext()) {
@@ -275,8 +276,8 @@ public class MongoStatementMetadataNodeIT extends MongoITBase {
StatementMetadataNode<MongoDBRdfConfiguration> node = new StatementMetadataNode<>(spList, conf);
QueryBindingSet bsConstraint = new QueryBindingSet();
- bsConstraint.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint.addBinding("y", new LiteralImpl("Doug"));
+ bsConstraint.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint.addBinding("y", VF.createLiteral("Doug"));
CloseableIteration<BindingSet, QueryEvaluationException> iteration = node.evaluate(bsConstraint);
@@ -323,16 +324,16 @@ public class MongoStatementMetadataNodeIT extends MongoITBase {
List<BindingSet> bsCollection = new ArrayList<>();
QueryBindingSet bsConstraint1 = new QueryBindingSet();
- bsConstraint1.addBinding("x", new LiteralImpl("CoffeeShop"));
- bsConstraint1.addBinding("z", new LiteralImpl("Virginia"));
+ bsConstraint1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ bsConstraint1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet bsConstraint2 = new QueryBindingSet();
- bsConstraint2.addBinding("x", new LiteralImpl("HardwareStore"));
- bsConstraint2.addBinding("z", new LiteralImpl("Maryland"));
+ bsConstraint2.addBinding("x", VF.createLiteral("HardwareStore"));
+ bsConstraint2.addBinding("z", VF.createLiteral("Maryland"));
QueryBindingSet bsConstraint3 = new QueryBindingSet();
- bsConstraint3.addBinding("x", new LiteralImpl("BurgerShack"));
- bsConstraint3.addBinding("z", new LiteralImpl("Delaware"));
+ bsConstraint3.addBinding("x", VF.createLiteral("BurgerShack"));
+ bsConstraint3.addBinding("z", VF.createLiteral("Delaware"));
bsCollection.add(bsConstraint1);
bsCollection.add(bsConstraint2);
bsCollection.add(bsConstraint3);
@@ -341,14 +342,14 @@ public class MongoStatementMetadataNodeIT extends MongoITBase {
Set<BindingSet> expected = new HashSet<>();
QueryBindingSet expected1 = new QueryBindingSet();
- expected1.addBinding("x", new LiteralImpl("CoffeeShop"));
- expected1.addBinding("y", new LiteralImpl("Joe"));
- expected1.addBinding("z", new LiteralImpl("Virginia"));
+ expected1.addBinding("x", VF.createLiteral("CoffeeShop"));
+ expected1.addBinding("y", VF.createLiteral("Joe"));
+ expected1.addBinding("z", VF.createLiteral("Virginia"));
QueryBindingSet expected2 = new QueryBindingSet();
- expected2.addBinding("x", new LiteralImpl("HardwareStore"));
- expected2.addBinding("y", new LiteralImpl("Joe"));
- expected2.addBinding("z", new LiteralImpl("Maryland"));
+ expected2.addBinding("x", VF.createLiteral("HardwareStore"));
+ expected2.addBinding("y", VF.createLiteral("Joe"));
+ expected2.addBinding("z", VF.createLiteral("Maryland"));
expected.add(expected1);
expected.add(expected2);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java
index f3d0c1e..c4318fb 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java
@@ -17,6 +17,7 @@ package org.apache.rya.indexing.statement.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -28,21 +29,22 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.rya.accumulo.AccumuloRdfConfiguration;
import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.VarNameUtils;
import org.apache.rya.indexing.accumulo.ConfigUtils;
import org.apache.rya.indexing.external.matching.JoinSegment;
import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataExternalSetProvider;
import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataNode;
import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.Filter;
+import org.eclipse.rdf4j.query.algebra.QueryModelNode;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.ValueExpr;
+import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector;
+import org.eclipse.rdf4j.query.parser.ParsedQuery;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser;
import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.Filter;
-import org.openrdf.query.algebra.QueryModelNode;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.ValueExpr;
-import org.openrdf.query.algebra.helpers.StatementPatternCollector;
-import org.openrdf.query.parser.ParsedQuery;
-import org.openrdf.query.parser.sparql.SPARQLParser;
public class StatementMetadataExternalSetProviderTest {
@@ -129,7 +131,7 @@ public class StatementMetadataExternalSetProviderTest {
Set<StatementPattern> sp3 = StatementMetadataTestUtils.getMetadataStatementPatterns(pq3.getTupleExpr(), propertySet);
//added extra blankNode into query3 to make blankNode names line up with query2. Need to remove it now so that
//StatementMetadataNode doesn't blow up because all subjects aren't the same.
- removePatternWithGivenSubject("-anon-1", sp3);
+ removePatternWithGivenSubject(VarNameUtils.prependAnonymous("1"), sp3);
patterns.addAll(StatementPatternCollector.process(pq2.getTupleExpr()));
JoinSegment<StatementMetadataNode<?>> segment = new JoinSegment<>(
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java
index 4a65d99..fba9652 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java
@@ -17,6 +17,7 @@ package org.apache.rya.indexing.statement.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
@@ -36,20 +37,20 @@ import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataExte
import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataNode;
import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataOptimizer;
import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.Filter;
+import org.eclipse.rdf4j.query.algebra.QueryModelNode;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.TupleExpr;
+import org.eclipse.rdf4j.query.algebra.ValueExpr;
+import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector;
+import org.eclipse.rdf4j.query.parser.ParsedQuery;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.Filter;
-import org.openrdf.query.algebra.QueryModelNode;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.query.algebra.ValueExpr;
-import org.openrdf.query.algebra.helpers.StatementPatternCollector;
-import org.openrdf.query.parser.ParsedQuery;
-import org.openrdf.query.parser.sparql.SPARQLParser;
@RunWith(value = Parameterized.class)
public class StatementMetadataOptimizerTest {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java
index 35c5405..51ea682 100644
--- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java
+++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java
@@ -17,6 +17,7 @@ package org.apache.rya.indexing.statement.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -24,15 +25,15 @@ import java.util.Set;
import org.apache.rya.api.domain.RyaURI;
import org.apache.rya.indexing.statement.metadata.matching.OWLReify;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.algebra.QueryModelNode;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.query.algebra.Var;
-import org.openrdf.query.algebra.evaluation.impl.ExternalSet;
-import org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.algebra.QueryModelNode;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.TupleExpr;
+import org.eclipse.rdf4j.query.algebra.Var;
+import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet;
+import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor;
public class StatementMetadataTestUtils {
@@ -46,7 +47,7 @@ public class StatementMetadataTestUtils {
return collector.getNodes();
}
- public static class MetadataNodeCollector extends QueryModelVisitorBase<RuntimeException> {
+ public static class MetadataNodeCollector extends AbstractQueryModelVisitor<RuntimeException> {
Set<QueryModelNode> qNodes = new HashSet<>();
@@ -70,7 +71,7 @@ public class StatementMetadataTestUtils {
}
- public static class MetadataStatementPatternCollector extends QueryModelVisitorBase<RuntimeException> {
+ public static class MetadataStatementPatternCollector extends AbstractQueryModelVisitor<RuntimeException> {
private Set<StatementPattern> nodes;
private Set<RyaURI> properties;
@@ -84,7 +85,7 @@ public class StatementMetadataTestUtils {
public void meet(StatementPattern node) {
Var predicate = node.getPredicateVar();
Value val = predicate.getValue();
- if (val != null && val instanceof URI) {
+ if (val != null && val instanceof IRI) {
RyaURI ryaVal = new RyaURI(val.stringValue());
if (uriList.contains(ryaVal) || properties.contains(ryaVal)) {
nodes.add(node);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java b/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
index a22825b..050cfe0 100644
--- a/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
+++ b/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
@@ -8,9 +8,9 @@ package org.apache.rya.sail.config;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -24,40 +24,35 @@ import static org.junit.Assert.assertTrue;
import java.io.InputStream;
import java.io.StringReader;
-import java.util.HashMap;
import java.util.Map;
-import org.apache.rya.sail.config.RyaAccumuloSailConfig;
-import org.apache.rya.sail.config.RyaAccumuloSailFactory;
-
import org.apache.commons.io.IOUtils;
+import org.eclipse.rdf4j.model.Model;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.util.Models;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.config.ConfigTemplate;
+import org.eclipse.rdf4j.repository.config.RepositoryConfig;
+import org.eclipse.rdf4j.repository.config.RepositoryConfigSchema;
+import org.eclipse.rdf4j.repository.config.RepositoryImplConfig;
+import org.eclipse.rdf4j.repository.config.RepositoryRegistry;
+import org.eclipse.rdf4j.repository.manager.LocalRepositoryManager;
+import org.eclipse.rdf4j.repository.sail.config.SailRepositoryConfig;
+import org.eclipse.rdf4j.repository.sail.config.SailRepositoryFactory;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.sail.config.SailFactory;
+import org.eclipse.rdf4j.sail.config.SailRegistry;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import org.openrdf.model.Graph;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.util.GraphUtil;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.config.ConfigTemplate;
-import org.openrdf.repository.config.RepositoryConfig;
-import org.openrdf.repository.config.RepositoryConfigSchema;
-import org.openrdf.repository.config.RepositoryConfigUtil;
-import org.openrdf.repository.config.RepositoryImplConfig;
-import org.openrdf.repository.config.RepositoryRegistry;
-import org.openrdf.repository.manager.LocalRepositoryManager;
-import org.openrdf.repository.sail.config.SailRepositoryConfig;
-import org.openrdf.repository.sail.config.SailRepositoryFactory;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.Rio;
-import org.openrdf.rio.helpers.StatementCollector;
-import org.openrdf.sail.config.SailFactory;
-import org.openrdf.sail.config.SailRegistry;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
@@ -92,7 +87,7 @@ public class RyaAccumuloSailFactoryTest {
RepositoryConnection rc = r.getConnection();
ValueFactory vf = rc.getValueFactory();
- Statement s = vf.createStatement(vf.createURI("u:a"), vf.createURI("u:b"), vf.createURI("u:c"));
+ Statement s = vf.createStatement(vf.createIRI("u:a"), vf.createIRI("u:b"), vf.createIRI("u:c"));
assertFalse(rc.hasStatement(s, false));
@@ -106,12 +101,10 @@ public class RyaAccumuloSailFactoryTest {
public void testCreateFromTemplateName() throws Exception {
LocalRepositoryManager repoman = new LocalRepositoryManager(Files.createTempDir());
repoman.initialize();
-
-
-
+
try(InputStream templateStream = RepositoryConfig.class.getResourceAsStream("RyaAccumuloSail.ttl")) {
String template = IOUtils.toString(templateStream);
-
+
final ConfigTemplate configTemplate = new ConfigTemplate(template);
final Map<String, String> valueMap = ImmutableMap.<String, String> builder()
.put("Repository ID", "RyaAccumuloSail")
@@ -122,49 +115,46 @@ public class RyaAccumuloSailFactoryTest {
.put("Rya Accumulo zookeepers", "zoo1,zoo2,zoo3")
.put("Rya Accumulo is mock", "true")
.build();
-
+
final String configString = configTemplate.render(valueMap);
-
+
// final Repository systemRepo = this.state.getManager().getSystemRepository();
- final Graph graph = new LinkedHashModel();
+ final Model model = new LinkedHashModel();
final RDFParser rdfParser = Rio.createParser(RDFFormat.TURTLE);
- rdfParser.setRDFHandler(new StatementCollector(graph));
+ rdfParser.setRDFHandler(new StatementCollector(model));
rdfParser.parse(new StringReader(configString), RepositoryConfigSchema.NAMESPACE);
- final Resource repositoryNode = GraphUtil.getUniqueSubject(graph, RDF.TYPE,
- RepositoryConfigSchema.REPOSITORY);
- final RepositoryConfig repConfig = RepositoryConfig.create(graph, repositoryNode);
+ final Resource repositoryNode = Models.subject(model.filter(null, RDF.TYPE, RepositoryConfigSchema.REPOSITORY)).get();
+ final RepositoryConfig repConfig = RepositoryConfig.create(model, repositoryNode);
repConfig.validate();
-
+
repoman.addRepositoryConfig(repConfig);
-
+
Repository r = repoman.getRepository("RyaAccumuloSail");
r.initialize();
-
+
}
}
-
+
@Test
public void testRyaAccumuloSailInManager() throws Exception {
// Class<SailFactory> clazz = SailFactory.class;
// ServiceLoader<SailFactory> loader = java.util.ServiceLoader.load(clazz, clazz.getClassLoader());
//
// Iterator<SailFactory> services = loader.iterator();
-//
+//
// while (services.hasNext())
// System.out.println(services.next());
-
-
String ryaSailKey = RyaAccumuloSailFactory.SAIL_TYPE;
- assertTrue("Connot find RyaAccumuloSailFactory in Registry", SailRegistry.getInstance().has(ryaSailKey));
+ assertTrue("Cannot find RyaAccumuloSailFactory in Registry", SailRegistry.getInstance().has(ryaSailKey));
- SailFactory factory = SailRegistry.getInstance().get(ryaSailKey);
+ SailFactory factory = SailRegistry.getInstance().get(ryaSailKey).get();
Assert.assertNotNull("Cannot create RyaAccumuloSailFactory", factory);
-
-
+
+
// for (String s : SailRegistry.getInstance().getKeys()) {
// System.out.println("SailRegistry :: " + s);
// }
@@ -186,10 +176,10 @@ public class RyaAccumuloSailFactoryTest {
// RepositoryConfigSchema
// RepositoryProvider.getRepository("RyaAccumuloSail");
}
-
+
@Test
public void testParseTemplate() throws Exception{
- String template = IOUtils.toString(ClassLoader.getSystemResourceAsStream("org/openrdf/repository/config/RyaAccumuloSail.ttl"));
+ String template = IOUtils.toString(ClassLoader.getSystemResourceAsStream("org/eclipse/rdf4j/repository/config/RyaAccumuloSail.ttl"));
ConfigTemplate ct = new ConfigTemplate(template);
System.out.println(ct.getVariableMap());
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaMongoDbSailFactoryTest.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaMongoDbSailFactoryTest.java b/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaMongoDbSailFactoryTest.java
index 6cfd4ea..7e0ff34 100644
--- a/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaMongoDbSailFactoryTest.java
+++ b/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaMongoDbSailFactoryTest.java
@@ -21,13 +21,13 @@ package org.apache.rya.sail.config;
import static org.junit.Assert.assertFalse;
import org.apache.rya.mongodb.MongoITBase;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.sail.Sail;
import org.junit.Assert;
import org.junit.Test;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
/**
* Tests {@link RyaSailFactory} with a MongoDB backend.
@@ -66,7 +66,7 @@ public class RyaMongoDbSailFactoryTest extends MongoITBase {
conn = repo.getConnection();
final ValueFactory vf = conn.getValueFactory();
- final Statement s = vf.createStatement(vf.createURI("u:a"), vf.createURI("u:b"), vf.createURI("u:c"));
+ final Statement s = vf.createStatement(vf.createIRI("u:a"), vf.createIRI("u:b"), vf.createIRI("u:c"));
assertFalse(conn.hasStatement(s, false));
@@ -97,7 +97,7 @@ public class RyaMongoDbSailFactoryTest extends MongoITBase {
conn = repo.getConnection();
final ValueFactory vf = conn.getValueFactory();
- final Statement s = vf.createStatement(vf.createURI("u:a"), vf.createURI("u:b"), vf.createURI("u:c"));
+ final Statement s = vf.createStatement(vf.createIRI("u:a"), vf.createIRI("u:b"), vf.createIRI("u:c"));
assertFalse(conn.hasStatement(s, false));
@@ -127,7 +127,7 @@ public class RyaMongoDbSailFactoryTest extends MongoITBase {
conn = repo.getConnection();
final ValueFactory vf = conn.getValueFactory();
- final Statement s = vf.createStatement(vf.createURI("u:a"), vf.createURI("u:b"), vf.createURI("u:c"));
+ final Statement s = vf.createStatement(vf.createIRI("u:a"), vf.createIRI("u:b"), vf.createIRI("u:c"));
assertFalse(conn.hasStatement(s, false));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/extras/indexing/src/test/resources/log4j.properties b/extras/indexing/src/test/resources/log4j.properties
new file mode 100644
index 0000000..8d3f81d
--- /dev/null
+++ b/extras/indexing/src/test/resources/log4j.properties
@@ -0,0 +1,25 @@
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing,
+ # software distributed under the License is distributed on an
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ # KIND, either express or implied. See the License for the
+ # specific language governing permissions and limitations
+ # under the License.
+
+# Root logger option
+log4j.rootLogger=INFO, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexingExample/pom.xml b/extras/indexingExample/pom.xml
index c339152..5740f08 100644
--- a/extras/indexingExample/pom.xml
+++ b/extras/indexingExample/pom.xml
@@ -74,9 +74,9 @@ under the License.
</dependency>
<dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-queryrender</artifactId>
- <version>${openrdf.sesame.version}</version>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-queryrender</artifactId>
+ <version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/src/main/java/EntityDirectExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/EntityDirectExample.java b/extras/indexingExample/src/main/java/EntityDirectExample.java
index 5599dcd..2dfae3f 100644
--- a/extras/indexingExample/src/main/java/EntityDirectExample.java
+++ b/extras/indexingExample/src/main/java/EntityDirectExample.java
@@ -17,8 +17,6 @@
* under the License.
*/
-
-
import java.util.List;
import org.apache.accumulo.core.client.AccumuloException;
@@ -27,25 +25,23 @@ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.commons.lang.Validate;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.QueryResultHandlerException;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResultHandler;
-import org.openrdf.query.TupleQueryResultHandlerException;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
-
-import org.apache.rya.accumulo.AccumuloRdfConfiguration;
import org.apache.rya.indexing.accumulo.AccumuloIndexingConfiguration;
import org.apache.rya.indexing.accumulo.ConfigUtils;
import org.apache.rya.sail.config.RyaSailFactory;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryResultHandlerException;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResultHandler;
+import org.eclipse.rdf4j.query.TupleQueryResultHandlerException;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.sail.Sail;
public class EntityDirectExample {
private static final Logger log = Logger.getLogger(EntityDirectExample.class);
@@ -165,6 +161,7 @@ public class EntityDirectExample {
final String sparqlInsert = "PREFIX pref: <http://www.model/pref#> \n"
+ "INSERT DATA {\n" //
+ + "GRAPH <http://updated/test> {\n"
+ "<urn:Bob> a pref:Person ;\n" //
+ " pref:hasProperty1 'property1' ;\n" // one second
+ " pref:hasProperty2 'property2' ;\n" // 2 seconds
@@ -172,7 +169,7 @@ public class EntityDirectExample {
+ "<urn:Fred> a pref:Person ; \n" //
+ " pref:hasProperty4 'property4' ; \n" //
+ " pref:hasProperty5 'property5' ; \n" //
- + "}";
+ + "}}";
final Update update = conn.prepareUpdate(QueryLanguage.SPARQL, sparqlInsert);
update.execute();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/src/main/java/InferenceExamples.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/InferenceExamples.java b/extras/indexingExample/src/main/java/InferenceExamples.java
index 83c3bc0..fa8fb21 100644
--- a/extras/indexingExample/src/main/java/InferenceExamples.java
+++ b/extras/indexingExample/src/main/java/InferenceExamples.java
@@ -35,22 +35,22 @@ import org.apache.rya.rdftriplestore.RdfCloudTripleStore;
import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
import org.apache.rya.sail.config.RyaSailFactory;
import org.apache.zookeeper.ClientCnxn;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.QueryResultHandlerException;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResultHandler;
-import org.openrdf.query.TupleQueryResultHandlerException;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryResultHandlerException;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResultHandler;
+import org.eclipse.rdf4j.query.TupleQueryResultHandlerException;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.sail.Sail;
import com.mongodb.MongoClient;
import com.mongodb.ServerAddress;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
index 1744606..cb38494 100644
--- a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
+++ b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
@@ -39,33 +39,33 @@ import org.apache.rya.rdftriplestore.RdfCloudTripleStore;
import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
import org.apache.rya.sail.config.RyaSailFactory;
import org.apache.zookeeper.ClientCnxn;
-import org.openrdf.model.Namespace;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.QueryResultHandlerException;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResultHandler;
-import org.openrdf.query.TupleQueryResultHandlerException;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.Sail;
+import org.eclipse.rdf4j.common.iteration.Iterations;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryResultHandlerException;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResultHandler;
+import org.eclipse.rdf4j.query.TupleQueryResultHandlerException;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.Sail;
import de.flapdoodle.embed.mongo.config.IMongoConfig;
import de.flapdoodle.embed.mongo.config.Net;
-import info.aduna.iteration.Iterations;
public class MongoRyaDirectExample {
@@ -225,23 +225,24 @@ public class MongoRyaDirectExample {
private static void testAddAndFreeTextSearchWithPCJ(final SailRepositoryConnection conn) throws Exception {
// add data to the repository using the SailRepository add methods
final ValueFactory f = conn.getValueFactory();
- final URI person = f.createURI("http://example.org/ontology/Person");
+ final IRI person = f.createIRI("http://example.org/ontology/Person");
String uuid;
uuid = "urn:people:alice";
- conn.add(f.createURI(uuid), RDF.TYPE, person);
- conn.add(f.createURI(uuid), RDFS.LABEL, f.createLiteral("Alice Palace Hose", f.createURI("xsd:string")));
+ conn.add(f.createIRI(uuid), RDF.TYPE, person);
+ conn.add(f.createIRI(uuid), RDFS.LABEL, f.createLiteral("Alice Palace Hose", f.createIRI("xsd:string")));
- uuid = "urn:people:bobss";
- conn.add(f.createURI(uuid), RDF.TYPE, person);
- conn.add(f.createURI(uuid), RDFS.LABEL, f.createLiteral("Bob Snob Hose", "en"));
+ uuid = "urn:people:bob";
+ conn.add(f.createIRI(uuid), RDF.TYPE, person);
+ conn.add(f.createIRI(uuid), RDFS.LABEL, f.createLiteral("Bob Snob Hose", f.createIRI("xsd:string")));
String queryString;
TupleQuery tupleQuery;
CountingResultHandler tupleHandler;
- // ///////////// search for alice
+
+ // ///////////// search for Palace
queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ "SELECT ?person ?match ?e ?c ?l ?o " //
+ "{" //
@@ -255,7 +256,35 @@ public class MongoRyaDirectExample {
Validate.isTrue(tupleHandler.getCount() == 1);
- // ///////////// search for alice and bob
+ // ///////////// search for Snob
+ queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ + "SELECT ?person ?match ?e ?c ?l ?o " //
+ + "{" //
+ + " ?person <http://www.w3.org/2000/01/rdf-schema#label> ?match . "//
+ + " FILTER(fts:text(?match, \"Snob\")) " //
+ + "}";//
+ tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+ tupleHandler = new CountingResultHandler();
+ tupleQuery.evaluate(tupleHandler);
+ log.info("Result count : " + tupleHandler.getCount());
+ Validate.isTrue(tupleHandler.getCount() == 1);
+
+
+ // ///////////// search for Hose
+ queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ + "SELECT ?person ?match ?e ?c ?l ?o " //
+ + "{" //
+ + " ?person <http://www.w3.org/2000/01/rdf-schema#label> ?match . "//
+ + " FILTER(fts:text(?match, \"Hose\")) " //
+ + "}";//
+ tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+ tupleHandler = new CountingResultHandler();
+ tupleQuery.evaluate(tupleHandler);
+ log.info("Result count : " + tupleHandler.getCount());
+ Validate.isTrue(tupleHandler.getCount() == 2);
+
+
+ // ///////////// search for alice
queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ "SELECT ?person ?match " //
+ "{" //
@@ -269,14 +298,15 @@ public class MongoRyaDirectExample {
log.info("Result count : " + tupleHandler.getCount());
Validate.isTrue(tupleHandler.getCount() == 1);
- // ///////////// search for alice and bob
+
+ // ///////////// search for alice and hose
queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ "SELECT ?person ?match " //
+ "{" //
+ " ?person a <http://example.org/ontology/Person> . "//
+ " ?person <http://www.w3.org/2000/01/rdf-schema#label> ?match . "//
+ " FILTER(fts:text(?match, \"alice\")) " //
- + " FILTER(fts:text(?match, \"palace\")) " //
+ + " FILTER(fts:text(?match, \"hose\")) " //
+ "}";//
tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
tupleHandler = new CountingResultHandler();
@@ -285,13 +315,13 @@ public class MongoRyaDirectExample {
Validate.isTrue(tupleHandler.getCount() == 1);
- // ///////////// search for bob
+ // ///////////// search for alice or hose
queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ "SELECT ?person ?match ?e ?c ?l ?o " //
+ "{" //
+ " ?person a <http://example.org/ontology/Person> . "//
+ " ?person <http://www.w3.org/2000/01/rdf-schema#label> ?match . "//
- // this is an or query in mongo, a and query in accumulo
+ // this is an or query in mongo, an and query in accumulo
+ " FILTER(fts:text(?match, \"alice hose\")) " //
+ "}";//
@@ -300,6 +330,56 @@ public class MongoRyaDirectExample {
tupleQuery.evaluate(tupleHandler);
log.info("Result count : " + tupleHandler.getCount());
Validate.isTrue(tupleHandler.getCount() == 2);
+
+
+ // ///////////// search for alice or bob
+ queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ + "SELECT ?person ?match ?e ?c ?l ?o " //
+ + "{" //
+ + " ?person a <http://example.org/ontology/Person> . "//
+ + " ?person <http://www.w3.org/2000/01/rdf-schema#label> ?match . "//
+ // this is an or query in mongo, an and query in accumulo
+ + " FILTER(fts:text(?match, \"alice bob\")) " //
+ + "}";//
+
+ tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+ tupleHandler = new CountingResultHandler();
+ tupleQuery.evaluate(tupleHandler);
+ log.info("Result count : " + tupleHandler.getCount());
+ Validate.isTrue(tupleHandler.getCount() == 2);
+
+
+ // ///////////// search for alice and bob
+ queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ + "SELECT ?person ?match ?e ?c ?l ?o " //
+ + "{" //
+ + " ?person a <http://example.org/ontology/Person> . "//
+ + " ?person <http://www.w3.org/2000/01/rdf-schema#label> ?match . "//
+ + " FILTER(fts:text(?match, \"alice\")) " //
+ + " FILTER(fts:text(?match, \"bob\")) " //
+ + "}";//
+
+ tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+ tupleHandler = new CountingResultHandler();
+ tupleQuery.evaluate(tupleHandler);
+ log.info("Result count : " + tupleHandler.getCount());
+ Validate.isTrue(tupleHandler.getCount() == 0);
+
+
+ // ///////////// search for bob
+ queryString = "PREFIX fts: <http://rdf.useekm.com/fts#> "//
+ + "SELECT ?person ?match ?e ?c ?l ?o " //
+ + "{" //
+ + " ?person a <http://example.org/ontology/Person> . "//
+ + " ?person <http://www.w3.org/2000/01/rdf-schema#label> ?match . "//
+ + " FILTER(fts:text(?match, \"bob\")) " //
+ + "}";//
+
+ tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+ tupleHandler = new CountingResultHandler();
+ tupleQuery.evaluate(tupleHandler);
+ log.info("Result count : " + tupleHandler.getCount());
+ Validate.isTrue(tupleHandler.getCount() == 1);
}
private static Configuration getConf() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/src/main/java/ProspectorExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/ProspectorExample.java b/extras/indexingExample/src/main/java/ProspectorExample.java
index 383d982..31b61b9 100644
--- a/extras/indexingExample/src/main/java/ProspectorExample.java
+++ b/extras/indexingExample/src/main/java/ProspectorExample.java
@@ -31,12 +31,12 @@ import org.apache.rya.api.persist.RdfEvalStatsDAO.CARDINALITY_OF;
import org.apache.rya.prospector.mr.Prospector;
import org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO;
import org.apache.rya.sail.config.RyaSailFactory;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
import com.google.common.collect.Lists;
@@ -47,18 +47,18 @@ import com.google.common.collect.Lists;
public class ProspectorExample {
private static final Logger log = Logger.getLogger(RyaClientExample.class);
- private static final ValueFactory VALUE_FACTORY = new ValueFactoryImpl();
+ private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance();
- private static final URI ALICE = VALUE_FACTORY.createURI("urn:alice");
- private static final URI BOB = VALUE_FACTORY.createURI("urn:bob");
- private static final URI CHARLIE = VALUE_FACTORY.createURI("urn:charlie");
+ private static final IRI ALICE = VALUE_FACTORY.createIRI("urn:alice");
+ private static final IRI BOB = VALUE_FACTORY.createIRI("urn:bob");
+ private static final IRI CHARLIE = VALUE_FACTORY.createIRI("urn:charlie");
- private static final URI WORKS_AT = VALUE_FACTORY.createURI("urn:worksAt");
- private static final URI ADMIRES = VALUE_FACTORY.createURI("urn:admires");
- private static final URI LIVES_WITH = VALUE_FACTORY.createURI("urn:livesWith");
+ private static final IRI WORKS_AT = VALUE_FACTORY.createIRI("urn:worksAt");
+ private static final IRI ADMIRES = VALUE_FACTORY.createIRI("urn:admires");
+ private static final IRI LIVES_WITH = VALUE_FACTORY.createIRI("urn:livesWith");
- private static final URI BURGER_JOINT = VALUE_FACTORY.createURI("urn:burgerJoint");
- private static final URI DONUT_SHOP= VALUE_FACTORY.createURI("urn:donutShop");
+ private static final IRI BURGER_JOINT = VALUE_FACTORY.createIRI("urn:burgerJoint");
+ private static final IRI DONUT_SHOP= VALUE_FACTORY.createIRI("urn:donutShop");
public static void main(final String[] args) throws Exception {
setupLogging();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/src/main/java/RyaClientExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/RyaClientExample.java b/extras/indexingExample/src/main/java/RyaClientExample.java
index 6b39774..1da9628 100644
--- a/extras/indexingExample/src/main/java/RyaClientExample.java
+++ b/extras/indexingExample/src/main/java/RyaClientExample.java
@@ -53,21 +53,20 @@ import org.apache.rya.indexing.pcj.fluo.app.observers.StatementPatternObserver;
import org.apache.rya.indexing.pcj.fluo.app.observers.TripleObserver;
import org.apache.rya.sail.config.RyaSailFactory;
import org.apache.zookeeper.ClientCnxn;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.parser.ParsedQuery;
-import org.openrdf.query.parser.sparql.SPARQLParser;
-import org.openrdf.queryrender.sparql.SPARQLQueryRenderer;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.parser.ParsedQuery;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser;
+import org.eclipse.rdf4j.queryrender.sparql.SPARQLQueryRenderer;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
-import info.aduna.iteration.CloseableIteration;
-
/**
* Demonstrates how a {@link RyaClient} may be used to interact with an instance
* of Accumulo to install and manage a Rya instance.
@@ -145,14 +144,14 @@ public class RyaClientExample {
final ValueFactory vf = ryaSail.getValueFactory();
final List<Statement> statements = Lists.newArrayList(
- vf.createStatement(vf.createURI("http://Eve"), vf.createURI("http://talksTo"), vf.createURI("http://Charlie")),
- vf.createStatement(vf.createURI("http://David"), vf.createURI("http://talksTo"), vf.createURI("http://Alice")),
- vf.createStatement(vf.createURI("http://Alice"), vf.createURI("http://worksAt"), vf.createURI("http://CoffeeShop")),
- vf.createStatement(vf.createURI("http://Bob"), vf.createURI("http://worksAt"), vf.createURI("http://CoffeeShop")),
- vf.createStatement(vf.createURI("http://George"), vf.createURI("http://talksTo"), vf.createURI("http://Frank")),
- vf.createStatement(vf.createURI("http://Frank"), vf.createURI("http://worksAt"), vf.createURI("http://CoffeeShop")),
- vf.createStatement(vf.createURI("http://Eve"), vf.createURI("http://talksTo"), vf.createURI("http://Bob")),
- vf.createStatement(vf.createURI("http://Charlie"), vf.createURI("http://worksAt"), vf.createURI("http://CoffeeShop")));
+ vf.createStatement(vf.createIRI("http://Eve"), vf.createIRI("http://talksTo"), vf.createIRI("http://Charlie")),
+ vf.createStatement(vf.createIRI("http://David"), vf.createIRI("http://talksTo"), vf.createIRI("http://Alice")),
+ vf.createStatement(vf.createIRI("http://Alice"), vf.createIRI("http://worksAt"), vf.createIRI("http://CoffeeShop")),
+ vf.createStatement(vf.createIRI("http://Bob"), vf.createIRI("http://worksAt"), vf.createIRI("http://CoffeeShop")),
+ vf.createStatement(vf.createIRI("http://George"), vf.createIRI("http://talksTo"), vf.createIRI("http://Frank")),
+ vf.createStatement(vf.createIRI("http://Frank"), vf.createIRI("http://worksAt"), vf.createIRI("http://CoffeeShop")),
+ vf.createStatement(vf.createIRI("http://Eve"), vf.createIRI("http://talksTo"), vf.createIRI("http://Bob")),
+ vf.createStatement(vf.createIRI("http://Charlie"), vf.createIRI("http://worksAt"), vf.createIRI("http://CoffeeShop")));
SailConnection ryaConn = ryaSail.getConnection();
log.info("");