http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.geomesa/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.geomesa/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java b/extras/rya.geoindexing/geo.geomesa/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java index 0077c29..d52a3f1 100644 --- a/extras/rya.geoindexing/geo.geomesa/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java +++ b/extras/rya.geoindexing/geo.geomesa/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java @@ -33,14 +33,12 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.junit.Assert; 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.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; +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 com.google.common.collect.Sets; import com.vividsolutions.jts.geom.Coordinate; @@ -95,30 +93,30 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -134,13 +132,13 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -178,13 +176,13 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -207,13 +205,13 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -246,13 +244,13 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -265,7 +263,7 @@ public class GeoIndexerTest { // query with wrong context Assert.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"))))); } } @@ -275,13 +273,13 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -293,7 +291,7 @@ public class GeoIndexerTest { Assert.assertEquals(Sets.newHashSet(statement), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(subject)))); // query with wrong subject - Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createURI("foo:subj2"))))); + Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createIRI("foo:subj2"))))); } } @@ -303,13 +301,13 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -323,10 +321,10 @@ public class GeoIndexerTest { // query with wrong context Assert.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 - Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createURI("foo:subj2"))))); + Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createIRI("foo:subj2"))))); } } @@ -336,13 +334,13 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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(); @@ -356,7 +354,7 @@ public class GeoIndexerTest { // query with wrong predicate Assert.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")))))); } } @@ -366,19 +364,19 @@ public class GeoIndexerTest { try (final GeoMesaGeoIndexer f = new GeoMesaGeoIndexer()) { f.setConf(conf); - 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.geowave/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoWaveGeoIndexer.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoWaveGeoIndexer.java b/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoWaveGeoIndexer.java index 0a4e767..8684d11 100644 --- a/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoWaveGeoIndexer.java +++ b/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoWaveGeoIndexer.java @@ -51,6 +51,11 @@ import org.apache.rya.indexing.StatementConstraints; import org.apache.rya.indexing.StatementSerializer; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.accumulo.geo.GeoTupleSet.GeoSearchFunctionFactory.NearQuery; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.QueryEvaluationException; import org.geotools.data.DataStore; import org.geotools.data.DataUtilities; import org.geotools.data.FeatureSource; @@ -67,15 +72,10 @@ import org.opengis.feature.simple.SimpleFeatureType; import org.opengis.filter.Filter; import org.opengis.filter.FilterFactory; import org.opengis.filter.identity.Identifier; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.query.QueryEvaluationException; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.io.ParseException; -import info.aduna.iteration.CloseableIteration; import mil.nga.giat.geowave.adapter.vector.FeatureDataAdapter; import mil.nga.giat.geowave.adapter.vector.plugin.GeoWaveGTDataStore; import mil.nga.giat.geowave.adapter.vector.plugin.GeoWaveGTDataStoreFactory; @@ -147,7 +147,7 @@ public class GeoWaveGeoIndexer extends AbstractAccumuloIndexer implements GeoInd private static final String GEO_ID_ATTRIBUTE = "geo_id"; private static final String GEOMETRY_ATTRIBUTE = "geowave_index_geometry"; - private Set<URI> validPredicates; + private Set<IRI> validPredicates; private Configuration conf; private FeatureStore<SimpleFeatureType, SimpleFeature> featureStore; private FeatureSource<SimpleFeatureType, SimpleFeature> featureSource; @@ -367,7 +367,7 @@ public class GeoWaveGeoIndexer extends AbstractAccumuloIndexer implements GeoInd } if (contraints.hasPredicates()) { final List<String> predicates = new ArrayList<String>(); - for (final URI u : contraints.getPredicates()) { + for (final IRI u : contraints.getPredicates()) { predicates.add("( " + PREDICATE_ATTRIBUTE + "= '" + u.stringValue() + "') "); } filterParms.add("(" + StringUtils.join(predicates, " OR ") + ")"); @@ -488,7 +488,7 @@ public class GeoWaveGeoIndexer extends AbstractAccumuloIndexer implements GeoInd } @Override - public Set<URI> getIndexablePredicates() { + public Set<IRI> getIndexablePredicates() { return validPredicates; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/geoExamples/GeowaveDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/geoExamples/GeowaveDirectExample.java b/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/geoExamples/GeowaveDirectExample.java index 33a4bec..9242b3c 100644 --- a/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/geoExamples/GeowaveDirectExample.java +++ b/extras/rya.geoindexing/geo.geowave/src/main/java/org/apache/rya/indexing/geoExamples/GeowaveDirectExample.java @@ -29,20 +29,20 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.accumulo.geo.OptionalConfigUtils; import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig; import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.Update; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.Sail; public class GeowaveDirectExample { private static final Logger log = Logger.getLogger(GeowaveDirectExample.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerSfTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerSfTest.java b/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerSfTest.java index 0cf2544..10f6a13 100644 --- a/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerSfTest.java +++ b/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerSfTest.java @@ -43,6 +43,13 @@ import org.apache.rya.indexing.GeoConstants; import org.apache.rya.indexing.GeoIndexerType; import org.apache.rya.indexing.StatementConstraints; import org.apache.rya.indexing.accumulo.ConfigUtils; +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.geotools.geometry.jts.Geometries; import org.junit.AfterClass; import org.junit.Assert; @@ -52,14 +59,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -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.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; @@ -76,7 +75,6 @@ import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence; import com.vividsolutions.jts.io.ParseException; import com.vividsolutions.jts.io.gml2.GMLWriter; -import info.aduna.iteration.CloseableIteration; import mil.nga.giat.geowave.datastore.accumulo.minicluster.MiniAccumuloClusterFactory; /** @@ -85,6 +83,8 @@ import mil.nga.giat.geowave.datastore.accumulo.minicluster.MiniAccumuloClusterFa */ @RunWith(value = Parameterized.class) public class GeoWaveIndexerSfTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + private static AccumuloRdfConfiguration conf; private static GeometryFactory gf = new GeometryFactory(new PrecisionModel(), 4326); private static GeoWaveGeoIndexer g; @@ -139,24 +139,24 @@ public class GeoWaveIndexerSfTest { * JUnit 4 parameterized iterates thru this list and calls the constructor with each. * For each test, Call the constructor three times, for WKT and for GML encoding 1, and GML encoding 2 */ - private static final URI USE_JTS_LIB_ENCODING = new URIImpl("uri:useLib") ; - private static final URI USE_ROUGH_ENCODING = new URIImpl("uri:useRough") ; + private static final IRI USE_JTS_LIB_ENCODING = VF.createIRI("uri:useLib") ; + private static final IRI USE_ROUGH_ENCODING = VF.createIRI("uri:useRough") ; @Parameters - public static Collection<URI[]> constructorData() { - final URI[][] data = new URI[][] { { GeoConstants.XMLSCHEMA_OGC_WKT, USE_JTS_LIB_ENCODING }, { GeoConstants.XMLSCHEMA_OGC_GML, USE_JTS_LIB_ENCODING }, { GeoConstants.XMLSCHEMA_OGC_GML, USE_JTS_LIB_ENCODING } }; + public static Collection<IRI[]> constructorData() { + final IRI[][] data = new IRI[][] { { GeoConstants.XMLSCHEMA_OGC_WKT, USE_JTS_LIB_ENCODING }, { GeoConstants.XMLSCHEMA_OGC_GML, USE_JTS_LIB_ENCODING }, { GeoConstants.XMLSCHEMA_OGC_GML, USE_JTS_LIB_ENCODING } }; return Arrays.asList(data); } - private final URI schemaToTest; - private final URI encodeMethod; + private final IRI schemaToTest; + private final IRI encodeMethod; /** * Constructor required by JUnit parameterized runner. See {@link #constructorData()} for constructor values. - * @param schemaToTest the schema to test {@link URI}. - * @param encodeMethod the encode method {@link URI}. + * @param schemaToTest the schema to test {@link IRI}. + * @param encodeMethod the encode method {@link IRI}. */ - public GeoWaveIndexerSfTest(final URI schemaToTest, final URI encodeMethod) { + public GeoWaveIndexerSfTest(final IRI schemaToTest, final IRI encodeMethod) { this.schemaToTest = schemaToTest; this.encodeMethod = encodeMethod; } @@ -228,11 +228,11 @@ public class GeoWaveIndexerSfTest { g.storeStatement(createRyaStatement(G, schemaToTest, encodeMethod)); } - private static RyaStatement createRyaStatement(final Geometry geo, final URI schema, final URI encodingMethod) { + private static RyaStatement createRyaStatement(final Geometry geo, final IRI schema, final IRI encodingMethod) { return RdfToRyaConversions.convertStatement(genericStatement(geo,schema,encodingMethod)); } - private static Statement genericStatement(final Geometry geo, final URI schema, final URI encodingMethod) { + private static Statement genericStatement(final Geometry geo, final IRI schema, final IRI encodingMethod) { if (schema.equals(GeoConstants.XMLSCHEMA_OGC_WKT)) { return genericStatementWkt(geo); } else if (schema.equals(GeoConstants.XMLSCHEMA_OGC_GML)) { @@ -242,17 +242,15 @@ public class GeoWaveIndexerSfTest { } private static Statement genericStatementWkt(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 Value object = vf.createLiteral(geo.toString(), GeoConstants.XMLSCHEMA_OGC_WKT); - return new StatementImpl(subject, predicate, object); + 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 VF.createStatement(subject, predicate, object); } - private static Statement genericStatementGml(final Geometry geo, final URI encodingMethod) { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("uri:" + NAMES.get(geo)); - final URI predicate = GeoConstants.GEO_AS_GML; + private static Statement genericStatementGml(final Geometry geo, final IRI encodingMethod) { + final Resource subject = VF.createIRI("uri:" + NAMES.get(geo)); + final IRI predicate = GeoConstants.GEO_AS_GML; final String gml ; if (encodingMethod == USE_JTS_LIB_ENCODING) { @@ -267,8 +265,8 @@ public class GeoWaveIndexerSfTest { // System.out.println("========== GML===="); } - final Value object = vf.createLiteral(gml, GeoConstants.XMLSCHEMA_OGC_GML); - return new StatementImpl(subject, predicate, object); + final Value object = VF.createLiteral(gml, GeoConstants.XMLSCHEMA_OGC_GML); + return VF.createStatement(subject, predicate, object); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerTest.java b/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerTest.java index 1930a50..c590e2f 100644 --- a/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerTest.java +++ b/extras/rya.geoindexing/geo.geowave/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoWaveIndexerTest.java @@ -37,19 +37,17 @@ import org.apache.rya.indexing.GeoConstants; import org.apache.rya.indexing.GeoIndexerType; import org.apache.rya.indexing.StatementConstraints; import org.apache.rya.indexing.accumulo.ConfigUtils; +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.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; 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.google.common.io.Files; @@ -140,30 +138,30 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -180,13 +178,13 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -225,13 +223,13 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -255,13 +253,13 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -294,13 +292,13 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -313,7 +311,7 @@ public class GeoWaveIndexerTest { // query with wrong context Assert.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"))))); } } @@ -324,13 +322,13 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -342,7 +340,7 @@ public class GeoWaveIndexerTest { Assert.assertEquals(Sets.newHashSet(statement), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(subject)))); // query with wrong subject - Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createURI("foo:subj2"))))); + Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createIRI("foo:subj2"))))); } } @@ -353,13 +351,13 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -373,10 +371,10 @@ public class GeoWaveIndexerTest { // query with wrong context Assert.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 - Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createURI("foo:subj2"))))); + Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(p1, new StatementConstraints().setSubject(vf.createIRI("foo:subj2"))))); } } @@ -387,13 +385,13 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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(); @@ -407,7 +405,7 @@ public class GeoWaveIndexerTest { // query with wrong predicate Assert.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")))))); } } @@ -418,19 +416,19 @@ public class GeoWaveIndexerTest { f.setConf(conf); f.purge(conf); - 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/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java index 04488bb..bed432d 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java @@ -30,18 +30,18 @@ import org.apache.rya.indexing.accumulo.geo.OptionalConfigUtils; import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration; import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration.MongoDBIndexingConfigBuilder; import org.apache.rya.mongodb.EmbeddedMongoFactory; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.Update; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.Sail; import com.mongodb.MongoClient; import com.mongodb.ServerAddress; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategy.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategy.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategy.java index 5db432b..54bb90c 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategy.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategy.java @@ -48,10 +48,10 @@ import org.apache.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQuery; import org.apache.rya.indexing.mongodb.geo.GmlParser; import org.apache.rya.indexing.mongodb.temporal.TemporalMongoDBStorageStrategy; import org.joda.time.DateTime; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObjectBuilder; @@ -116,7 +116,7 @@ public class GeoTemporalMongoDBStorageStrategy extends IndexingMongoDBStorageStr @Override public DBObject serialize(final RyaStatement ryaStatement) { final BasicDBObjectBuilder builder = BasicDBObjectBuilder.start("_id", ryaStatement.getSubject().hashCode()); - final URI obj = ryaStatement.getObject().getDataType(); + final IRI obj = ryaStatement.getObject().getDataType(); if(obj.equals(GeoConstants.GEO_AS_WKT) || obj.equals(GeoConstants.GEO_AS_GML) || http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java index ce6d653..bc836bd 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java @@ -46,8 +46,8 @@ import org.apache.rya.indexing.mongodb.IndexingException; import org.apache.rya.indexing.mongodb.geo.GmlParser; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; import org.joda.time.DateTime; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.io.ParseException; @@ -126,7 +126,7 @@ public class MongoGeoTemporalIndexer extends AbstractMongoIndexer<GeoTemporalMon } final Event currentEvent = updated.build(); - final URI pred = statement.getObject().getDataType(); + final IRI pred = statement.getObject().getDataType(); if((pred.equals(GeoConstants.GEO_AS_WKT) || pred.equals(GeoConstants.GEO_AS_GML) || pred.equals(GeoConstants.XMLSCHEMA_OGC_WKT) || pred.equals(GeoConstants.XMLSCHEMA_OGC_GML)) && currentEvent.getGeometry().isPresent()) { @@ -174,7 +174,7 @@ public class MongoGeoTemporalIndexer extends AbstractMongoIndexer<GeoTemporalMon updated = Event.builder(old.get()); } - final URI pred = statement.getObject().getDataType(); + final IRI pred = statement.getObject().getDataType(); if(pred.equals(GeoConstants.GEO_AS_WKT) || pred.equals(GeoConstants.GEO_AS_GML) || pred.equals(GeoConstants.XMLSCHEMA_OGC_WKT) || pred.equals(GeoConstants.XMLSCHEMA_OGC_GML)) { //is geo http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java index 634359f..0043e04 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java @@ -28,8 +28,8 @@ import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.indexing.accumulo.geo.GeoParseUtils; import org.apache.rya.indexing.mongodb.IndexingMongoDBStorageStrategy; import org.bson.Document; -import org.openrdf.model.Statement; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObjectBuilder; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java index 2abee76..9c23b51 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java @@ -31,15 +31,14 @@ import org.apache.rya.indexing.accumulo.geo.GeoTupleSet.GeoSearchFunctionFactory import org.apache.rya.indexing.mongodb.AbstractMongoIndexer; import org.apache.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQuery; import org.apache.rya.mongodb.MongoDBRdfConfiguration; -import org.openrdf.model.Statement; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; import com.mongodb.DBObject; import com.vividsolutions.jts.geom.Geometry; -import info.aduna.iteration.CloseableIteration; - public class MongoGeoIndexer extends AbstractMongoIndexer<GeoMongoDBStorageStrategy> implements GeoIndexer { private static final String COLLECTION_SUFFIX = "geo"; private static final Logger logger = Logger.getLogger(MongoGeoIndexer.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java index c564d02..7ec141d 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java @@ -1,21 +1,3 @@ -package org.apache.rya.indexing.mongodb.geo; - -import java.util.Map; -import java.util.Set; - -import org.apache.hadoop.conf.Configuration; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; - -import com.google.common.base.Joiner; -import com.google.common.collect.Maps; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -34,9 +16,12 @@ import com.vividsolutions.jts.io.WKTReader; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing.mongodb.geo; +import java.util.Map; +import java.util.Set; -import info.aduna.iteration.CloseableIteration; +import org.apache.hadoop.conf.Configuration; import org.apache.rya.indexing.GeoConstants; import org.apache.rya.indexing.GeoIndexer; import org.apache.rya.indexing.IndexingExpr; @@ -45,6 +30,18 @@ import org.apache.rya.indexing.SearchFunction; import org.apache.rya.indexing.StatementConstraints; import org.apache.rya.indexing.accumulo.geo.GeoTupleSet; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; + +import com.google.common.base.Joiner; +import com.google.common.collect.Maps; +import com.vividsolutions.jts.geom.Geometry; +import com.vividsolutions.jts.io.ParseException; +import com.vividsolutions.jts.io.WKTReader; public class MongoGeoTupleSet extends ExternalTupleSet { @@ -114,7 +111,7 @@ public class MongoGeoTupleSet extends ExternalTupleSet { throws QueryEvaluationException { - URI funcURI = filterInfo.getFunction(); + IRI funcURI = filterInfo.getFunction(); SearchFunction searchFunction = (new MongoGeoSearchFunctionFactory(conf)).getSearchFunction(funcURI); if(filterInfo.getArguments().length > 1) { throw new IllegalArgumentException("Index functions do not support more than two arguments."); @@ -133,7 +130,7 @@ public class MongoGeoTupleSet extends ExternalTupleSet { Configuration conf; - private final Map<URI, SearchFunction> SEARCH_FUNCTION_MAP = Maps.newHashMap(); + private final Map<IRI, SearchFunction> SEARCH_FUNCTION_MAP = Maps.newHashMap(); public MongoGeoSearchFunctionFactory(Configuration conf) { this.conf = conf; @@ -146,7 +143,7 @@ public class MongoGeoTupleSet extends ExternalTupleSet { * @param searchFunction * @return */ - public SearchFunction getSearchFunction(final URI searchFunction) { + public SearchFunction getSearchFunction(final IRI searchFunction) { SearchFunction geoFunc = null; @@ -159,7 +156,7 @@ public class MongoGeoTupleSet extends ExternalTupleSet { return geoFunc; } - private SearchFunction getSearchFunctionInternal(final URI searchFunction) throws QueryEvaluationException { + private SearchFunction getSearchFunctionInternal(final IRI searchFunction) throws QueryEvaluationException { SearchFunction sf = SEARCH_FUNCTION_MAP.get(searchFunction); if (sf != null) { 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/GeoTemporalProviderTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalProviderTest.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalProviderTest.java index 9f60e2e..d5b6e79 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalProviderTest.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalProviderTest.java @@ -31,10 +31,10 @@ import org.apache.rya.indexing.geotemporal.model.EventQueryNode; import org.apache.rya.indexing.geotemporal.storage.EventStorage; import org.junit.Before; import org.junit.Test; -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.SimpleValueFactory; public class GeoTemporalProviderTest { private static final String URI_PROPERTY_AT_TIME = "Property:atTime"; @@ -51,10 +51,10 @@ public class GeoTemporalProviderTest { */ @Test public void twoPatternsTwoFilters_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Value geo = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); final Value temp = vf.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + "PREFIX geos: <http://www.opengis.net/def/function/geosparql/>" + @@ -72,10 +72,10 @@ public class GeoTemporalProviderTest { @Test public void onePatternTwoFilters_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Value geo = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); final Value temp = vf.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + "PREFIX geos: <http://www.opengis.net/def/function/geosparql/>" + @@ -92,10 +92,10 @@ public class GeoTemporalProviderTest { @Test public void twoPatternsOneFilter_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Value geo = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); final Value temp = vf.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + "PREFIX geos: <http://www.opengis.net/def/function/geosparql/>" + @@ -112,8 +112,8 @@ public class GeoTemporalProviderTest { @Test public void twoPatternsNoFilter_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + "PREFIX geos: <http://www.opengis.net/def/function/geosparql/>" + @@ -129,10 +129,10 @@ public class GeoTemporalProviderTest { @Test public void twoPatternsTwoFiltersNotValid_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Value geo = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); final Value temp = vf.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); //Only handles geo and temporal filters final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + @@ -151,10 +151,10 @@ public class GeoTemporalProviderTest { @Test public void twoSubjOneFilter_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Value geo = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); final Value temp = vf.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + "PREFIX geos: <http://www.opengis.net/def/function/geosparql/>" + @@ -174,10 +174,10 @@ public class GeoTemporalProviderTest { @Test public void twoNode_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Value geo = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); final Value temp = vf.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + "PREFIX geos: <http://www.opengis.net/def/function/geosparql/>" + @@ -199,10 +199,10 @@ public class GeoTemporalProviderTest { @Test public void twoSubjectMultiFilter_test() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Value geo = vf.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); final Value temp = vf.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); - final URI tempPred = vf.createURI(URI_PROPERTY_AT_TIME); + final IRI tempPred = vf.createIRI(URI_PROPERTY_AT_TIME); final String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>" + "PREFIX geos: <http://www.opengis.net/def/function/geosparql/>" + 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/GeoTemporalTestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalTestUtils.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalTestUtils.java index 51b2ba0..a5411d0 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalTestUtils.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/GeoTemporalTestUtils.java @@ -27,14 +27,14 @@ import org.apache.rya.indexing.TemporalInstant; import org.apache.rya.indexing.TemporalInstantRfc3339; import org.apache.rya.indexing.external.matching.QuerySegment; import org.apache.rya.indexing.geotemporal.model.EventQueryNode; +import org.eclipse.rdf4j.query.algebra.FunctionCall; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.ComparisonFailure; import org.mockito.Mockito; -import org.openrdf.query.algebra.FunctionCall; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; @@ -112,7 +112,7 @@ public final class GeoTemporalTestUtils { return collector.getTupleExpr(); } - private static class NodeCollector extends QueryModelVisitorBase<RuntimeException> { + private static class NodeCollector extends AbstractQueryModelVisitor<RuntimeException> { private final List<QueryModelNode> stPatterns = new ArrayList<>(); public List<QueryModelNode> getTupleExpr() { @@ -130,7 +130,7 @@ public final class GeoTemporalTestUtils { } } - private static class FunctionCallCollector extends QueryModelVisitorBase<RuntimeException> { + private static class FunctionCallCollector extends AbstractQueryModelVisitor<RuntimeException> { private final List<FunctionCall> filters = new ArrayList<>(); public List<FunctionCall> getTupleExpr() { 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/MongoGeoTemporalIndexIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java index d629d04..316117b 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java @@ -37,23 +37,23 @@ import org.apache.rya.indexing.geotemporal.mongo.MongoGeoTemporalIndexer; import org.apache.rya.indexing.geotemporal.storage.EventStorage; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; +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.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +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.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; public class MongoGeoTemporalIndexIT extends MongoITBase { private static final String URI_PROPERTY_AT_TIME = "Property:atTime"; - private static final ValueFactory VF = ValueFactoryImpl.getInstance(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Override public void updateConfiguration(final MongoDBRdfConfiguration conf) { @@ -162,19 +162,20 @@ public class MongoGeoTemporalIndexIT extends MongoITBase { } private void addStatements(final SailRepositoryConnection conn) throws Exception { - URI subject = VF.createURI("urn:event1"); - final URI predicate = VF.createURI(URI_PROPERTY_AT_TIME); + IRI subject = VF.createIRI("urn:event1"); + final IRI predicate = VF.createIRI(URI_PROPERTY_AT_TIME); Value object = VF.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); conn.add(VF.createStatement(subject, predicate, object)); object = VF.createLiteral("Point(0 0)", GeoConstants.XMLSCHEMA_OGC_WKT); conn.add(VF.createStatement(subject, GeoConstants.GEO_AS_WKT, object)); - subject = VF.createURI("urn:event2"); + subject = VF.createIRI("urn:event2"); object = VF.createLiteral(new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0).toString()); conn.add(VF.createStatement(subject, predicate, object)); object = VF.createLiteral("Point(1 1)", GeoConstants.XMLSCHEMA_OGC_WKT); conn.add(VF.createStatement(subject, GeoConstants.GEO_AS_WKT, object)); + conn.commit(); } } 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/model/EventQueryNode2IT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java index 9875091..cfcb513 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.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 @@ -18,6 +18,7 @@ */ package org.apache.rya.indexing.geotemporal.model; +import static org.apache.rya.api.domain.VarNameUtils.prependConstant; import static org.apache.rya.indexing.geotemporal.GeoTemporalTestUtils.getFilters; import static org.apache.rya.indexing.geotemporal.GeoTemporalTestUtils.getSps; import static org.junit.Assert.assertEquals; @@ -26,6 +27,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.rya.api.domain.RyaURI; @@ -37,44 +39,42 @@ import org.apache.rya.indexing.TemporalInstantRfc3339; import org.apache.rya.indexing.geotemporal.mongo.MongoEventStorage; import org.apache.rya.indexing.geotemporal.storage.EventStorage; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +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.QueryEvaluationException; +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.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -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.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -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 org.openrdf.query.impl.MapBindingSet; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.PrecisionModel; -import info.aduna.iteration.CloseableIteration; - /** * Integration tests the methods of {@link EventQueryNode}. */ public class EventQueryNode2IT extends MongoITBase { private static final GeometryFactory GF = new GeometryFactory(new PrecisionModel(), 4326); - private static final ValueFactory VF = ValueFactoryImpl.getInstance(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test(expected = IllegalStateException.class) public void constructor_differentSubjects() throws Exception { final Var geoSubj = new Var("point"); - final Var geoPred = new Var("-const-http://www.opengis.net/ont/geosparql#asWKT";, ValueFactoryImpl.getInstance().createURI("http://www.opengis.net/ont/geosparql#asWKT";)); + final Var geoPred = new Var(prependConstant("http://www.opengis.net/ont/geosparql#asWKT";), VF.createIRI("http://www.opengis.net/ont/geosparql#asWKT";)); final Var geoObj = new Var("wkt"); final StatementPattern geoSP = new StatementPattern(geoSubj, geoPred, geoObj); final Var timeSubj = new Var("time"); - final Var timePred = new Var("-const-http://www.w3.org/2006/time#inXSDDateTime";, ValueFactoryImpl.getInstance().createURI("-const-http://www.w3.org/2006/time#inXSDDateTime";)); + final Var timePred = new Var(prependConstant("http://www.w3.org/2006/time#inXSDDateTime";), VF.createIRI(prependConstant("http://www.w3.org/2006/time#inXSDDateTime";))); final Var timeObj = new Var("time"); final StatementPattern timeSP = new StatementPattern(timeSubj, timePred, timeObj); // This will fail. @@ -97,7 +97,7 @@ public class EventQueryNode2IT extends MongoITBase { final StatementPattern geoSP = new StatementPattern(geoSubj, geoPred, geoObj); final Var timeSubj = new Var("time"); - final Var timePred = new Var("-const-http://www.w3.org/2006/time#inXSDDateTime";, ValueFactoryImpl.getInstance().createURI("-const-http://www.w3.org/2006/time#inXSDDateTime";)); + final Var timePred = new Var(prependConstant("http://www.w3.org/2006/time#inXSDDateTime";), VF.createIRI(prependConstant("http://www.w3.org/2006/time#inXSDDateTime";))); final Var timeObj = new Var("time"); final StatementPattern timeSP = new StatementPattern(timeSubj, timePred, timeObj); // This will fail. @@ -252,7 +252,7 @@ public class EventQueryNode2IT extends MongoITBase { final EventQueryNode node = buildNode(storage, query); final MapBindingSet existingBindings = new MapBindingSet(); - existingBindings.addBinding("event", VF.createURI("urn:event-2222")); + existingBindings.addBinding("event", VF.createIRI("urn:event-2222")); final CloseableIteration<BindingSet, QueryEvaluationException> rez = node.evaluate(existingBindings); final MapBindingSet expected = new MapBindingSet(); expected.addBinding("wkt", VF.createLiteral("POINT (-1 -1)")); @@ -304,7 +304,7 @@ public class EventQueryNode2IT extends MongoITBase { final EventQueryNode node = buildNode(storage, query); final MapBindingSet existingBindings = new MapBindingSet(); - existingBindings.addBinding("event", VF.createURI("urn:event-2222")); + existingBindings.addBinding("event", VF.createIRI("urn:event-2222")); final CloseableIteration<BindingSet, QueryEvaluationException> rez = node.evaluate(existingBindings); final MapBindingSet expected = new MapBindingSet(); expected.addBinding("wkt", VF.createLiteral("POINT (-1 -1)")); @@ -313,15 +313,16 @@ public class EventQueryNode2IT extends MongoITBase { assertFalse(rez.hasNext()); } - private EventQueryNode buildNode(final EventStorage store, final String query) throws Exception { + private static EventQueryNode buildNode(final EventStorage store, final String query) throws Exception { final List<IndexingExpr> geoFilters = new ArrayList<>(); final List<IndexingExpr> temporalFilters = new ArrayList<>(); 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 { @@ -342,7 +343,7 @@ public class EventQueryNode2IT extends MongoITBase { .build(); } - 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) {
