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:37 UTC
[32/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/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementBindingSetKeyValueIterator.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementBindingSetKeyValueIterator.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementBindingSetKeyValueIterator.java
index 076ce0f..fe34e0a 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementBindingSetKeyValueIterator.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementBindingSetKeyValueIterator.java
@@ -19,30 +19,24 @@ package org.apache.rya.accumulo.query;
* under the License.
*/
-
-
-import info.aduna.iteration.CloseableIteration;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
+import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.ScannerBase;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
import org.apache.rya.api.RdfCloudTripleStoreUtils;
import org.apache.rya.api.domain.RyaStatement;
import org.apache.rya.api.persist.RyaDAOException;
-import org.apache.rya.api.resolver.RyaContext;
import org.apache.rya.api.resolver.RyaTripleContext;
import org.apache.rya.api.resolver.triple.TripleRow;
import org.apache.rya.api.resolver.triple.TripleRowResolverException;
-
-import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.ScannerBase;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Value;
-import org.openrdf.query.BindingSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.query.BindingSet;
/**
* Date: 7/17/12
@@ -60,7 +54,8 @@ public class RyaStatementBindingSetKeyValueIterator implements CloseableIteratio
private RyaTripleContext ryaContext;
public RyaStatementBindingSetKeyValueIterator(TABLE_LAYOUT tableLayout, RyaTripleContext context, ScannerBase scannerBase, RangeBindingSetEntries rangeMap) {
- this(tableLayout, ((scannerBase instanceof BatchScanner) ? ((BatchScanner) scannerBase).iterator() : ((Scanner) scannerBase).iterator()), rangeMap, context);
+ this(tableLayout, ((scannerBase instanceof BatchScanner) ? scannerBase.iterator() : scannerBase
+ .iterator()), rangeMap, context);
this.scanner = scannerBase;
isBatchScanner = scanner instanceof BatchScanner;
}
@@ -76,7 +71,7 @@ public class RyaStatementBindingSetKeyValueIterator implements CloseableIteratio
public void close() throws RyaDAOException {
dataIterator = null;
if (scanner != null && isBatchScanner) {
- ((BatchScanner) scanner).close();
+ scanner.close();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementKeyValueIterator.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementKeyValueIterator.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementKeyValueIterator.java
index fb66e70..8f6fe34 100644
--- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementKeyValueIterator.java
+++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/RyaStatementKeyValueIterator.java
@@ -19,23 +19,18 @@ package org.apache.rya.accumulo.query;
* under the License.
*/
-
-
-import info.aduna.iteration.CloseableIteration;
-
import java.util.Iterator;
import java.util.Map;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
import org.apache.rya.api.domain.RyaStatement;
import org.apache.rya.api.persist.RyaDAOException;
-import org.apache.rya.api.resolver.RyaContext;
import org.apache.rya.api.resolver.RyaTripleContext;
import org.apache.rya.api.resolver.triple.TripleRow;
import org.apache.rya.api.resolver.triple.TripleRowResolverException;
-
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Value;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
/**
* Date: 7/17/12
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java
index e22bdde..75e5861 100644
--- a/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java
+++ b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java
@@ -19,19 +19,22 @@ package org.apache.rya.accumulo;
* under the License.
*/
-
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import info.aduna.iteration.CloseableIteration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.mock.MockInstance;
+import org.apache.accumulo.core.iterators.FirstEntryInRowIterator;
import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine;
import org.apache.rya.api.domain.RyaStatement;
import org.apache.rya.api.domain.RyaType;
@@ -41,20 +44,14 @@ import org.apache.rya.api.persist.RyaDAOException;
import org.apache.rya.api.persist.query.RyaQuery;
import org.apache.rya.api.resolver.RdfToRyaConversions;
import org.apache.rya.api.resolver.RyaContext;
-
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.client.mock.MockInstance;
-import org.apache.accumulo.core.iterators.FirstEntryInRowIterator;
import org.calrissian.mango.collect.FluentCloseableIterable;
+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.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
/**
* Class AccumuloRdfDAOTest
@@ -64,7 +61,7 @@ import org.openrdf.model.vocabulary.XMLSchema;
public class AccumuloRyaDAOTest {
private AccumuloRyaDAO dao;
- private ValueFactory vf = new ValueFactoryImpl();
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
static String litdupsNS = "urn:test:litdups#";
private AccumuloRdfConfiguration conf;
private Connector connector;
@@ -87,9 +84,9 @@ public class AccumuloRyaDAOTest {
@Test
public void testAdd() throws Exception {
- RyaURI cpu = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "cpu"));
- RyaURI loadPerc = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "loadPerc"));
- RyaURI uri1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "uri1"));
+ RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu"));
+ RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc"));
+ RyaURI uri1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "uri1"));
dao.add(new RyaStatement(cpu, loadPerc, uri1));
CloseableIteration<RyaStatement, RyaDAOException> iter = dao.getQueryEngine().query(new RyaStatement(cpu, loadPerc, null), conf);
@@ -115,9 +112,9 @@ public class AccumuloRyaDAOTest {
@Test
public void testDeleteDiffVisibility() throws Exception {
- RyaURI cpu = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "cpu"));
- RyaURI loadPerc = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "loadPerc"));
- RyaURI uri1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "uri1"));
+ RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu"));
+ RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc"));
+ RyaURI uri1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "uri1"));
RyaStatement stmt1 = new RyaStatement(cpu, loadPerc, uri1, null, "1", new StatementMetadata(), "vis1".getBytes());
dao.add(stmt1);
RyaStatement stmt2 = new RyaStatement(cpu, loadPerc, uri1, null, "2", new StatementMetadata(), "vis2".getBytes());
@@ -149,9 +146,9 @@ public class AccumuloRyaDAOTest {
@Test
public void testDeleteDiffTimestamp() throws Exception {
- RyaURI cpu = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "cpu"));
- RyaURI loadPerc = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "loadPerc"));
- RyaURI uri1 = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "uri1"));
+ RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu"));
+ RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc"));
+ RyaURI uri1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "uri1"));
RyaStatement stmt1 = new RyaStatement(cpu, loadPerc, uri1, null, "1", null, null, 100l);
dao.add(stmt1);
RyaStatement stmt2 = new RyaStatement(cpu, loadPerc, uri1, null, "2", null, null, 100l);
@@ -173,14 +170,14 @@ public class AccumuloRyaDAOTest {
@Test
public void testDelete() throws Exception {
- RyaURI predicate = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "pred"));
- RyaURI subj = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "subj"));
+ RyaURI predicate = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred"));
+ RyaURI subj = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "subj"));
// create a "bulk load" of 10,000 statements
int statement_count = 10000;
for (int i = 0 ; i < statement_count ; i++){
//make the statement very large so we will get a lot of random flushes
- RyaURI obj = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, String.format("object%050d",i)));
+ RyaURI obj = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, String.format("object%050d",i)));
RyaStatement stmt = new RyaStatement(subj, predicate, obj);
dao.add(stmt);
}
@@ -211,8 +208,8 @@ public class AccumuloRyaDAOTest {
@Test
public void testAddEmptyString() throws Exception {
- RyaURI cpu = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "cpu"));
- RyaURI loadPerc = RdfToRyaConversions.convertURI(vf.createURI(litdupsNS, "loadPerc"));
+ RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu"));
+ RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc"));
RyaType empty = new RyaType("");
dao.add(new RyaStatement(cpu, loadPerc, empty));
@@ -375,7 +372,7 @@ public class AccumuloRyaDAOTest {
AccumuloRyaQueryEngine queryEngine = dao.getQueryEngine();
- Collection<RyaStatement> coll = new ArrayList();
+ Collection<RyaStatement> coll = new ArrayList<>();
coll.add(new RyaStatement(null, loadPerc, uri1));
coll.add(new RyaStatement(null, loadPerc, uri2));
CloseableIteration<RyaStatement, RyaDAOException> iter = queryEngine.batchQuery(coll, conf);
@@ -391,7 +388,7 @@ public class AccumuloRyaDAOTest {
AccumuloRdfConfiguration queryConf = new AccumuloRdfConfiguration(conf);
queryConf.setMaxRangesForScanner(2);
- coll = new ArrayList();
+ coll = new ArrayList<>();
coll.add(new RyaStatement(null, loadPerc, uri1));
coll.add(new RyaStatement(null, loadPerc, uri2));
coll.add(new RyaStatement(null, loadPerc, uri3));
@@ -438,7 +435,7 @@ public class AccumuloRyaDAOTest {
AccumuloRyaQueryEngine queryEngine = dao.getQueryEngine();
- Collection<RyaStatement> coll = new ArrayList();
+ Collection<RyaStatement> coll = new ArrayList<>();
coll.add(new RyaStatement(null, loadPerc, uri0));
coll.add(new RyaStatement(null, loadPerc, uri1));
coll.add(new RyaStatement(null, loadPerc, uri2));
@@ -455,7 +452,7 @@ public class AccumuloRyaDAOTest {
AccumuloRdfConfiguration queryConf = new AccumuloRdfConfiguration(conf);
queryConf.setMaxRangesForScanner(2);
- coll = new ArrayList();
+ coll = new ArrayList<>();
coll.add(new RyaStatement(null, loadPerc, uri0));
coll.add(new RyaStatement(null, loadPerc, uri1));
coll.add(new RyaStatement(null, loadPerc, uri2));
@@ -495,7 +492,7 @@ public class AccumuloRyaDAOTest {
AccumuloRyaQueryEngine queryEngine = dao.getQueryEngine();
- Collection<RyaStatement> coll = new ArrayList();
+ Collection<RyaStatement> coll = new ArrayList<>();
coll.add(new RyaStatement(null, loadPerc, uri1));
coll.add(new RyaStatement(null, loadPerc, uri2));
conf.setRegexPredicate(loadPerc.getData());
@@ -540,7 +537,7 @@ public class AccumuloRyaDAOTest {
AccumuloRdfConfiguration queryConf = new AccumuloRdfConfiguration(conf);
queryConf.setMaxRangesForScanner(1);
- Collection<RyaStatement> coll = new ArrayList();
+ Collection<RyaStatement> coll = new ArrayList<>();
coll.add(new RyaStatement(null, loadPerc, uri1));
coll.add(new RyaStatement(null, loadPerc, uri2));
conf.setRegexPredicate(loadPerc.getData());
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java
index 3537f74..cf2ae4f 100644
--- a/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java
+++ b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/DefineTripleQueryRangeFactoryTest.java
@@ -27,10 +27,10 @@
//import org.apache.rya.accumulo.DefineTripleQueryRangeFactory;
//import org.apache.rya.api.domain.RangeValue;
//import org.apache.accumulo.core.data.Range;
-//import org.openrdf.model.URI;
-//import org.openrdf.model.Value;
-//import org.openrdf.model.ValueFactory;
-//import org.openrdf.model.impl.ValueFactoryImpl;
+//import org.eclipse.rdf4j.model.IRI;
+//import org.eclipse.rdf4j.model.Value;
+//import org.eclipse.rdf4j.model.ValueFactory;
+//import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
//
//import java.util.Map;
//
@@ -50,9 +50,9 @@
// private AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration();
//
// public void testSPOCases() throws Exception {
-// URI cpu = vf.createURI(litdupsNS, "cpu");
-// URI loadPerc = vf.createURI(litdupsNS, "loadPerc");
-// URI obj = vf.createURI(litdupsNS, "uri1");
+// URI cpu = vf.createIRI(litdupsNS, "cpu");
+// URI loadPerc = vf.createIRI(litdupsNS, "loadPerc");
+// URI obj = vf.createIRI(litdupsNS, "uri1");
//
// //spo
// Map.Entry<TABLE_LAYOUT, Range> entry =
@@ -96,12 +96,12 @@
// }
//
// public void testSPOCasesWithRanges() throws Exception {
-// URI subj_start = vf.createURI(litdupsNS, "subj_start");
-// URI subj_end = vf.createURI(litdupsNS, "subj_stop");
-// URI pred_start = vf.createURI(litdupsNS, "pred_start");
-// URI pred_end = vf.createURI(litdupsNS, "pred_stop");
-// URI obj_start = vf.createURI(litdupsNS, "obj_start");
-// URI obj_end = vf.createURI(litdupsNS, "obj_stop");
+// URI subj_start = vf.createIRI(litdupsNS, "subj_start");
+// URI subj_end = vf.createIRI(litdupsNS, "subj_stop");
+// URI pred_start = vf.createIRI(litdupsNS, "pred_start");
+// URI pred_end = vf.createIRI(litdupsNS, "pred_stop");
+// URI obj_start = vf.createIRI(litdupsNS, "obj_start");
+// URI obj_end = vf.createIRI(litdupsNS, "obj_stop");
//
// Value subj = new RangeValue(subj_start, subj_end);
// Value pred = new RangeValue(pred_start, pred_end);
@@ -146,8 +146,8 @@
// }
//
// public void testPOCases() throws Exception {
-// URI loadPerc = vf.createURI(litdupsNS, "loadPerc");
-// URI obj = vf.createURI(litdupsNS, "uri1");
+// URI loadPerc = vf.createIRI(litdupsNS, "loadPerc");
+// URI obj = vf.createIRI(litdupsNS, "uri1");
//
// //po
// Map.Entry<TABLE_LAYOUT, Range> entry =
@@ -171,10 +171,10 @@
// }
//
// public void testPOCasesWithRanges() throws Exception {
-// URI pred_start = vf.createURI(litdupsNS, "pred_start");
-// URI pred_end = vf.createURI(litdupsNS, "pred_stop");
-// URI obj_start = vf.createURI(litdupsNS, "obj_start");
-// URI obj_end = vf.createURI(litdupsNS, "obj_stop");
+// URI pred_start = vf.createIRI(litdupsNS, "pred_start");
+// URI pred_end = vf.createIRI(litdupsNS, "pred_stop");
+// URI obj_start = vf.createIRI(litdupsNS, "obj_start");
+// URI obj_end = vf.createIRI(litdupsNS, "obj_stop");
//
// Value pred = new RangeValue(pred_start, pred_end);
// Value obj = new RangeValue(obj_start, obj_end);
@@ -204,8 +204,8 @@
// }
//
// public void testOSPCases() throws Exception {
-// URI cpu = vf.createURI(litdupsNS, "cpu");
-// URI obj = vf.createURI(litdupsNS, "uri1");
+// URI cpu = vf.createIRI(litdupsNS, "cpu");
+// URI obj = vf.createIRI(litdupsNS, "uri1");
//
// //so
// Map.Entry<TABLE_LAYOUT, Range> entry =
@@ -230,10 +230,10 @@
//
//
// public void testOSPCasesWithRanges() throws Exception {
-// URI subj_start = vf.createURI(litdupsNS, "subj_start");
-// URI subj_end = vf.createURI(litdupsNS, "subj_stop");
-// URI obj_start = vf.createURI(litdupsNS, "obj_start");
-// URI obj_end = vf.createURI(litdupsNS, "obj_stop");
+// URI subj_start = vf.createIRI(litdupsNS, "subj_start");
+// URI subj_end = vf.createIRI(litdupsNS, "subj_stop");
+// URI obj_start = vf.createIRI(litdupsNS, "obj_start");
+// URI obj_end = vf.createIRI(litdupsNS, "obj_stop");
//
// Value subj = new RangeValue(subj_start, subj_end);
// Value obj = new RangeValue(obj_start, obj_end);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java
index 9ddb15a..d95f7d8 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java
@@ -41,8 +41,9 @@ import org.apache.rya.mongodb.iter.RyaStatementCursorIterator;
import org.bson.Document;
import org.calrissian.mango.collect.CloseableIterable;
import org.calrissian.mango.collect.CloseableIterables;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
import com.google.common.base.Preconditions;
import com.google.common.collect.HashMultimap;
@@ -50,8 +51,6 @@ import com.google.common.collect.Multimap;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
-import info.aduna.iteration.CloseableIteration;
-
/**
* Date: 7/17/12
* Time: 9:28 AM
@@ -144,7 +143,7 @@ public class MongoDBQueryEngine implements RyaQueryEngine<StatefulMongoDBRdfConf
}
Iterator<RyaStatement> iterator = new RyaStatementCursorIterator(queryWithBindingSet(queries.entrySet(), getConf()));
- return CloseableIterables.wrap((Iterable<RyaStatement>) () -> iterator);
+ return CloseableIterables.wrap(() -> iterator);
}
private MongoCollection<Document> getCollection(final StatefulMongoDBRdfConfiguration conf) {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java
index 44dc851..d49f2ee 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.hadoop.conf.Configuration;
import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
import org.apache.rya.mongodb.aggregation.AggregationPipelineQueryOptimizer;
-import org.openrdf.query.algebra.evaluation.QueryOptimizer;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer;
import edu.umd.cs.findbugs.annotations.Nullable;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java
index 45092e4..769d2de 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java
@@ -54,22 +54,23 @@ import org.apache.rya.mongodb.document.operators.query.ConditionalOperators;
import org.apache.rya.mongodb.document.visibility.DocumentVisibilityAdapter;
import org.bson.Document;
import org.bson.conversions.Bson;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.Compare;
-import org.openrdf.query.algebra.ExtensionElem;
-import org.openrdf.query.algebra.ProjectionElem;
-import org.openrdf.query.algebra.ProjectionElemList;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.ValueConstant;
-import org.openrdf.query.algebra.ValueExpr;
-import org.openrdf.query.algebra.Var;
-import org.openrdf.query.algebra.evaluation.impl.ExternalSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Value;
+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.Compare;
+import org.eclipse.rdf4j.query.algebra.ExtensionElem;
+import org.eclipse.rdf4j.query.algebra.ProjectionElem;
+import org.eclipse.rdf4j.query.algebra.ProjectionElemList;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.ValueConstant;
+import org.eclipse.rdf4j.query.algebra.ValueExpr;
+import org.eclipse.rdf4j.query.algebra.Var;
+import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -83,8 +84,6 @@ import com.mongodb.client.model.BsonField;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.Projections;
-import info.aduna.iteration.CloseableIteration;
-
/**
* Represents a portion of a query tree as MongoDB aggregation pipeline. Should
* be built bottom-up: start with a statement pattern implemented as a $match
@@ -264,14 +263,14 @@ public class AggregationPipelineQueryNode extends ExternalSet {
if (subjVar != null && subjVar.getValue() instanceof Resource) {
s = RdfToRyaConversions.convertResource((Resource) subjVar.getValue());
}
- if (predVar != null && predVar.getValue() instanceof URI) {
- p = RdfToRyaConversions.convertURI((URI) predVar.getValue());
+ if (predVar != null && predVar.getValue() instanceof IRI) {
+ p = RdfToRyaConversions.convertURI((IRI) predVar.getValue());
}
if (objVar != null && objVar.getValue() != null) {
o = RdfToRyaConversions.convertValue(objVar.getValue());
}
- if (contextVar != null && contextVar.getValue() instanceof URI) {
- c = RdfToRyaConversions.convertURI((URI) contextVar.getValue());
+ if (contextVar != null && contextVar.getValue() instanceof IRI) {
+ c = RdfToRyaConversions.convertURI((IRI) contextVar.getValue());
}
RyaStatement rs = new RyaStatement(s, p, o, c);
DBObject obj = strategy.getQuery(rs);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryOptimizer.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryOptimizer.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryOptimizer.java
index fb1f558..afef7e0 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryOptimizer.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryOptimizer.java
@@ -21,10 +21,10 @@ package org.apache.rya.mongodb.aggregation;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.Dataset;
-import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.query.algebra.evaluation.QueryOptimizer;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.algebra.TupleExpr;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/PipelineResultIteration.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/PipelineResultIteration.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/PipelineResultIteration.java
index c533efc..fbbe6f0 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/PipelineResultIteration.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/PipelineResultIteration.java
@@ -21,28 +21,27 @@ package org.apache.rya.mongodb.aggregation;
import java.util.Map;
import org.bson.Document;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.Value;
+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.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
import com.google.common.base.Preconditions;
import com.mongodb.client.AggregateIterable;
import com.mongodb.client.MongoCursor;
-import info.aduna.iteration.CloseableIteration;
-
/**
* An iterator that converts the documents resulting from an
* {@link AggregationPipelineQueryNode} into {@link BindingSet}s.
*/
public class PipelineResultIteration implements CloseableIteration<BindingSet, QueryEvaluationException> {
private static final int BATCH_SIZE = 1000;
- private static final ValueFactory VF = ValueFactoryImpl.getInstance();
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
private final MongoCursor<Document> cursor;
private final Map<String, String> varToOriginalName;
@@ -114,10 +113,10 @@ public class PipelineResultIteration implements CloseableIteration<BindingSet, Q
String varName = varToOriginalName.getOrDefault(fieldName, fieldName);
Value varValue;
if (typeString == null || typeString.equals(XMLSchema.ANYURI.stringValue())) {
- varValue = VF.createURI(valueString);
+ varValue = VF.createIRI(valueString);
}
else {
- varValue = VF.createLiteral(valueString, VF.createURI(typeString));
+ varValue = VF.createLiteral(valueString, VF.createIRI(typeString));
}
Binding existingBinding = bindingSet.getBinding(varName);
// If this variable is not already bound, add it.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java
index b7f5a67..23797a8 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java
@@ -20,17 +20,20 @@ package org.apache.rya.mongodb.aggregation;
import java.util.Arrays;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration;
import org.bson.Document;
-import org.openrdf.query.algebra.Distinct;
-import org.openrdf.query.algebra.Extension;
-import org.openrdf.query.algebra.Filter;
-import org.openrdf.query.algebra.Join;
-import org.openrdf.query.algebra.MultiProjection;
-import org.openrdf.query.algebra.Projection;
-import org.openrdf.query.algebra.Reduced;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
+import org.eclipse.rdf4j.query.algebra.Distinct;
+import org.eclipse.rdf4j.query.algebra.Extension;
+import org.eclipse.rdf4j.query.algebra.Filter;
+import org.eclipse.rdf4j.query.algebra.Join;
+import org.eclipse.rdf4j.query.algebra.MultiProjection;
+import org.eclipse.rdf4j.query.algebra.Projection;
+import org.eclipse.rdf4j.query.algebra.Reduced;
+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.AbstractQueryModelVisitor;
import com.google.common.base.Preconditions;
import com.mongodb.MongoClient;
@@ -73,7 +76,7 @@ import com.mongodb.client.MongoDatabase;
* {@code AggregationPipelineQueryNode}.
* </ul>
*/
-public class SparqlToPipelineTransformVisitor extends QueryModelVisitorBase<Exception> {
+public class SparqlToPipelineTransformVisitor extends AbstractQueryModelVisitor<Exception> {
private final MongoCollection<Document> inputCollection;
/**
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBNamespaceManager.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBNamespaceManager.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBNamespaceManager.java
index 2be0785..758f334 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBNamespaceManager.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBNamespaceManager.java
@@ -26,15 +26,14 @@ import java.util.Map;
import org.apache.commons.codec.binary.Hex;
import org.apache.rya.api.persist.RyaDAOException;
import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration;
-import org.openrdf.model.Namespace;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.Namespace;
import com.mongodb.BasicDBObject;
import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.DBObject;
-import info.aduna.iteration.CloseableIteration;
-
public class SimpleMongoDBNamespaceManager implements MongoDBNamespaceManager {
public class NamespaceImplementation implements Namespace {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
index ecad9c6..a868e3d 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java
@@ -18,7 +18,7 @@
*/
package org.apache.rya.mongodb.dao;
-import static org.openrdf.model.vocabulary.XMLSchema.ANYURI;
+import static org.eclipse.rdf4j.model.vocabulary.XMLSchema.ANYURI;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
@@ -36,8 +36,8 @@ import org.apache.rya.api.persist.query.RyaQuery;
import org.apache.rya.mongodb.document.visibility.DocumentVisibility;
import org.apache.rya.mongodb.document.visibility.DocumentVisibilityAdapter;
import org.apache.rya.mongodb.document.visibility.DocumentVisibilityAdapter.MalformedDocumentVisibilityException;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
import com.mongodb.BasicDBObject;
import com.mongodb.DBCollection;
@@ -72,7 +72,7 @@ public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy<RyaS
return DigestUtils.sha256Hex(value);
}
- protected ValueFactoryImpl factory = new ValueFactoryImpl();
+ protected SimpleValueFactory factory = SimpleValueFactory.getInstance();
@Override
public void createIndices(final DBCollection coll){
@@ -136,7 +136,7 @@ public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy<RyaS
objectRya = new RyaURI(object);
}
else {
- objectRya = new RyaType(factory.createURI(objectType), object);
+ objectRya = new RyaType(factory.createIRI(objectType), object);
}
final RyaStatement statement;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java
index 727538b..462da1c 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java
@@ -34,7 +34,8 @@ import org.apache.rya.api.persist.RyaDAOException;
import org.apache.rya.mongodb.dao.MongoDBStorageStrategy;
import org.apache.rya.mongodb.document.operators.aggregation.AggregationUtil;
import org.bson.Document;
-import org.openrdf.query.BindingSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.query.BindingSet;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Iterators;
@@ -44,8 +45,6 @@ import com.mongodb.client.AggregateIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.util.JSON;
-import info.aduna.iteration.CloseableIteration;
-
public class RyaStatementBindingSetCursorIterator implements CloseableIteration<Entry<RyaStatement, BindingSet>, RyaDAOException> {
private static final Logger log = Logger.getLogger(RyaStatementBindingSetCursorIterator.class);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java
index 82eed6f..97bbc8b 100644
--- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java
+++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementCursorIterator.java
@@ -21,13 +21,11 @@ package org.apache.rya.mongodb.iter;
import java.util.Iterator;
import java.util.Map.Entry;
+import com.google.common.base.Throwables;
import org.apache.rya.api.domain.RyaStatement;
import org.apache.rya.api.persist.RyaDAOException;
-import org.openrdf.query.BindingSet;
-
-import com.google.common.base.Throwables;
-
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.query.BindingSet;
public class RyaStatementCursorIterator implements Iterator<RyaStatement>, CloseableIteration<RyaStatement, RyaDAOException> {
private final CloseableIteration<? extends Entry<RyaStatement, BindingSet>, RyaDAOException> iterator;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java
index 3a216ec..4aef8cd 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java
@@ -1,5 +1,5 @@
/*
-* * Licensed to the Apache Software Foundation (ASF) under one
+ * 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
@@ -20,25 +20,6 @@ package org.apache.rya.mongodb;
import static org.junit.Assert.assertEquals;
-/*
- * 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.
- */
-
import java.util.Collection;
import java.util.Map;
import java.util.Map.Entry;
@@ -47,18 +28,20 @@ import org.apache.rya.api.RdfCloudTripleStoreUtils;
import org.apache.rya.api.domain.RyaStatement;
import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder;
import org.apache.rya.api.domain.RyaURI;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
import org.junit.Test;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.impl.MapBindingSet;
import com.google.common.collect.Lists;
-import info.aduna.iteration.CloseableIteration;
/**
* Integration tests the methods of {@link MongoDBQueryEngine}.
*/
public class MongoDBQueryEngineIT extends MongoITBase {
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
private RyaStatement getStatement(final String s, final String p, final String o) {
final RyaStatementBuilder builder = new RyaStatementBuilder();
@@ -119,7 +102,7 @@ public class MongoDBQueryEngineIT extends MongoITBase {
final RyaStatement s1 = getStatement(null, null, "u:b");
final MapBindingSet bs1 = new MapBindingSet();
- bs1.addBinding("foo", new URIImpl("u:x"));
+ bs1.addBinding("foo", VF.createIRI("u:x"));
final Map.Entry<RyaStatement, BindingSet> e1 = new RdfCloudTripleStoreUtils.CustomEntry<>(s1, bs1);
final Collection<Entry<RyaStatement, BindingSet>> stmts1 = Lists.newArrayList(e1);
@@ -127,7 +110,7 @@ public class MongoDBQueryEngineIT extends MongoITBase {
final MapBindingSet bs2 = new MapBindingSet();
- bs2.addBinding("foo", new URIImpl("u:y"));
+ bs2.addBinding("foo", VF.createIRI("u:y"));
final RyaStatement s2 = getStatement(null, null, "u:c");
@@ -164,7 +147,7 @@ public class MongoDBQueryEngineIT extends MongoITBase {
final RyaStatement s = getStatement("u:a", null, null);
final MapBindingSet bs1 = new MapBindingSet();
- bs1.addBinding("foo", new URIImpl("u:x"));
+ bs1.addBinding("foo", VF.createIRI("u:x"));
final Map.Entry<RyaStatement, BindingSet> e1 = new RdfCloudTripleStoreUtils.CustomEntry<>(s, bs1);
final Collection<Entry<RyaStatement, BindingSet>> stmts1 = Lists.newArrayList(e1);
@@ -172,7 +155,7 @@ public class MongoDBQueryEngineIT extends MongoITBase {
final MapBindingSet bs2 = new MapBindingSet();
- bs2.addBinding("foo", new URIImpl("u:y"));
+ bs2.addBinding("foo", VF.createIRI("u:y"));
final Map.Entry<RyaStatement, BindingSet> e2 = new RdfCloudTripleStoreUtils.CustomEntry<>(s, bs2);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java
index 15bd636..9f61dfd 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java
@@ -18,8 +18,8 @@ package org.apache.rya.mongodb;
* under the License.
*/
+import static org.eclipse.rdf4j.model.vocabulary.XMLSchema.ANYURI;
import static org.junit.Assert.assertEquals;
-import static org.openrdf.model.vocabulary.XMLSchema.ANYURI;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNodeTest.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNodeTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNodeTest.java
index 1e056c4..f33ca96 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNodeTest.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNodeTest.java
@@ -23,23 +23,23 @@ import java.util.LinkedList;
import java.util.List;
import org.bson.Document;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.algebra.Compare;
+import org.eclipse.rdf4j.query.algebra.ExtensionElem;
+import org.eclipse.rdf4j.query.algebra.IsLiteral;
+import org.eclipse.rdf4j.query.algebra.Not;
+import org.eclipse.rdf4j.query.algebra.ProjectionElem;
+import org.eclipse.rdf4j.query.algebra.ProjectionElemList;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.ValueConstant;
+import org.eclipse.rdf4j.query.algebra.Var;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.algebra.Compare;
-import org.openrdf.query.algebra.ExtensionElem;
-import org.openrdf.query.algebra.IsLiteral;
-import org.openrdf.query.algebra.Not;
-import org.openrdf.query.algebra.ProjectionElem;
-import org.openrdf.query.algebra.ProjectionElemList;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.ValueConstant;
-import org.openrdf.query.algebra.Var;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Sets;
@@ -47,13 +47,13 @@ import com.mongodb.MongoNamespace;
import com.mongodb.client.MongoCollection;
public class AggregationPipelineQueryNodeTest {
- private static final ValueFactory VF = ValueFactoryImpl.getInstance();
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
private static final String LUBM = "urn:lubm";
- private static final URI UNDERGRAD = VF.createURI(LUBM, "UndergraduateStudent");
- private static final URI TAKES = VF.createURI(LUBM, "takesCourse");
+ private static final IRI UNDERGRAD = VF.createIRI(LUBM, "UndergraduateStudent");
+ private static final IRI TAKES = VF.createIRI(LUBM, "takesCourse");
- private static Var constant(URI value) {
+ private static Var constant(IRI value) {
return new Var(value.stringValue(), value);
}
@@ -137,7 +137,7 @@ public class AggregationPipelineQueryNodeTest {
Assert.assertEquals(Sets.newHashSet("s", "p", "o"), node.getAssuredBindingNames());
Assert.assertEquals(2, node.getPipeline().size());
// All constants
- sp = new StatementPattern(constant(VF.createURI("urn:Alice")), constant(RDF.TYPE), constant(UNDERGRAD));
+ sp = new StatementPattern(constant(VF.createIRI("urn:Alice")), constant(RDF.TYPE), constant(UNDERGRAD));
node = new AggregationPipelineQueryNode(collection, sp);
Assert.assertEquals(Sets.newHashSet(), node.getBindingNames());
Assert.assertEquals(Sets.newHashSet(), node.getAssuredBindingNames());
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java
index 0552ac0..8dbf4b5 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java
@@ -32,41 +32,40 @@ import org.apache.rya.mongodb.MongoITBase;
import org.apache.rya.mongodb.dao.SimpleMongoDBStorageStrategy;
import org.bson.Document;
import org.bson.conversions.Bson;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+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.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.Projection;
+import org.eclipse.rdf4j.query.algebra.QueryRoot;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.impl.EmptyBindingSet;
+import org.eclipse.rdf4j.query.impl.ListBindingSet;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.Projection;
-import org.openrdf.query.algebra.QueryRoot;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.impl.EmptyBindingSet;
-import org.openrdf.query.impl.ListBindingSet;
-import org.openrdf.query.parser.sparql.SPARQLParser;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import com.mongodb.DBObject;
import com.mongodb.util.JSON;
-import info.aduna.iteration.CloseableIteration;
-
public class PipelineQueryIT extends MongoITBase {
- private static ValueFactory VF = ValueFactoryImpl.getInstance();
- private static SPARQLParser PARSER = new SPARQLParser();
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
+ private static final SPARQLParser PARSER = new SPARQLParser();
private MongoDBRyaDAO dao;
@@ -79,11 +78,11 @@ public class PipelineQueryIT extends MongoITBase {
dao.init();
}
- private void insert(Resource subject, URI predicate, Value object) throws RyaDAOException {
+ private void insert(Resource subject, IRI predicate, Value object) throws RyaDAOException {
insert(subject, predicate, object, 0);
}
- private void insert(Resource subject, URI predicate, Value object, int derivationLevel) throws RyaDAOException {
+ private void insert(Resource subject, IRI predicate, Value object, int derivationLevel) throws RyaDAOException {
final RyaStatementBuilder builder = new RyaStatementBuilder();
builder.setSubject(RdfToRyaConversions.convertResource(subject));
builder.setPredicate(RdfToRyaConversions.convertURI(predicate));
@@ -121,7 +120,7 @@ public class PipelineQueryIT extends MongoITBase {
insert(OWL.THING, RDF.TYPE, OWL.CLASS);
insert(FOAF.PERSON, RDF.TYPE, OWL.CLASS, 1);
insert(FOAF.PERSON, RDFS.SUBCLASSOF, OWL.THING);
- insert(VF.createURI("urn:Alice"), RDF.TYPE, FOAF.PERSON);
+ insert(VF.createIRI("urn:Alice"), RDF.TYPE, FOAF.PERSON);
dao.flush();
// Define query and expected results
final String query = "SELECT * WHERE {\n"
@@ -131,7 +130,7 @@ public class PipelineQueryIT extends MongoITBase {
Multiset<BindingSet> expectedSolutions = HashMultiset.create();
expectedSolutions.add(new ListBindingSet(varNames, OWL.THING, OWL.CLASS));
expectedSolutions.add(new ListBindingSet(varNames, FOAF.PERSON, OWL.CLASS));
- expectedSolutions.add(new ListBindingSet(varNames, VF.createURI("urn:Alice"), FOAF.PERSON));
+ expectedSolutions.add(new ListBindingSet(varNames, VF.createIRI("urn:Alice"), FOAF.PERSON));
// Execute pipeline and verify results
testPipelineQuery(query, expectedSolutions);
}
@@ -142,7 +141,7 @@ public class PipelineQueryIT extends MongoITBase {
insert(OWL.THING, RDF.TYPE, OWL.CLASS);
insert(FOAF.PERSON, RDF.TYPE, OWL.CLASS, 1);
insert(FOAF.PERSON, RDFS.SUBCLASSOF, OWL.THING);
- insert(VF.createURI("urn:Alice"), RDF.TYPE, FOAF.PERSON);
+ insert(VF.createIRI("urn:Alice"), RDF.TYPE, FOAF.PERSON);
dao.flush();
// Define query and expected results
final String query = "SELECT * WHERE {\n"
@@ -169,11 +168,11 @@ public class PipelineQueryIT extends MongoITBase {
@Test
public void testJoinTwoSharedVariables() throws Exception {
// Insert data
- URI person = VF.createURI("urn:Person");
- URI livingThing = VF.createURI("urn:LivingThing");
- URI human = VF.createURI("urn:Human");
- URI programmer = VF.createURI("urn:Programmer");
- URI thing = VF.createURI("urn:Thing");
+ IRI person = VF.createIRI("urn:Person");
+ IRI livingThing = VF.createIRI("urn:LivingThing");
+ IRI human = VF.createIRI("urn:Human");
+ IRI programmer = VF.createIRI("urn:Programmer");
+ IRI thing = VF.createIRI("urn:Thing");
insert(programmer, RDFS.SUBCLASSOF, person);
insert(person, RDFS.SUBCLASSOF, FOAF.PERSON);
insert(FOAF.PERSON, RDFS.SUBCLASSOF, person);
@@ -201,12 +200,12 @@ public class PipelineQueryIT extends MongoITBase {
@Test
public void testVariableRename() throws Exception {
// Insert data
- URI alice = VF.createURI("urn:Alice");
- URI bob = VF.createURI("urn:Bob");
- URI carol = VF.createURI("urn:Carol");
- URI dan = VF.createURI("urn:Dan");
- URI eve = VF.createURI("urn:Eve");
- URI friend = VF.createURI("urn:friend");
+ IRI alice = VF.createIRI("urn:Alice");
+ IRI bob = VF.createIRI("urn:Bob");
+ IRI carol = VF.createIRI("urn:Carol");
+ IRI dan = VF.createIRI("urn:Dan");
+ IRI eve = VF.createIRI("urn:Eve");
+ IRI friend = VF.createIRI("urn:friend");
insert(alice, friend, bob);
insert(alice, friend, carol);
insert(bob, friend, eve);
@@ -247,10 +246,10 @@ public class PipelineQueryIT extends MongoITBase {
@Test
public void testFilterQuery() throws Exception {
// Insert data
- URI alice = VF.createURI("urn:Alice");
- URI bob = VF.createURI("urn:Bob");
- URI eve = VF.createURI("urn:Eve");
- URI relatedTo = VF.createURI("urn:relatedTo");
+ IRI alice = VF.createIRI("urn:Alice");
+ IRI bob = VF.createIRI("urn:Bob");
+ IRI eve = VF.createIRI("urn:Eve");
+ IRI relatedTo = VF.createIRI("urn:relatedTo");
insert(alice, FOAF.KNOWS, bob);
insert(alice, FOAF.KNOWS, alice);
insert(alice, FOAF.KNOWS, eve);
@@ -285,12 +284,12 @@ public class PipelineQueryIT extends MongoITBase {
@Test
public void testMultiConstruct() throws Exception {
// Insert data
- URI alice = VF.createURI("urn:Alice");
- URI bob = VF.createURI("urn:Bob");
- URI eve = VF.createURI("urn:Eve");
- URI friend = VF.createURI("urn:friend");
- URI knows = VF.createURI("urn:knows");
- URI person = VF.createURI("urn:Person");
+ IRI alice = VF.createIRI("urn:Alice");
+ IRI bob = VF.createIRI("urn:Bob");
+ IRI eve = VF.createIRI("urn:Eve");
+ IRI friend = VF.createIRI("urn:friend");
+ IRI knows = VF.createIRI("urn:knows");
+ IRI person = VF.createIRI("urn:Person");
insert(alice, friend, bob);
insert(bob, knows, eve);
insert(eve, knows, alice);
@@ -311,12 +310,12 @@ public class PipelineQueryIT extends MongoITBase {
@Test
public void testTriplePipeline() throws Exception {
- URI alice = VF.createURI("urn:Alice");
- URI bob = VF.createURI("urn:Bob");
- URI eve = VF.createURI("urn:Eve");
- URI friend = VF.createURI("urn:friend");
- URI knows = VF.createURI("urn:knows");
- URI year = VF.createURI("urn:year");
+ IRI alice = VF.createIRI("urn:Alice");
+ IRI bob = VF.createIRI("urn:Bob");
+ IRI eve = VF.createIRI("urn:Eve");
+ IRI friend = VF.createIRI("urn:friend");
+ IRI knows = VF.createIRI("urn:knows");
+ IRI year = VF.createIRI("urn:year");
Literal yearLiteral = VF.createLiteral("2017", XMLSchema.GYEAR);
final String query = "CONSTRUCT {\n"
+ " ?x <urn:knows> ?y .\n"
@@ -350,11 +349,11 @@ public class PipelineQueryIT extends MongoITBase {
@Test
public void testRequiredDerivationLevel() throws Exception {
// Insert data
- URI person = VF.createURI("urn:Person");
- URI livingThing = VF.createURI("urn:LivingThing");
- URI human = VF.createURI("urn:Human");
- URI programmer = VF.createURI("urn:Programmer");
- URI thing = VF.createURI("urn:Thing");
+ IRI person = VF.createIRI("urn:Person");
+ IRI livingThing = VF.createIRI("urn:LivingThing");
+ IRI human = VF.createIRI("urn:Human");
+ IRI programmer = VF.createIRI("urn:Programmer");
+ IRI thing = VF.createIRI("urn:Thing");
insert(programmer, RDFS.SUBCLASSOF, person);
insert(person, RDFS.SUBCLASSOF, FOAF.PERSON);
insert(FOAF.PERSON, RDFS.SUBCLASSOF, person);
@@ -405,11 +404,11 @@ public class PipelineQueryIT extends MongoITBase {
@Test
public void testRequiredTimestamp() throws Exception {
// Insert data
- URI person = VF.createURI("urn:Person");
- URI livingThing = VF.createURI("urn:LivingThing");
- URI human = VF.createURI("urn:Human");
- URI programmer = VF.createURI("urn:Programmer");
- URI thing = VF.createURI("urn:Thing");
+ IRI person = VF.createIRI("urn:Person");
+ IRI livingThing = VF.createIRI("urn:LivingThing");
+ IRI human = VF.createIRI("urn:Human");
+ IRI programmer = VF.createIRI("urn:Programmer");
+ IRI thing = VF.createIRI("urn:Thing");
insert(programmer, RDFS.SUBCLASSOF, person);
insert(person, RDFS.SUBCLASSOF, FOAF.PERSON, 2);
insert(FOAF.PERSON, RDFS.SUBCLASSOF, person);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineResultIterationTest.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineResultIterationTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineResultIterationTest.java
index 6775235..c71a183 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineResultIterationTest.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineResultIterationTest.java
@@ -23,24 +23,24 @@ import java.util.HashMap;
import java.util.Iterator;
import org.bson.Document;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.impl.ListBindingSet;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.impl.ListBindingSet;
import com.google.common.collect.Sets;
import com.mongodb.client.AggregateIterable;
import com.mongodb.client.MongoCursor;
public class PipelineResultIterationTest {
- ValueFactory VF = ValueFactoryImpl.getInstance();
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
@SuppressWarnings("unchecked")
private AggregateIterable<Document> documentIterator(Document ... documents) {
@@ -107,7 +107,7 @@ public class PipelineResultIterationTest {
@Test
public void testIterationGivenBindingSet() throws QueryEvaluationException {
BindingSet solution = new ListBindingSet(Arrays.asList("b", "c"),
- VF.createURI("urn:Bob"), VF.createURI("urn:Charlie"));
+ VF.createIRI("urn:Bob"), VF.createIRI("urn:Charlie"));
HashMap<String, String> nameMap = new HashMap<>();
nameMap.put("bName", "b");
nameMap.put("cName", "c");
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitorTest.java
----------------------------------------------------------------------
diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitorTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitorTest.java
index 506b8af..715e6bd 100644
--- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitorTest.java
+++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitorTest.java
@@ -22,28 +22,28 @@ import java.util.Arrays;
import java.util.List;
import org.bson.Document;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.algebra.Extension;
+import org.eclipse.rdf4j.query.algebra.ExtensionElem;
+import org.eclipse.rdf4j.query.algebra.Join;
+import org.eclipse.rdf4j.query.algebra.MultiProjection;
+import org.eclipse.rdf4j.query.algebra.Not;
+import org.eclipse.rdf4j.query.algebra.Projection;
+import org.eclipse.rdf4j.query.algebra.ProjectionElem;
+import org.eclipse.rdf4j.query.algebra.ProjectionElemList;
+import org.eclipse.rdf4j.query.algebra.QueryRoot;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.TupleExpr;
+import org.eclipse.rdf4j.query.algebra.ValueConstant;
+import org.eclipse.rdf4j.query.algebra.Var;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.algebra.Extension;
-import org.openrdf.query.algebra.ExtensionElem;
-import org.openrdf.query.algebra.Join;
-import org.openrdf.query.algebra.MultiProjection;
-import org.openrdf.query.algebra.Not;
-import org.openrdf.query.algebra.Projection;
-import org.openrdf.query.algebra.ProjectionElem;
-import org.openrdf.query.algebra.ProjectionElemList;
-import org.openrdf.query.algebra.QueryRoot;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.query.algebra.ValueConstant;
-import org.openrdf.query.algebra.Var;
import com.google.common.collect.Sets;
import com.mongodb.MongoNamespace;
@@ -51,16 +51,16 @@ import com.mongodb.client.MongoCollection;
public class SparqlToPipelineTransformVisitorTest {
- private static final ValueFactory VF = ValueFactoryImpl.getInstance();
+ private static final ValueFactory VF = SimpleValueFactory.getInstance();
private static final String LUBM = "urn:lubm";
- private static final URI UNDERGRAD = VF.createURI(LUBM, "UndergraduateStudent");
- private static final URI PROFESSOR = VF.createURI(LUBM, "Professor");
- private static final URI COURSE = VF.createURI(LUBM, "Course");
- private static final URI TAKES = VF.createURI(LUBM, "takesCourse");
- private static final URI TEACHES = VF.createURI(LUBM, "teachesCourse");
+ private static final IRI UNDERGRAD = VF.createIRI(LUBM, "UndergraduateStudent");
+ private static final IRI PROFESSOR = VF.createIRI(LUBM, "Professor");
+ private static final IRI COURSE = VF.createIRI(LUBM, "Course");
+ private static final IRI TAKES = VF.createIRI(LUBM, "takesCourse");
+ private static final IRI TEACHES = VF.createIRI(LUBM, "teachesCourse");
- private static Var constant(URI value) {
+ private static Var constant(IRI value) {
return new Var(value.stringValue(), value);
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexing/pom.xml b/extras/indexing/pom.xml
index 7abc83c..357c552 100644
--- a/extras/indexing/pom.xml
+++ b/extras/indexing/pom.xml
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
</dependency>
<dependency>
@@ -84,10 +84,10 @@
<groupId>org.apache.rya</groupId>
<artifactId>rya.periodic.notification.api</artifactId>
</dependency>
- <!-- OpenRDF -->
+ <!-- RDF4J -->
<dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-queryresultio-text</artifactId>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-queryresultio-text</artifactId>
</dependency>
<!-- testing dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/BindingSetHashJoinIterator.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/BindingSetHashJoinIterator.java b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/BindingSetHashJoinIterator.java
index 79036ff..200f845 100644
--- a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/BindingSetHashJoinIterator.java
+++ b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/BindingSetHashJoinIterator.java
@@ -19,8 +19,6 @@ package org.apache.rya.accumulo.pcj.iterators;
* under the License.
*/
-import info.aduna.iteration.CloseableIteration;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -31,11 +29,12 @@ import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Set;
+import org.apache.rya.api.domain.VarNameUtils;
import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
-
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
@@ -74,9 +73,9 @@ public class BindingSetHashJoinIterator implements
*/
public enum HashJoinType {
CONSTANT_JOIN_VAR, VARIABLE_JOIN_VAR
- };
+ }
- public BindingSetHashJoinIterator(
+ public BindingSetHashJoinIterator(
Multimap<String, BindingSet> bindingJoinVarHash,
CloseableIteration<Map.Entry<String, BindingSet>, QueryEvaluationException> joinIter,
Set<String> unAssuredVariables, HashJoinType type) {
@@ -104,10 +103,8 @@ public class BindingSetHashJoinIterator implements
isEmpty = true;
return false;
- } else if (isEmpty) {
- return false;
} else {
- return true;
+ return !isEmpty;
}
}
@@ -213,7 +210,7 @@ public class BindingSetHashJoinIterator implements
private BindingSet removeConstants(BindingSet bs) {
QueryBindingSet bSet = new QueryBindingSet();
for (String s : bs.getBindingNames()) {
- if (!s.startsWith(ExternalTupleSet.CONST_PREFIX)) {
+ if (!VarNameUtils.isConstant(s)) {
bSet.addBinding(bs.getBinding(s));
}
}
@@ -291,10 +288,8 @@ public class BindingSetHashJoinIterator implements
}
isEmpty = true;
return false;
- } else if (isEmpty) {
- return false;
} else {
- return true;
+ return !isEmpty;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/IteratorCombiner.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/IteratorCombiner.java b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/IteratorCombiner.java
index 0de0d10..27735de 100644
--- a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/IteratorCombiner.java
+++ b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/IteratorCombiner.java
@@ -19,14 +19,13 @@ package org.apache.rya.accumulo.pcj.iterators;
* under the License.
*/
-import info.aduna.iteration.CloseableIteration;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
import com.google.common.base.Preconditions;
@@ -69,10 +68,8 @@ public class IteratorCombiner implements
}
isEmpty = true;
return false;
- } else if (isEmpty) {
- return false;
} else {
- return true;
+ return !isEmpty;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java
index 5fe72cd..5889ca1 100644
--- a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java
+++ b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToCrossProductBindingSetIterator.java
@@ -19,8 +19,6 @@ package org.apache.rya.accumulo.pcj.iterators;
* under the License.
*/
-import info.aduna.iteration.CloseableIteration;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -29,17 +27,18 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
-
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
+import org.apache.rya.api.domain.VarNameUtils;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer;
import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
-import org.openrdf.model.Value;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
import com.google.common.collect.HashBiMap;
@@ -128,10 +127,8 @@ public class PCJKeyToCrossProductBindingSetIterator implements
}
isEmpty = true;
return false;
- } else if (isEmpty) {
- return false;
} else {
- return true;
+ return !isEmpty;
}
}
@@ -187,7 +184,7 @@ public class PCJKeyToCrossProductBindingSetIterator implements
throw new QueryEvaluationException("PCJ Variable has no mapping to query variable.");
}
if (constantConstraintsExist) {
- if (mappedVar.startsWith(ExternalTupleSet.CONST_PREFIX)
+ if (VarNameUtils.isConstant(mappedVar)
&& constantConstraints.containsKey(mappedVar)
&& !constantConstraints.get(mappedVar).equals(
bindingSet.getValue(var))) {
@@ -195,7 +192,7 @@ public class PCJKeyToCrossProductBindingSetIterator implements
}
}
- if (!mappedVar.startsWith(ExternalTupleSet.CONST_PREFIX)) {
+ if (!VarNameUtils.isConstant(mappedVar)) {
bs.addBinding(mappedVar, bindingSet.getValue(var));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToJoinBindingSetIterator.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToJoinBindingSetIterator.java b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToJoinBindingSetIterator.java
index 0dcdfd5..bafdda4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToJoinBindingSetIterator.java
+++ b/extras/indexing/src/main/java/org/apache/rya/accumulo/pcj/iterators/PCJKeyToJoinBindingSetIterator.java
@@ -19,27 +19,26 @@ package org.apache.rya.accumulo.pcj.iterators;
* under the License.
*/
-import info.aduna.iteration.CloseableIteration;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
-import org.apache.rya.api.RdfCloudTripleStoreUtils;
-import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
-
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.VarNameUtils;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer;
import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException;
import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder;
-import org.openrdf.model.Value;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
import com.google.common.base.Preconditions;
import com.google.common.collect.HashBiMap;
@@ -121,10 +120,8 @@ public class PCJKeyToJoinBindingSetIterator
}
isEmpty = true;
return false;
- } else if (isEmpty) {
- return false;
} else {
- return true;
+ return !isEmpty;
}
}
@@ -173,7 +170,7 @@ public class PCJKeyToJoinBindingSetIterator
QueryBindingSet bs = new QueryBindingSet();
for (String var : bindingSet.getBindingNames()) {
String mappedVar = pcjVarMap.get(var);
- if (mappedVar.startsWith(ExternalTupleSet.CONST_PREFIX)
+ if (VarNameUtils.isConstant(mappedVar)
&& constantConstraints.containsKey(mappedVar)
&& !constantConstraints.get(mappedVar).equals(
bindingSet.getValue(var))) {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJ.java
index f6002b6..c78bbb2 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJ.java
@@ -52,19 +52,18 @@ import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageExce
import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage;
import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
import org.apache.rya.sail.config.RyaSailFactory;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.parser.ParsedQuery;
-import org.openrdf.query.parser.sparql.SPARQLParser;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+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.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
import com.google.common.base.Optional;
-import info.aduna.iteration.CloseableIteration;
-
/**
* Uses an in memory Rya Client to batch update a PCJ index.
*/
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
index 9ac7c2a..243aea6 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJ.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -46,10 +46,10 @@ import org.apache.rya.indexing.pcj.storage.PcjException;
import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage;
import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageException;
import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.sail.SailException;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
@@ -160,7 +160,7 @@ public class AccumuloCreatePCJ extends AccumuloCommand implements CreatePCJ {
new String(cd.getUserPass()),
cd.getInstanceName(),
cd.getZookeepers(),
- fluoAppName);) {
+ fluoAppName)) {
// Initialize the PCJ within the Fluo application.
final CreateFluoPcj fluoCreatePcj = new CreateFluoPcj();
fluoCreatePcj.withRyaIntegration(pcjId, sparql, strategies, fluoClient, getConnector(), ryaInstance);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePeriodicPCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePeriodicPCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePeriodicPCJ.java
index 3ecb93e..a80bf2f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePeriodicPCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloCreatePeriodicPCJ.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -45,10 +45,10 @@ import org.apache.rya.periodic.notification.api.PeriodicNotificationClient;
import org.apache.rya.periodic.notification.notification.CommandNotification;
import org.apache.rya.periodic.notification.registration.KafkaNotificationRegistrationClient;
import org.apache.rya.periodic.notification.serialization.CommandNotificationSerializer;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.sail.SailException;
import com.google.common.base.Optional;
@@ -125,7 +125,7 @@ public class AccumuloCreatePeriodicPCJ extends AccumuloCommand implements Create
new String(cd.getUserPass()),
cd.getInstanceName(),
cd.getZookeepers(),
- fluoAppName);) {
+ fluoAppName)) {
// Initialize the PCJ within the Fluo application.
final CreatePeriodicQuery periodicPcj = new CreatePeriodicQuery(fluoClient, periodicStorage);
PeriodicNotificationClient periodicClient = new KafkaNotificationRegistrationClient(periodicTopic, createProducer(bootStrapServers));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePeriodicPCJ.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePeriodicPCJ.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePeriodicPCJ.java
index d287af4..e8016cf 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePeriodicPCJ.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloDeletePeriodicPCJ.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -43,7 +43,7 @@ import org.apache.rya.periodic.notification.api.PeriodicNotificationClient;
import org.apache.rya.periodic.notification.notification.CommandNotification;
import org.apache.rya.periodic.notification.registration.KafkaNotificationRegistrationClient;
import org.apache.rya.periodic.notification.serialization.CommandNotificationSerializer;
-import org.openrdf.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloExecuteSparqlQuery.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloExecuteSparqlQuery.java b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloExecuteSparqlQuery.java
index e9e2cbe..b97ae8a 100644
--- a/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloExecuteSparqlQuery.java
+++ b/extras/indexing/src/main/java/org/apache/rya/api/client/accumulo/AccumuloExecuteSparqlQuery.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -34,16 +34,16 @@ import org.apache.rya.api.client.RyaClientException;
import org.apache.rya.api.persist.RyaDAOException;
import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
import org.apache.rya.sail.config.RyaSailFactory;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+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 org.eclipse.rdf4j.sail.SailException;
import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
import edu.umd.cs.findbugs.annotations.NonNull;