http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java index 125a2e4..f18b1da 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java @@ -23,6 +23,7 @@ import static org.apache.rya.indexing.geotemporal.GeoTemporalTestUtils.getFilter import static org.apache.rya.indexing.geotemporal.GeoTemporalTestUtils.getSps; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.rya.api.resolver.RdfToRyaConversions; @@ -32,21 +33,19 @@ import org.apache.rya.indexing.IndexingFunctionRegistry; import org.apache.rya.indexing.IndexingFunctionRegistry.FUNCTION_TYPE; import org.apache.rya.indexing.geotemporal.GeoTemporalIndexer.GeoPolicy; import org.apache.rya.indexing.geotemporal.GeoTemporalIndexer.TemporalPolicy; +import org.eclipse.rdf4j.model.IRI; +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.query.algebra.FunctionCall; +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.junit.Before; import org.junit.Test; -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.ContextStatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.FunctionCall; -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 com.mongodb.DBObject; import com.mongodb.util.JSON; @@ -60,6 +59,8 @@ import com.mongodb.util.JSON; * @see GeoPolicy Geo Filter Functions */ public class GeoTemporalMongoDBStorageStrategyTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + private GeoTemporalMongoDBStorageStrategy adapter; @Before public void setup() { @@ -92,8 +93,9 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { //should only be one. - final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(new URIImpl(filter.getURI()), filter.getArgs()); - final IndexingExpr expr = new IndexingExpr(new URIImpl(filter.getURI()), sps.get(0), extractArguments(objVar.getName(), filter)); + final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(VF.createIRI(filter.getURI()), filter.getArgs()); + final Value[] arguments = extractArguments(objVar.getName(), filter); + final IndexingExpr expr = new IndexingExpr(VF.createIRI(filter.getURI()), sps.get(0), Arrays.stream(arguments).toArray()); geoFilters.add(expr); } final List<IndexingExpr> temporalFilters = new ArrayList<>(); @@ -134,8 +136,9 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<StatementPattern> sps = getSps(query); final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { - final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(new URIImpl(filter.getURI()), filter.getArgs()); - final IndexingExpr expr = new IndexingExpr(new URIImpl(filter.getURI()), sps.get(0), extractArguments(objVar.getName(), filter)); + final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(VF.createIRI(filter.getURI()), filter.getArgs()); + final Value[] arguments = extractArguments(objVar.getName(), filter); + final IndexingExpr expr = new IndexingExpr(VF.createIRI(filter.getURI()), sps.get(0), Arrays.stream(arguments).toArray()); geoFilters.add(expr); } final List<IndexingExpr> temporalFilters = new ArrayList<>(); @@ -178,8 +181,9 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { //should only be one. - final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(new URIImpl(filter.getURI()), filter.getArgs()); - final IndexingExpr expr = new IndexingExpr(new URIImpl(filter.getURI()), sps.get(0), extractArguments(objVar.getName(), filter)); + final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(VF.createIRI(filter.getURI()), filter.getArgs()); + final Value[] arguments = extractArguments(objVar.getName(), filter); + final IndexingExpr expr = new IndexingExpr(VF.createIRI(filter.getURI()), sps.get(0), Arrays.stream(arguments).toArray()); temporalFilters.add(expr); } final DBObject actual = adapter.getFilterQuery(geoFilters, temporalFilters); @@ -209,8 +213,9 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<StatementPattern> sps = getSps(query); final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { - final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(new URIImpl(filter.getURI()), filter.getArgs()); - final IndexingExpr expr = new IndexingExpr(new URIImpl(filter.getURI()), sps.get(0), extractArguments(objVar.getName(), filter)); + final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(VF.createIRI(filter.getURI()), filter.getArgs()); + final Value[] arguments = extractArguments(objVar.getName(), filter); + final IndexingExpr expr = new IndexingExpr(VF.createIRI(filter.getURI()), sps.get(0), Arrays.stream(arguments).toArray()); temporalFilters.add(expr); } final DBObject actual = adapter.getFilterQuery(geoFilters, temporalFilters); @@ -255,9 +260,10 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<StatementPattern> sps = getSps(query); final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { - final URI filterURI = new URIImpl(filter.getURI()); + final IRI filterURI = VF.createIRI(filter.getURI()); final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(filterURI, filter.getArgs()); - final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), extractArguments(objVar.getName(), filter)); + final Value[] arguments = extractArguments(objVar.getName(), filter); + final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), Arrays.stream(arguments).toArray()); if(IndexingFunctionRegistry.getFunctionType(filterURI) == FUNCTION_TYPE.GEO) { geoFilters.add(expr); } else { @@ -309,9 +315,10 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<StatementPattern> sps = getSps(query); final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { - final URI filterURI = new URIImpl(filter.getURI()); + final IRI filterURI = VF.createIRI(filter.getURI()); final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(filterURI, filter.getArgs()); - final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), extractArguments(objVar.getName(), filter)); + final Value[] arguments = extractArguments(objVar.getName(), filter); + final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), Arrays.stream(arguments).toArray()); if(IndexingFunctionRegistry.getFunctionType(filterURI) == FUNCTION_TYPE.GEO) { geoFilters.add(expr); } else { @@ -375,9 +382,10 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<StatementPattern> sps = getSps(query); final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { - final URI filterURI = new URIImpl(filter.getURI()); + final IRI filterURI = VF.createIRI(filter.getURI()); final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(filterURI, filter.getArgs()); - final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), extractArguments(objVar.getName(), filter)); + final Value[] arguments = extractArguments(objVar.getName(), filter); + final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), Arrays.stream(arguments).toArray()); if(IndexingFunctionRegistry.getFunctionType(filterURI) == FUNCTION_TYPE.GEO) { geoFilters.add(expr); } else { @@ -412,15 +420,14 @@ public class GeoTemporalMongoDBStorageStrategyTest { @Test public void serializeTest() { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final Resource context = vf.createURI("foo:context"); + final Resource subject = VF.createIRI("foo:subj"); + final Resource context = VF.createIRI("foo:context"); //GEO - URI predicate = GeoConstants.GEO_AS_WKT; - Value object = vf.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); + IRI predicate = GeoConstants.GEO_AS_WKT; + Value object = VF.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); - Statement statement = new ContextStatementImpl(subject, predicate, object, context); + Statement statement = VF.createStatement(subject, predicate, object, context); DBObject actual = adapter.serialize(RdfToRyaConversions.convertStatement(statement)); String expectedString = "{ " @@ -434,9 +441,9 @@ public class GeoTemporalMongoDBStorageStrategyTest { assertEqualMongo(expected, actual); //TIME INSTANT - predicate = new URIImpl("Property:event:time"); - object = vf.createLiteral("2015-12-30T12:00:00Z"); - statement = new ContextStatementImpl(subject, predicate, object, context); + predicate = VF.createIRI("Property:event:time"); + object = VF.createLiteral("2015-12-30T12:00:00Z"); + statement = VF.createStatement(subject, predicate, object, context); actual = adapter.serialize(RdfToRyaConversions.convertStatement(statement)); expectedString = "{" @@ -451,9 +458,9 @@ public class GeoTemporalMongoDBStorageStrategyTest { assertEqualMongo(expected, actual); //TIME INTERVAL - predicate = new URIImpl("Property:circa"); - object = vf.createLiteral("[1969-12-31T19:00:00-05:00,1969-12-31T19:00:01-05:00]"); - statement = new ContextStatementImpl(subject, predicate, object, context); + predicate = VF.createIRI("Property:circa"); + object = VF.createLiteral("[1969-12-31T19:00:00-05:00,1969-12-31T19:00:01-05:00]"); + statement = VF.createStatement(subject, predicate, object, context); actual = adapter.serialize(RdfToRyaConversions.convertStatement(statement)); expectedString = "{" @@ -471,7 +478,7 @@ public class GeoTemporalMongoDBStorageStrategyTest { assertEqualMongo(expected, actual); } - private Value[] extractArguments(final String matchName, final FunctionCall call) { + private static Value[] extractArguments(final String matchName, final FunctionCall call) { final Value args[] = new Value[call.getArgs().size() - 1]; int argI = 0; for (int i = 0; i != call.getArgs().size(); ++i) {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexerIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexerIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexerIT.java index 881289a..5136a32 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexerIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexerIT.java @@ -34,12 +34,11 @@ import org.apache.rya.indexing.geotemporal.storage.EventStorage; import org.apache.rya.mongodb.MongoITBase; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.vividsolutions.jts.geom.Geometry; @@ -101,18 +100,18 @@ public class MongoGeoTemporalIndexerIT extends MongoITBase { } private static RyaStatement statement(final Geometry geo) { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("uri:test"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("uri:test"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral(geo.toString(), GeoConstants.XMLSCHEMA_OGC_WKT); - return RdfToRyaConversions.convertStatement(new StatementImpl(subject, predicate, object)); + return RdfToRyaConversions.convertStatement(vf.createStatement(subject, predicate, object)); } private static RyaStatement statement(final TemporalInstant instant) { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("uri:test"); - final URI predicate = vf.createURI("Property:atTime"); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("uri:test"); + final IRI predicate = vf.createIRI("Property:atTime"); final Value object = vf.createLiteral(instant.toString()); - return RdfToRyaConversions.convertStatement(new StatementImpl(subject, predicate, object)); + return RdfToRyaConversions.convertStatement(vf.createStatement(subject, predicate, object)); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerFilterIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerFilterIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerFilterIT.java index f38fc06..81e0682 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerFilterIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerFilterIT.java @@ -32,22 +32,21 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.accumulo.geo.OptionalConfigUtils; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.model.IRI; +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.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.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.Sail; import org.junit.Test; -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.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -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.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Geometry; @@ -286,12 +285,12 @@ public class MongoGeoIndexerFilterIT extends MongoITBase { } private static RyaStatement statement(final Geometry geo) { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("urn:geo"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("urn:geo"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final WKTWriter w = new WKTWriter(); final Value object = vf.createLiteral(w.write(geo), GeoConstants.XMLSCHEMA_OGC_WKT); - return RdfToRyaConversions.convertStatement(new StatementImpl(subject, predicate, object)); + return RdfToRyaConversions.convertStatement(vf.createStatement(subject, predicate, object)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerIT.java index 40751ae..ff723f8 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerIT.java @@ -33,15 +33,13 @@ import org.apache.rya.indexing.accumulo.geo.OptionalConfigUtils; import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.model.IRI; +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.junit.Test; -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.ContextStatementImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; import com.google.common.collect.Sets; import com.vividsolutions.jts.geom.Coordinate; @@ -69,30 +67,30 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Point point = gf.createPoint(new Coordinate(10, 10)); final Value pointValue = vf.createLiteral("Point(10 10)", GeoConstants.XMLSCHEMA_OGC_WKT); - final URI invalidPredicate = GeoConstants.GEO_AS_WKT; + final IRI invalidPredicate = GeoConstants.GEO_AS_WKT; // These should not be stored because they are not in the predicate list - f.storeStatement(convertStatement(new StatementImpl(vf.createURI("foo:subj1"), invalidPredicate, pointValue))); - f.storeStatement(convertStatement(new StatementImpl(vf.createURI("foo:subj2"), invalidPredicate, pointValue))); + f.storeStatement(convertStatement(vf.createStatement(vf.createIRI("foo:subj1"), invalidPredicate, pointValue))); + f.storeStatement(convertStatement(vf.createStatement(vf.createIRI("foo:subj2"), invalidPredicate, pointValue))); - final URI pred1 = vf.createURI("pred:1"); - final URI pred2 = vf.createURI("pred:2"); + final IRI pred1 = vf.createIRI("pred:1"); + final IRI pred2 = vf.createIRI("pred:2"); // These should be stored because they are in the predicate list - final Statement s3 = new StatementImpl(vf.createURI("foo:subj3"), pred1, pointValue); - final Statement s4 = new StatementImpl(vf.createURI("foo:subj4"), pred2, pointValue); + final Statement s3 = vf.createStatement(vf.createIRI("foo:subj3"), pred1, pointValue); + final Statement s4 = vf.createStatement(vf.createIRI("foo:subj4"), pred2, pointValue); f.storeStatement(convertStatement(s3)); f.storeStatement(convertStatement(s4)); // This should not be stored because the object is not valid wkt - f.storeStatement(convertStatement(new StatementImpl(vf.createURI("foo:subj5"), pred1, vf.createLiteral("soint(10 10)")))); + f.storeStatement(convertStatement(vf.createStatement(vf.createIRI("foo:subj5"), pred1, vf.createLiteral("soint(10 10)")))); // This should not be stored because the object is not a literal - f.storeStatement(convertStatement(new StatementImpl(vf.createURI("foo:subj6"), pred1, vf.createURI("p:Point(10 10)")))); + f.storeStatement(convertStatement(vf.createStatement(vf.createIRI("foo:subj6"), pred1, vf.createIRI("p:Point(10 10)")))); f.flush(); @@ -109,13 +107,13 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("foo:subj"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Resource context = vf.createURI("foo:context"); + final Resource context = vf.createIRI("foo:context"); - final Statement statement = new ContextStatementImpl(subject, predicate, object, context); + final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(convertStatement(statement)); f.flush(); @@ -154,13 +152,13 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("foo:subj"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Resource context = vf.createURI("foo:context"); + final Resource context = vf.createIRI("foo:context"); - final Statement statement = new ContextStatementImpl(subject, predicate, object, context); + final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(convertStatement(statement)); f.flush(); @@ -184,13 +182,13 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("foo:subj"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Resource context = vf.createURI("foo:context"); + final Resource context = vf.createIRI("foo:context"); - final Statement statement = new ContextStatementImpl(subject, predicate, object, context); + final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(convertStatement(statement)); f.flush(); @@ -224,13 +222,13 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("foo:subj"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Resource context = vf.createURI("foo:context"); + final Resource context = vf.createIRI("foo:context"); - final Statement statement = new ContextStatementImpl(subject, predicate, object, context); + final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(convertStatement(statement)); f.flush(); @@ -243,7 +241,7 @@ public class MongoGeoIndexerIT extends MongoITBase { // query with wrong context assertEquals(Sets.newHashSet(), - getSet(f.queryWithin(p1, new StatementConstraints().setContext(vf.createURI("foo:context2"))))); + getSet(f.queryWithin(p1, new StatementConstraints().setContext(vf.createIRI("foo:context2"))))); } } @@ -254,13 +252,13 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("foo:subj"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Resource context = vf.createURI("foo:context"); + final Resource context = vf.createIRI("foo:context"); - final Statement statement = new ContextStatementImpl(subject, predicate, object, context); + final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(convertStatement(statement)); f.flush(); @@ -272,7 +270,7 @@ public class MongoGeoIndexerIT extends MongoITBase { assertEquals(Sets.newHashSet(statement), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(subject)))); // query with wrong subject - assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createURI("foo:subj2"))))); + assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createIRI("foo:subj2"))))); } } @@ -283,13 +281,13 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("foo:subj"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Resource context = vf.createURI("foo:context"); + final Resource context = vf.createIRI("foo:context"); - final Statement statement = new ContextStatementImpl(subject, predicate, object, context); + final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(convertStatement(statement)); f.flush(); @@ -303,10 +301,10 @@ public class MongoGeoIndexerIT extends MongoITBase { // query with wrong context assertEquals(Sets.newHashSet(), - getSet(f.queryWithin(p1, new StatementConstraints().setContext(vf.createURI("foo:context2"))))); + getSet(f.queryWithin(p1, new StatementConstraints().setContext(vf.createIRI("foo:context2"))))); // query with wrong subject - assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createURI("foo:subj2"))))); + assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createIRI("foo:subj2"))))); } } @@ -317,13 +315,13 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("foo:subj"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("foo:subj"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral("Point(-77.03524 38.889468)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Resource context = vf.createURI("foo:context"); + final Resource context = vf.createIRI("foo:context"); - final Statement statement = new ContextStatementImpl(subject, predicate, object, context); + final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(convertStatement(statement)); f.flush(); @@ -337,7 +335,7 @@ public class MongoGeoIndexerIT extends MongoITBase { // query with wrong predicate assertEquals(Sets.newHashSet(), - getSet(f.queryWithin(p1, new StatementConstraints().setPredicates(Collections.singleton(vf.createURI("other:pred")))))); + getSet(f.queryWithin(p1, new StatementConstraints().setPredicates(Collections.singleton(vf.createIRI("other:pred")))))); } } @@ -348,19 +346,19 @@ public class MongoGeoIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final Resource context = vf.createURI("foo:context"); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource context = vf.createIRI("foo:context"); - final Resource subjectEast = vf.createURI("foo:subj:east"); - final URI predicateEast = GeoConstants.GEO_AS_WKT; + final Resource subjectEast = vf.createIRI("foo:subj:east"); + final IRI predicateEast = GeoConstants.GEO_AS_WKT; final Value objectEast = vf.createLiteral("Point(179 0)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Statement statementEast = new ContextStatementImpl(subjectEast, predicateEast, objectEast, context); + final Statement statementEast = vf.createStatement(subjectEast, predicateEast, objectEast, context); f.storeStatement(convertStatement(statementEast)); - final Resource subjectWest = vf.createURI("foo:subj:west"); - final URI predicateWest = GeoConstants.GEO_AS_WKT; + final Resource subjectWest = vf.createIRI("foo:subj:west"); + final IRI predicateWest = GeoConstants.GEO_AS_WKT; final Value objectWest = vf.createLiteral("Point(-179 0)", GeoConstants.XMLSCHEMA_OGC_WKT); - final Statement statementWest = new ContextStatementImpl(subjectWest, predicateWest, objectWest, context); + final Statement statementWest = vf.createStatement(subjectWest, predicateWest, objectWest, context); f.storeStatement(convertStatement(statementWest)); f.flush(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfIT.java index a544a78..c6efc69 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfIT.java @@ -37,15 +37,15 @@ import org.apache.rya.indexing.accumulo.geo.OptionalConfigUtils; import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +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.junit.Assert; import org.junit.Test; -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.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -54,8 +54,6 @@ import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; -import info.aduna.iteration.CloseableIteration; - /** * Tests all of the "simple functions" of the geoindexer. */ @@ -105,11 +103,11 @@ public class MongoGeoIndexerSfIT extends MongoITBase { } private static RyaStatement statement(final Geometry geo) { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("uri:" + names.get(geo)); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("uri:" + names.get(geo)); + final IRI predicate = GeoConstants.GEO_AS_WKT; final Value object = vf.createLiteral(geo.toString(), GeoConstants.XMLSCHEMA_OGC_WKT); - return RdfToRyaConversions.convertStatement(new StatementImpl(subject, predicate, object)); + return RdfToRyaConversions.convertStatement(vf.createStatement(subject, predicate, object)); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java index 6acc998..7f998b1 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java @@ -31,21 +31,20 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.accumulo.geo.OptionalConfigUtils; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.model.IRI; +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.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.Update; +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.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.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.Update; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; import com.mongodb.MongoClient; import com.vividsolutions.jts.geom.Coordinate; @@ -122,7 +121,7 @@ public class MongoIndexerDeleteIT extends MongoITBase { } private void populateRya(final SailRepositoryConnection conn) throws Exception { - final ValueFactory VF = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); // geo 2x2 points final GeometryFactory GF = new GeometryFactory(); for (int x = 0; x <= 1; x++) { @@ -135,26 +134,27 @@ public class MongoIndexerDeleteIT extends MongoITBase { } // freetext - final URI person = VF.createURI("http://example.org/ontology/Person";); + final IRI person = vf.createIRI("http://example.org/ontology/Person";); String uuid; uuid = "urn:people"; - conn.add(VF.createURI(uuid), RDF.TYPE, person); - conn.add(VF.createURI(uuid), RDFS.LABEL, VF.createLiteral("Alice Palace Hose", VF.createURI("http://www.w3.org/2001/XMLSchema#string";))); - conn.add(VF.createURI(uuid), RDFS.LABEL, VF.createLiteral("Bob Snob Hose", "en")); + conn.add(vf.createIRI(uuid), RDF.TYPE, person); + conn.add(vf.createIRI(uuid), RDFS.LABEL, vf.createLiteral("Alice Palace Hose", vf.createIRI("http://www.w3.org/2001/XMLSchema#string";))); + conn.add(vf.createIRI(uuid), RDFS.LABEL, vf.createLiteral("Bob Snob Hose")); // temporal final TemporalInstant instant = new TemporalInstantRfc3339(1, 2, 3, 4, 5, 6); - conn.add(VF.createURI("foo:time"), VF.createURI("Property:atTime"), VF.createLiteral(instant.toString())); + conn.add(vf.createIRI("foo:time"), vf.createIRI("Property:atTime"), vf.createLiteral(instant.toString())); + conn.commit(); } private static RyaStatement statement(final Geometry geo) { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("urn:geo"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("urn:geo"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final WKTWriter w = new WKTWriter(); final Value object = vf.createLiteral(w.write(geo), GeoConstants.XMLSCHEMA_OGC_WKT); - return RdfToRyaConversions.convertStatement(new StatementImpl(subject, predicate, object)); + return RdfToRyaConversions.convertStatement(vf.createStatement(subject, predicate, object)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PeriodicQueryResultStorage.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PeriodicQueryResultStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PeriodicQueryResultStorage.java index 2936738..c770e45 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PeriodicQueryResultStorage.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PeriodicQueryResultStorage.java @@ -25,7 +25,7 @@ import java.util.Optional; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.utils.CloseableIterator; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * Interface for storing and retrieving Periodic Query Results. @@ -72,7 +72,7 @@ public interface PeriodicQueryResultStorage { * @return PeriodicQueryStorageMetadata * @throws PeriodicQueryStorageException */ - public PeriodicQueryStorageMetadata getPeriodicQueryMetadata(String queryID) throws PeriodicQueryStorageException;; + public PeriodicQueryStorageMetadata getPeriodicQueryMetadata(String queryID) throws PeriodicQueryStorageException; /** * Add periodic query results to the storage layer indicated by the given query id @@ -80,7 +80,7 @@ public interface PeriodicQueryResultStorage { * @param results - query results to be added to storage * @throws PeriodicQueryStorageException */ - public void addPeriodicQueryResults(String queryId, Collection<VisibilityBindingSet> results) throws PeriodicQueryStorageException;; + public void addPeriodicQueryResults(String queryId, Collection<VisibilityBindingSet> results) throws PeriodicQueryStorageException; /** * Deletes periodic query results from the storage layer @@ -88,14 +88,14 @@ public interface PeriodicQueryResultStorage { * @param binID - bin id indicating the periodic id of results to be deleted * @throws PeriodicQueryStorageException */ - public void deletePeriodicQueryResults(String queryId, long binID) throws PeriodicQueryStorageException;; + public void deletePeriodicQueryResults(String queryId, long binID) throws PeriodicQueryStorageException; /** * Deletes all results for the storage layer indicated by the given query id * @param queryID - id indicating the storage layer whose results will be deleted * @throws PeriodicQueryStorageException */ - public void deletePeriodicQuery(String queryID) throws PeriodicQueryStorageException;; + public void deletePeriodicQuery(String queryID) throws PeriodicQueryStorageException; /** * List results in the given storage layer indicated by the query id @@ -104,7 +104,7 @@ public interface PeriodicQueryResultStorage { * @return * @throws PeriodicQueryStorageException */ - public CloseableIterator<BindingSet> listResults(String queryId, Optional<Long> binID) throws PeriodicQueryStorageException;; + public CloseableIterator<BindingSet> listResults(String queryId, Optional<Long> binID) throws PeriodicQueryStorageException; /** * List all storage tables containing periodic results. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java index 70c8b0e..ebb8e8d 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/PrecomputedJoinStorage.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.utils.CloseableIterator; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java index 999b26f..599a48a 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java @@ -28,22 +28,20 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import java.util.Set; - -import edu.umd.cs.findbugs.annotations.DefaultAnnotation; -import edu.umd.cs.findbugs.annotations.NonNull; - -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; - -import com.google.common.primitives.Bytes; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.resolver.RyaTypeResolverException; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; + +import com.google.common.primitives.Bytes; + +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; /** * Converts {@link BindingSet}s to byte[]s and back again. The bytes do not http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java index f3d078d..03d3e4f 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java @@ -43,8 +43,8 @@ import org.apache.rya.api.utils.CloseableIterator; import org.apache.rya.indexing.pcj.storage.PCJIdFactory; import org.apache.rya.indexing.pcj.storage.PcjMetadata; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPeriodicQueryResultStorage.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPeriodicQueryResultStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPeriodicQueryResultStorage.java index 8124aff..889c8ca 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPeriodicQueryResultStorage.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPeriodicQueryResultStorage.java @@ -44,16 +44,17 @@ import org.apache.rya.indexing.pcj.storage.PeriodicQueryResultStorage; import org.apache.rya.indexing.pcj.storage.PeriodicQueryStorageException; import org.apache.rya.indexing.pcj.storage.PeriodicQueryStorageMetadata; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.AggregateOperatorBase; -import org.openrdf.query.algebra.ExtensionElem; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.sparql.SPARQLParser; +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.algebra.AbstractAggregateOperator; +import org.eclipse.rdf4j.query.algebra.ExtensionElem; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.base.Preconditions; @@ -215,8 +216,9 @@ public class AccumuloPeriodicQueryResultStorage implements PeriodicQueryResultSt } private Text getRowPrefix(final long binId) throws BindingSetConversionException { + final ValueFactory vf = SimpleValueFactory.getInstance(); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding(PeriodicQueryResultStorage.PeriodicBinId, new LiteralImpl(Long.toString(binId), XMLSchema.LONG)); + bs.addBinding(PeriodicQueryResultStorage.PeriodicBinId, vf.createLiteral(Long.toString(binId), XMLSchema.LONG)); return new Text(converter.convert(bs, new VariableOrder(PeriodicQueryResultStorage.PeriodicBinId))); } @@ -257,7 +259,7 @@ public class AccumuloPeriodicQueryResultStorage implements PeriodicQueryResultSt * written to the table. * */ - static class AggregateVariableRemover extends QueryModelVisitorBase<RuntimeException> { + static class AggregateVariableRemover extends AbstractQueryModelVisitor<RuntimeException> { private Set<String> bindingNames; @@ -270,7 +272,7 @@ public class AccumuloPeriodicQueryResultStorage implements PeriodicQueryResultSt @Override public void meet(final ExtensionElem node) { - if(node.getExpr() instanceof AggregateOperatorBase) { + if(node.getExpr() instanceof AbstractAggregateOperator) { bindingNames.remove(node.getName()); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloValueBindingSetIterator.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloValueBindingSetIterator.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloValueBindingSetIterator.java index c488d36..b539196 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloValueBindingSetIterator.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloValueBindingSetIterator.java @@ -27,7 +27,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.fluo.api.data.Bytes; import org.apache.rya.api.utils.CloseableIterator; import org.apache.rya.indexing.pcj.storage.PeriodicQueryResultStorage; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * Implementation of CloseableIterator for retrieving results from a {@link PeriodicQueryResultStorage} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java index c920824..9130a75 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetConverter.java @@ -18,8 +18,8 @@ */ package org.apache.rya.indexing.pcj.storage.accumulo; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java index 4120fd9..45a1f61 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java @@ -26,15 +26,14 @@ import java.util.List; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.resolver.RdfToRyaConversions; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.IRI; +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.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import com.google.common.base.Joiner; @@ -52,7 +51,7 @@ public class BindingSetStringConverter implements BindingSetConverter<String> { public static final String TYPE_DELIM = "<<~>>"; public static final String NULL_VALUE_STRING = Character.toString( '\0' ); - private static final ValueFactory valueFactory = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Override public String convert(final BindingSet bindingSet, final VariableOrder varOrder) { @@ -124,12 +123,12 @@ public class BindingSetStringConverter implements BindingSetConverter<String> { final String typeString = valueAndType[1]; // Convert the String Type into a URI that describes the type. - final URI typeURI = valueFactory.createURI(typeString); + final IRI typeURI = VF.createIRI(typeString); // Convert the String Value into a Value. final Value value = typeURI.equals(XMLSchema.ANYURI) ? - valueFactory.createURI(dataString) : - valueFactory.createLiteral(dataString, new URIImpl(typeString)); + VF.createIRI(dataString) : + VF.createLiteral(dataString, VF.createIRI(typeString)); return value; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java index 9346c00..2380ebb 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTables.java @@ -59,14 +59,14 @@ import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.utils.CloseableIterator; import org.apache.rya.indexing.pcj.storage.PcjMetadata; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageException; -import org.openrdf.query.BindingSet; -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.RepositoryConnection; -import org.openrdf.repository.RepositoryException; +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.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java index b699ab4..863895f 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjVarOrderFactory.java @@ -20,11 +20,11 @@ package org.apache.rya.indexing.pcj.storage.accumulo; import java.util.Set; +import org.eclipse.rdf4j.query.MalformedQueryException; + import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; -import org.openrdf.query.MalformedQueryException; - /** * Create alternative variable orders for a SPARQL query based on * the original ordering of its results. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java index b457dfd..75446fd 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ScannerBindingSetIterator.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 @@ -29,7 +29,7 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.rya.api.utils.CloseableIterator; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java index e297ec9..b1a3e89 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactory.java @@ -24,14 +24,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import edu.umd.cs.findbugs.annotations.DefaultAnnotation; -import edu.umd.cs.findbugs.annotations.NonNull; - -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; + /** * Shifts the variables to the left so that each variable will appear at * the head of the varOrder once. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java index 151db50..8a7d15b 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VariableOrder.java @@ -23,7 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; import java.util.Iterator; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDe.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDe.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDe.java index 5ddde85..3ba5e06 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDe.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDe.java @@ -28,6 +28,7 @@ import org.apache.commons.io.serialization.ValidatingObjectInputStream; import org.apache.fluo.api.data.Bytes; import org.apache.rya.api.model.BindingSetDecorator; import org.apache.rya.api.model.VisibilityBindingSet; +import org.eclipse.rdf4j.query.AbstractBindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -67,20 +68,30 @@ public class VisibilityBindingSetSerDe { requireNonNull(bytes); try (final ValidatingObjectInputStream vois = new ValidatingObjectInputStream(new ByteArrayInputStream(bytes.toArray()))) { // Perform input validation. Only the following classes are allowed to be deserialized. - vois.accept(VisibilityBindingSet.class, - BindingSetDecorator.class, - org.openrdf.query.impl.MapBindingSet.class, + vois.accept( + VisibilityBindingSet.class, + java.lang.Byte.class, + java.lang.Double.class, + java.lang.Float.class, + java.lang.Integer.class, + java.lang.Long.class, + java.lang.Number.class, + java.lang.Short.class, + java.math.BigDecimal.class, + java.math.BigInteger.class, java.util.LinkedHashMap.class, java.util.HashMap.class, - java.math.BigInteger.class, - java.math.BigDecimal.class, - java.lang.Number.class, - org.openrdf.query.impl.BindingImpl.class, - org.openrdf.model.impl.LiteralImpl.class, - org.openrdf.model.impl.IntegerLiteralImpl.class, - org.openrdf.model.impl.DecimalLiteralImpl.class, - org.openrdf.model.impl.URIImpl.class, - org.openrdf.query.algebra.evaluation.QueryBindingSet.class); + org.apache.rya.api.model.BindingSetDecorator.class, + org.eclipse.rdf4j.query.impl.SimpleBinding.class, + org.eclipse.rdf4j.model.impl.SimpleIRI.class, + org.eclipse.rdf4j.model.impl.SimpleLiteral.class, + org.eclipse.rdf4j.model.impl.IntegerLiteral.class, + org.eclipse.rdf4j.model.impl.DecimalLiteral.class, + org.eclipse.rdf4j.model.impl.NumericLiteral.class, + org.eclipse.rdf4j.query.AbstractBindingSet.class, + org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet.class, + org.eclipse.rdf4j.query.impl.MapBindingSet.class + ); vois.accept("[B"); final Object o = vois.readObject(); if(o instanceof VisibilityBindingSet) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java index becf1d5..3a4028f 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverter.java @@ -18,12 +18,12 @@ */ package org.apache.rya.indexing.pcj.storage.accumulo; +import org.apache.rya.api.model.VisibilityBindingSet; +import org.eclipse.rdf4j.query.BindingSet; + import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; -import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.query.BindingSet; - /** * Converts {@link BindingSet}s to Strings and back again. The Strings do not * include the binding names and are ordered with a {@link VariableOrder}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoBindingSetConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoBindingSetConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoBindingSetConverter.java index 010f8bc..92731ac 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoBindingSetConverter.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoBindingSetConverter.java @@ -20,7 +20,7 @@ package org.apache.rya.indexing.pcj.storage.mongo; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter; import org.bson.Document; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocuments.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocuments.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocuments.java index ecfbc1c..e81d49b 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocuments.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocuments.java @@ -40,18 +40,19 @@ import org.apache.rya.indexing.pcj.storage.accumulo.ShiftVarOrderFactory; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.bson.Document; import org.bson.conversions.Bson; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -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.query.impl.MapBindingSet; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +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.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; import com.mongodb.MongoClient; import com.mongodb.client.FindIterable; @@ -107,6 +108,7 @@ public class MongoPcjDocuments { private final MongoCollection<Document> pcjCollection; private static final PcjVarOrderFactory pcjVarOrderFactory = new ShiftVarOrderFactory(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); /** * Creates a new {@link MongoPcjDocuments}. @@ -418,7 +420,7 @@ public class MongoPcjDocuments { } else if (!key.equals("_id") && !key.equals(PCJ_ID)) { // is the binding value. final Document typeDoc = (Document) bs.get(key); - final URI dataType = new URIImpl(typeDoc.getString(BINDING_TYPE)); + final IRI dataType = VF.createIRI(typeDoc.getString(BINDING_TYPE)); final RyaType type = new RyaType(dataType, typeDoc.getString(BINDING_VALUE)); final Value value = RyaToRdfConversions.convertValue(type); binding.addBinding(key, value); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorage.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorage.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorage.java index f4e4e9e..b484949 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorage.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorage.java @@ -36,7 +36,7 @@ import org.apache.rya.indexing.pcj.storage.PCJIdFactory; import org.apache.rya.indexing.pcj.storage.PcjMetadata; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.mongodb.instance.MongoRyaInstanceDetailsRepository; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import com.mongodb.MongoClient; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializerTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializerTest.java index d904d83..c1b85cf 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializerTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializerTest.java @@ -20,23 +20,20 @@ package org.apache.rya.indexing.pcj.storage.accumulo; import static org.junit.Assert.assertEquals; -import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer; -import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter; +import org.apache.rya.api.resolver.RyaTypeResolverException; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; -import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.impl.MapBindingSet; - -import org.apache.rya.api.resolver.RyaTypeResolverException; /** * Tests the methods of {@link AccumuloPcjSerialzer}. */ public class AccumuloPcjSerializerTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); /** * The BindingSet has fewer Bindings than there are variables in the variable @@ -47,8 +44,8 @@ public class AccumuloPcjSerializerTest { public void serialize_bindingsSubsetOfVarOrder() throws BindingSetConversionException { // Setup the Binding Set. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new URIImpl("http://a";)); - originalBindingSet.addBinding("y", new URIImpl("http://b";)); + originalBindingSet.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet.addBinding("y", VF.createIRI("http://b";)); // Setup the variable order. final VariableOrder varOrder = new VariableOrder("x", "a", "y", "b"); @@ -73,9 +70,9 @@ public class AccumuloPcjSerializerTest { public void serialize_bindingNotInVariableOrder() throws RyaTypeResolverException, BindingSetConversionException { // Setup the Binding Set. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new URIImpl("http://a";)); - originalBindingSet.addBinding("y", new URIImpl("http://b";)); - originalBindingSet.addBinding("z", new URIImpl("http://d";)); + originalBindingSet.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet.addBinding("y", VF.createIRI("http://b";)); + originalBindingSet.addBinding("z", VF.createIRI("http://d";)); // Setup the variable order. final VariableOrder varOrder = new VariableOrder("x", "y"); @@ -89,8 +86,8 @@ public class AccumuloPcjSerializerTest { // Show that it only contains the bindings that were part of the Variable Order. MapBindingSet expected = new MapBindingSet(); - expected.addBinding("x", new URIImpl("http://a";)); - expected.addBinding("y", new URIImpl("http://b";)); + expected.addBinding("x", VF.createIRI("http://a";)); + expected.addBinding("y", VF.createIRI("http://b";)); assertEquals(expected, deserialized); } @@ -98,8 +95,8 @@ public class AccumuloPcjSerializerTest { @Test public void basicShortUriBsTest() throws BindingSetConversionException { final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("X",new URIImpl("http://uri1";)); - bs.addBinding("Y",new URIImpl("http://uri2";)); + bs.addBinding("X", VF.createIRI("http://uri1";)); + bs.addBinding("Y", VF.createIRI("http://uri2";)); final VariableOrder varOrder = new VariableOrder("X","Y"); BindingSetConverter<byte[]> converter = new AccumuloPcjSerializer(); @@ -111,11 +108,11 @@ public class AccumuloPcjSerializerTest { @Test public void basicLongUriBsTest() throws BindingSetConversionException { final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("X",new URIImpl("http://uri1";)); - bs.addBinding("Y",new URIImpl("http://uri2";)); - bs.addBinding("Z",new URIImpl("http://uri3";)); - bs.addBinding("A",new URIImpl("http://uri4";)); - bs.addBinding("B",new URIImpl("http://uri5";)); + bs.addBinding("X", VF.createIRI("http://uri1";)); + bs.addBinding("Y", VF.createIRI("http://uri2";)); + bs.addBinding("Z",VF.createIRI("http://uri3";)); + bs.addBinding("A", VF.createIRI("http://uri4";)); + bs.addBinding("B", VF.createIRI("http://uri5";)); final VariableOrder varOrder = new VariableOrder("X","Y","Z","A","B"); BindingSetConverter<byte[]> converter = new AccumuloPcjSerializer(); @@ -127,8 +124,8 @@ public class AccumuloPcjSerializerTest { @Test public void basicShortStringLiteralBsTest() throws BindingSetConversionException { final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("X",new LiteralImpl("literal1")); - bs.addBinding("Y",new LiteralImpl("literal2")); + bs.addBinding("X", VF.createLiteral("literal1")); + bs.addBinding("Y", VF.createLiteral("literal2")); final VariableOrder varOrder = new VariableOrder("X","Y"); BindingSetConverter<byte[]> converter = new AccumuloPcjSerializer(); @@ -140,8 +137,8 @@ public class AccumuloPcjSerializerTest { @Test public void basicShortMixLiteralBsTest() throws BindingSetConversionException { final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("X",new LiteralImpl("literal1")); - bs.addBinding("Y",new LiteralImpl("5", new URIImpl("http://www.w3.org/2001/XMLSchema#integer";))); + bs.addBinding("X",VF.createLiteral("literal1")); + bs.addBinding("Y",VF.createLiteral("5", VF.createIRI("http://www.w3.org/2001/XMLSchema#integer";))); final VariableOrder varOrder = new VariableOrder("X","Y"); BindingSetConverter<byte[]> converter = new AccumuloPcjSerializer(); @@ -153,10 +150,10 @@ public class AccumuloPcjSerializerTest { @Test public void basicLongMixLiteralBsTest() throws BindingSetConversionException { final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("X",new LiteralImpl("literal1")); - bs.addBinding("Y",new LiteralImpl("5", new URIImpl("http://www.w3.org/2001/XMLSchema#integer";))); - bs.addBinding("Z",new LiteralImpl("5.0", new URIImpl("http://www.w3.org/2001/XMLSchema#double";))); - bs.addBinding("W",new LiteralImpl("1000", new URIImpl("http://www.w3.org/2001/XMLSchema#long";))); + bs.addBinding("X", VF.createLiteral("literal1")); + bs.addBinding("Y", VF.createLiteral("5", VF.createIRI("http://www.w3.org/2001/XMLSchema#integer";))); + bs.addBinding("Z", VF.createLiteral("5.0", VF.createIRI("http://www.w3.org/2001/XMLSchema#double";))); + bs.addBinding("W", VF.createLiteral("1000", VF.createIRI("http://www.w3.org/2001/XMLSchema#long";))); final VariableOrder varOrder = new VariableOrder("W","X","Y","Z"); BindingSetConverter<byte[]> converter = new AccumuloPcjSerializer(); @@ -168,13 +165,13 @@ public class AccumuloPcjSerializerTest { @Test public void basicMixUriLiteralBsTest() throws BindingSetConversionException { final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("X",new LiteralImpl("literal1")); - bs.addBinding("Y",new LiteralImpl("5", new URIImpl("http://www.w3.org/2001/XMLSchema#integer";))); - bs.addBinding("Z",new LiteralImpl("5.0", new URIImpl("http://www.w3.org/2001/XMLSchema#double";))); - bs.addBinding("W",new LiteralImpl("1000", new URIImpl("http://www.w3.org/2001/XMLSchema#long";))); - bs.addBinding("A",new URIImpl("http://uri1";)); - bs.addBinding("B",new URIImpl("http://uri2";)); - bs.addBinding("C",new URIImpl("http://uri3";)); + bs.addBinding("X", VF.createLiteral("literal1")); + bs.addBinding("Y", VF.createLiteral("5", VF.createIRI("http://www.w3.org/2001/XMLSchema#integer";))); + bs.addBinding("Z", VF.createLiteral("5.0", VF.createIRI("http://www.w3.org/2001/XMLSchema#double";))); + bs.addBinding("W", VF.createLiteral("1000", VF.createIRI("http://www.w3.org/2001/XMLSchema#long";))); + bs.addBinding("A", VF.createIRI("http://uri1";)); + bs.addBinding("B", VF.createIRI("http://uri2";)); + bs.addBinding("C", VF.createIRI("http://uri3";)); final VariableOrder varOrder = new VariableOrder("A","W","X","Y","Z","B","C"); BindingSetConverter<byte[]> converter = new AccumuloPcjSerializer();
