http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPCJIndexIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPCJIndexIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPCJIndexIT.java index 1503b53..c169dac 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPCJIndexIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPCJIndexIT.java @@ -33,21 +33,21 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.Statement; +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.TupleQuery; +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.Statement; -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.TupleQuery; -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 MongoPCJIndexIT extends MongoITBase { - private static final ValueFactory VF = ValueFactoryImpl.getInstance(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Override protected void updateConfiguration(final MongoDBRdfConfiguration conf) { @@ -96,27 +96,27 @@ public class MongoPCJIndexIT extends MongoITBase { final Set<BindingSet> expectedResults = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:Alice")); + bs.addBinding("name", VF.createIRI("urn:Alice")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:Bob")); + bs.addBinding("name", VF.createIRI("urn:Bob")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:Charlie")); + bs.addBinding("name", VF.createIRI("urn:Charlie")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:David")); + bs.addBinding("name", VF.createIRI("urn:David")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:Eve")); + bs.addBinding("name", VF.createIRI("urn:Eve")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:Frank")); + bs.addBinding("name", VF.createIRI("urn:Frank")); expectedResults.add(bs); assertEquals(6, results.size()); @@ -173,15 +173,15 @@ public class MongoPCJIndexIT extends MongoITBase { MapBindingSet bs = new MapBindingSet(); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:David")); + bs.addBinding("name", VF.createIRI("urn:David")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:Eve")); + bs.addBinding("name", VF.createIRI("urn:Eve")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", VF.createURI("urn:Frank")); + bs.addBinding("name", VF.createIRI("urn:Frank")); expectedResults.add(bs); assertEquals(3, results.size()); @@ -202,32 +202,32 @@ public class MongoPCJIndexIT extends MongoITBase { private Set<Statement> getStatements() throws Exception { final Set<Statement> statements = new HashSet<>(); - statements.add(VF.createStatement(VF.createURI("urn:Alice"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:Bob"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:Charlie"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:David"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:Eve"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:Frank"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:George"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:Hillary"), VF.createURI("urn:likes"), VF.createURI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:Alice"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:Bob"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:Charlie"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:David"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:Eve"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:Frank"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:George"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); + statements.add(VF.createStatement(VF.createIRI("urn:Hillary"), VF.createIRI("urn:likes"), VF.createIRI("urn:icecream"))); - statements.add(VF.createStatement(VF.createURI("urn:Alice"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:Bob"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:Charlie"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:David"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:Eve"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:Frank"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:George"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:green"))); - statements.add(VF.createStatement(VF.createURI("urn:Hillary"), VF.createURI("urn:hasEyeColor"), VF.createURI("urn:brown"))); + statements.add(VF.createStatement(VF.createIRI("urn:Alice"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:Bob"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:Charlie"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:David"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:Eve"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:Frank"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:George"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:green"))); + statements.add(VF.createStatement(VF.createIRI("urn:Hillary"), VF.createIRI("urn:hasEyeColor"), VF.createIRI("urn:brown"))); - statements.add(VF.createStatement(VF.createURI("urn:Alice"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:Bob"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:Charlie"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:blue"))); - statements.add(VF.createStatement(VF.createURI("urn:David"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:brown"))); - statements.add(VF.createStatement(VF.createURI("urn:Eve"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:brown"))); - statements.add(VF.createStatement(VF.createURI("urn:Frank"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:brown"))); - statements.add(VF.createStatement(VF.createURI("urn:George"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:blonde"))); - statements.add(VF.createStatement(VF.createURI("urn:Hillary"), VF.createURI("urn:hasHairColor"), VF.createURI("urn:blonde"))); + statements.add(VF.createStatement(VF.createIRI("urn:Alice"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:Bob"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:Charlie"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:blue"))); + statements.add(VF.createStatement(VF.createIRI("urn:David"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:brown"))); + statements.add(VF.createStatement(VF.createIRI("urn:Eve"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:brown"))); + statements.add(VF.createStatement(VF.createIRI("urn:Frank"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:brown"))); + statements.add(VF.createStatement(VF.createIRI("urn:George"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:blonde"))); + statements.add(VF.createStatement(VF.createIRI("urn:Hillary"), VF.createIRI("urn:hasHairColor"), VF.createIRI("urn:blonde"))); return statements; } } \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java index af81cf6..ea58d11 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java @@ -38,42 +38,44 @@ import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.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.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +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.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -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.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; import com.google.common.collect.Lists; public class MongoPcjIntegrationTest extends MongoITBase { - private static final URI talksTo = new URIImpl("uri:talksTo"); - private static final URI sub = new URIImpl("uri:entity"); - private static final URI sub2 = new URIImpl("uri:entity2"); - private static final URI subclass = new URIImpl("uri:class"); - private static final URI subclass2 = new URIImpl("uri:class2"); - private static final URI obj = new URIImpl("uri:obj"); - private static final URI obj2 = new URIImpl("uri:obj2"); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + + private static final IRI talksTo = VF.createIRI("uri:talksTo"); + private static final IRI sub = VF.createIRI("uri:entity"); + private static final IRI sub2 = VF.createIRI("uri:entity2"); + private static final IRI subclass = VF.createIRI("uri:class"); + private static final IRI subclass2 = VF.createIRI("uri:class2"); + private static final IRI obj = VF.createIRI("uri:obj"); + private static final IRI obj2 = VF.createIRI("uri:obj2"); private void addPCJS(final SailRepositoryConnection conn) throws Exception { conn.add(sub, RDF.TYPE, subclass); - conn.add(sub, RDFS.LABEL, new LiteralImpl("label")); + conn.add(sub, RDFS.LABEL, VF.createLiteral("label")); conn.add(sub, talksTo, obj); conn.add(sub2, RDF.TYPE, subclass2); - conn.add(sub2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(sub2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub2, talksTo, obj2); } @@ -135,13 +137,13 @@ public class MongoPcjIntegrationTest extends MongoITBase { final SailRepositoryConnection pcjConn = new SailRepository(pcjSail).getConnection(); addPCJS(pcjConn); try { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -178,13 +180,13 @@ public class MongoPcjIntegrationTest extends MongoITBase { final SailRepositoryConnection pcjConn = new SailRepository(pcjSail).getConnection(); addPCJS(pcjConn); try { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -252,17 +254,17 @@ public class MongoPcjIntegrationTest extends MongoITBase { final SailRepositoryConnection pcjConn = new SailRepository(pcjSail).getConnection(); addPCJS(pcjConn); try { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); - final URI howlsAt = new URIImpl("uri:howlsAt"); - final URI subType = new URIImpl("uri:subType"); - final URI superSuperclass = new URIImpl("uri:super_superclass"); + final IRI howlsAt = VF.createIRI("uri:howlsAt"); + final IRI subType = VF.createIRI("uri:subType"); + final IRI superSuperclass = VF.createIRI("uri:super_superclass"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub, howlsAt, superclass); conn.add(superclass, subType, superSuperclass); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java index e92bcbb..5a7598e 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java @@ -40,14 +40,14 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.mongodb.temporal.MongoTemporalIndexer; 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.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.query.QueryEvaluationException; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.QueryEvaluationException; import com.mongodb.DB; import com.mongodb.DBCollection; @@ -56,8 +56,6 @@ import com.mongodb.DBObject; import com.mongodb.MongoException; import com.mongodb.MongoSecurityException; -import info.aduna.iteration.CloseableIteration; - /** * JUnit tests for TemporalIndexer and it's implementation MongoTemporalIndexer * @@ -138,23 +136,23 @@ public final class MongoTemporalIndexerIT extends MongoITBase { static { // Setup the statements only once. Each test will store some of these in there own index table. - final ValueFactory vf = new ValueFactoryImpl(); - final URI pred1_atTime = vf.createURI(URI_PROPERTY_AT_TIME); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final IRI pred1_atTime = vf.createIRI(URI_PROPERTY_AT_TIME); // tiB03_E20 read as: time interval that Begins 3 seconds, ends at 20 seconds, // Each time element the same, except seconds. year, month, .... minute are the same for each statement below. - spo_B00_E01 = new StatementImpl(vf.createURI("foo:event0"), pred1_atTime, vf.createLiteral(tvB00_E01.toString())); - spo_B02_E29 = new StatementImpl(vf.createURI("foo:event2"), pred1_atTime, vf.createLiteral(tvB02_E29.toString())); - spo_B02_E30 = new StatementImpl(vf.createURI("foo:event2"), pred1_atTime, vf.createLiteral(tvB02_E30.toString())); - spo_B02_E31 = new StatementImpl(vf.createURI("foo:event3"), pred1_atTime, vf.createLiteral(tvB02_E31.toString())); - spo_B02_E40 = new StatementImpl(vf.createURI("foo:event4"), pred1_atTime, vf.createLiteral(tvB02_E40.toString())); - spo_B03_E20 = new StatementImpl(vf.createURI("foo:event5"), pred1_atTime, vf.createLiteral(tvB03_E20.toString())); - spo_B29_E30 = new StatementImpl(vf.createURI("foo:event1"), pred1_atTime, vf.createLiteral(tvB29_E30.toString())); - spo_B30_E32 = new StatementImpl(vf.createURI("foo:event1"), pred1_atTime, vf.createLiteral(tvB30_E32.toString())); - spo_B02 = new StatementImpl(vf.createURI("foo:event6"), pred1_atTime, vf.createLiteral(tsB02.getAsReadable())); + spo_B00_E01 = vf.createStatement(vf.createIRI("foo:event0"), pred1_atTime, vf.createLiteral(tvB00_E01.toString())); + spo_B02_E29 = vf.createStatement(vf.createIRI("foo:event2"), pred1_atTime, vf.createLiteral(tvB02_E29.toString())); + spo_B02_E30 = vf.createStatement(vf.createIRI("foo:event2"), pred1_atTime, vf.createLiteral(tvB02_E30.toString())); + spo_B02_E31 = vf.createStatement(vf.createIRI("foo:event3"), pred1_atTime, vf.createLiteral(tvB02_E31.toString())); + spo_B02_E40 = vf.createStatement(vf.createIRI("foo:event4"), pred1_atTime, vf.createLiteral(tvB02_E40.toString())); + spo_B03_E20 = vf.createStatement(vf.createIRI("foo:event5"), pred1_atTime, vf.createLiteral(tvB03_E20.toString())); + spo_B29_E30 = vf.createStatement(vf.createIRI("foo:event1"), pred1_atTime, vf.createLiteral(tvB29_E30.toString())); + spo_B30_E32 = vf.createStatement(vf.createIRI("foo:event1"), pred1_atTime, vf.createLiteral(tvB30_E32.toString())); + spo_B02 = vf.createStatement(vf.createIRI("foo:event6"), pred1_atTime, vf.createLiteral(tsB02.getAsReadable())); // Create statements about time instants 0 - 40 seconds for (int i = 0; i < seriesTs.length; i++) { - seriesSpo[i] = new StatementImpl(vf.createURI("foo:event0" + i), pred1_atTime, vf.createLiteral(seriesTs[i].getAsReadable())); + seriesSpo[i] = vf.createStatement(vf.createIRI("foo:event0" + i), pred1_atTime, vf.createLiteral(seriesTs[i].getAsReadable())); } } @@ -169,7 +167,7 @@ public final class MongoTemporalIndexerIT extends MongoITBase { } /** - * Test method for {@link MongoTemporalIndexer#storeStatement(convertStatement(org.openrdf.model.Statement)} + * Test method for {@link MongoTemporalIndexer#storeStatement(convertStatement(org.eclipse.rdf4j.model.Statement)} */ @Test public void testStoreStatement() throws IOException { @@ -177,17 +175,17 @@ public final class MongoTemporalIndexerIT extends MongoITBase { tIndexer.setConf(conf); tIndexer.init(); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); - final URI pred1_atTime = vf.createURI(URI_PROPERTY_AT_TIME); - final URI pred2_circa = vf.createURI(URI_PROPERTY_CIRCA); + final IRI pred1_atTime = vf.createIRI(URI_PROPERTY_AT_TIME); + final IRI pred2_circa = vf.createIRI(URI_PROPERTY_CIRCA); // Should not be stored because they are not in the predicate list final String validDateStringWithThirteens = "1313-12-13T13:13:13Z"; - tIndexer.storeStatement(convertStatement(new StatementImpl(vf.createURI("foo:subj1"), RDFS.LABEL, vf.createLiteral(validDateStringWithThirteens)))); + tIndexer.storeStatement(convertStatement(vf.createStatement(vf.createIRI("foo:subj1"), RDFS.LABEL, vf.createLiteral(validDateStringWithThirteens)))); final String invalidDateString = "ThisIsAnInvalidDate"; - tIndexer.storeStatement(convertStatement(new StatementImpl(vf.createURI("foo:subj2"), pred1_atTime, vf.createLiteral(invalidDateString)))); + tIndexer.storeStatement(convertStatement(vf.createStatement(vf.createIRI("foo:subj2"), pred1_atTime, vf.createLiteral(invalidDateString)))); // These are different datetimes instant but from different time zones. // This is an arbitrary zone, BRST=Brazil, better if not local. @@ -198,13 +196,13 @@ public final class MongoTemporalIndexerIT extends MongoITBase { // These should be stored because they are in the predicate list. // BUT they will get converted to the same exact datetime in UTC. - final Statement s3 = new StatementImpl(vf.createURI("foo:subj3"), pred1_atTime, vf.createLiteral(testDate2014InBRST)); - final Statement s4 = new StatementImpl(vf.createURI("foo:subj4"), pred2_circa, vf.createLiteral(testDate2016InET)); + final Statement s3 = vf.createStatement(vf.createIRI("foo:subj3"), pred1_atTime, vf.createLiteral(testDate2014InBRST)); + final Statement s4 = vf.createStatement(vf.createIRI("foo:subj4"), pred2_circa, vf.createLiteral(testDate2016InET)); tIndexer.storeStatement(convertStatement(s3)); tIndexer.storeStatement(convertStatement(s4)); // This should not be stored because the object is not a literal - tIndexer.storeStatement(convertStatement(new StatementImpl(vf.createURI("foo:subj5"), pred1_atTime, vf.createURI("in:valid")))); + tIndexer.storeStatement(convertStatement(vf.createStatement(vf.createIRI("foo:subj5"), pred1_atTime, vf.createIRI("in:valid")))); printTables(tIndexer, "junit testing: Temporal entities stored in testStoreStatement"); assertEquals(2, tIndexer.getCollection().find().count()); @@ -217,18 +215,18 @@ public final class MongoTemporalIndexerIT extends MongoITBase { tIndexer.setConf(conf); tIndexer.init(); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); - final URI pred1_atTime = vf.createURI(URI_PROPERTY_AT_TIME); - final URI pred2_circa = vf.createURI(URI_PROPERTY_CIRCA); + final IRI pred1_atTime = vf.createIRI(URI_PROPERTY_AT_TIME); + final IRI pred2_circa = vf.createIRI(URI_PROPERTY_CIRCA); final String testDate2014InBRST = "2014-12-31T23:59:59-02:00"; final String testDate2016InET = "2016-12-31T20:59:59-05:00"; // These should be stored because they are in the predicate list. // BUT they will get converted to the same exact datetime in UTC. - final Statement s1 = new StatementImpl(vf.createURI("foo:subj3"), pred1_atTime, vf.createLiteral(testDate2014InBRST)); - final Statement s2 = new StatementImpl(vf.createURI("foo:subj4"), pred2_circa, vf.createLiteral(testDate2016InET)); + final Statement s1 = vf.createStatement(vf.createIRI("foo:subj3"), pred1_atTime, vf.createLiteral(testDate2014InBRST)); + final Statement s2 = vf.createStatement(vf.createIRI("foo:subj4"), pred2_circa, vf.createLiteral(testDate2016InET)); tIndexer.storeStatement(convertStatement(s1)); tIndexer.storeStatement(convertStatement(s2)); @@ -649,15 +647,15 @@ public final class MongoTemporalIndexerIT extends MongoITBase { for (int s = 0; s <= searchForSeconds + expectedResultCount; s++) { // <== logic here tIndexer.storeStatement(convertStatement(seriesSpo[s])); } - final ValueFactory vf = new ValueFactoryImpl(); - final URI pred3_CIRCA_ = vf.createURI(URI_PROPERTY_CIRCA); // this one to ignore. - final URI pred2_eventTime = vf.createURI(URI_PROPERTY_EVENT_TIME); - final URI pred1_atTime = vf.createURI(URI_PROPERTY_AT_TIME); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final IRI pred3_CIRCA_ = vf.createIRI(URI_PROPERTY_CIRCA); // this one to ignore. + final IRI pred2_eventTime = vf.createIRI(URI_PROPERTY_EVENT_TIME); + final IRI pred1_atTime = vf.createIRI(URI_PROPERTY_AT_TIME); // add the predicate = EventTime ; Store in an array for verification. final Statement[] SeriesTs_EventTime = new Statement[expectedResultCount+1]; for (int s = 0; s <= searchForSeconds + expectedResultCount; s++) { // <== logic here - final Statement statement = new StatementImpl(vf.createURI("foo:EventTimeSubj0" + s), pred2_eventTime, vf.createLiteral(seriesTs[s].getAsReadable())); + final Statement statement = vf.createStatement(vf.createIRI("foo:EventTimeSubj0" + s), pred2_eventTime, vf.createLiteral(seriesTs[s].getAsReadable())); tIndexer.storeStatement(convertStatement(statement)); if (s>searchForSeconds) { SeriesTs_EventTime[s - searchForSeconds -1 ] = statement; @@ -665,7 +663,7 @@ public final class MongoTemporalIndexerIT extends MongoITBase { } // add the predicate = CIRCA ; to be ignored because it is not in the constraints. for (int s = 0; s <= searchForSeconds + expectedResultCount; s++) { // <== logic here - final Statement statement = new StatementImpl(vf.createURI("foo:CircaEventSubj0" + s), pred3_CIRCA_, vf.createLiteral(seriesTs[s].getAsReadable())); + final Statement statement = vf.createStatement(vf.createIRI("foo:CircaEventSubj0" + s), pred3_CIRCA_, vf.createLiteral(seriesTs[s].getAsReadable())); tIndexer.storeStatement(convertStatement(statement)); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/FlattenedOptionalTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/FlattenedOptionalTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/FlattenedOptionalTest.java index 8f2cb8c..4136ab7 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/FlattenedOptionalTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/FlattenedOptionalTest.java @@ -17,20 +17,21 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ + import java.util.ArrayList; import java.util.List; import org.apache.rya.indexing.external.matching.FlattenedOptional; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class FlattenedOptionalTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcherTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcherTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcherTest.java index 8e61840..3258c02 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcherTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcherTest.java @@ -18,7 +18,7 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ - + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -27,19 +27,19 @@ import org.apache.rya.indexing.external.matching.ExternalSetMatcher; import org.apache.rya.indexing.external.matching.QuerySegmentFactory; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class JoinSegmentPCJMatcherTest { @@ -139,7 +139,7 @@ public class JoinSegmentPCJMatcherTest { - static class QueryNodeGatherer extends QueryModelVisitorBase<RuntimeException> { + static class QueryNodeGatherer extends AbstractQueryModelVisitor<RuntimeException> { private static Set<QueryModelNode> nodes; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentTest.java index 71b24fc..e38a157 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/JoinSegmentTest.java @@ -18,7 +18,7 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ - + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -28,16 +28,16 @@ import org.apache.rya.indexing.external.matching.QuerySegmentFactory; import org.apache.rya.indexing.external.matching.TopOfQueryFilterRelocator; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class JoinSegmentTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcherTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcherTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcherTest.java index 5064572..577baed 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcherTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcherTest.java @@ -18,7 +18,7 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ - + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -28,20 +28,20 @@ import org.apache.rya.indexing.external.matching.FlattenedOptional; import org.apache.rya.indexing.external.matching.QuerySegmentFactory; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Union; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Union; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class OptionalJoinSegmentPCJMatcherTest { @@ -251,7 +251,7 @@ public class OptionalJoinSegmentPCJMatcherTest { - static class LeftJoinQueryNodeGatherer extends QueryModelVisitorBase<RuntimeException> { + static class LeftJoinQueryNodeGatherer extends AbstractQueryModelVisitor<RuntimeException> { private static Set<QueryModelNode> nodes; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentTest.java index 2a9d12a..dc3a8ef 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentTest.java @@ -18,7 +18,7 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ - + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -28,17 +28,17 @@ import org.apache.rya.indexing.external.matching.QuerySegmentFactory; import org.apache.rya.indexing.external.matching.TopOfQueryFilterRelocator; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class OptionalJoinSegmentTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidatorTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidatorTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidatorTest.java index 607e072..e91c7a2 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidatorTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidatorTest.java @@ -17,25 +17,25 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ + import java.util.ArrayList; import java.util.List; -import org.apache.rya.indexing.external.matching.OptionalJoinSegment; import org.apache.rya.indexing.external.matching.QueryNodeConsolidator; import org.apache.rya.indexing.external.matching.QuerySegment; import org.apache.rya.indexing.external.matching.QuerySegmentFactory; import org.apache.rya.indexing.external.matching.TopOfQueryFilterRelocator; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class PCJNodeConsolidatorTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java index d28d826..0d80797 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java @@ -18,6 +18,7 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ + import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -33,17 +34,17 @@ import org.apache.rya.indexing.pcj.matching.provider.AbstractPcjIndexSetProvider import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; import org.apache.rya.mongodb.EmbeddedMongoSingleton; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -548,7 +549,7 @@ public class PCJOptimizerTest { } - public static class NodeCollector extends QueryModelVisitorBase<RuntimeException> { + public static class NodeCollector extends AbstractQueryModelVisitor<RuntimeException> { List<QueryModelNode> qNodes = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java index f56500a..48ed202 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java @@ -17,15 +17,15 @@ package org.apache.rya.indexing.pcj.matching; * specific language governing permissions and limitations * under the License. */ -import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; +import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class PCJOptimizerUtilitesTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java index 85d27e3..fa55df4 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java @@ -63,11 +63,10 @@ import org.apache.rya.indexing.mongodb.update.RyaObjectStorage.ObjectStorageExce import org.apache.rya.indexing.smarturi.SmartUriException; import org.apache.rya.indexing.smarturi.duplication.conf.DuplicateDataConfig; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.joda.time.DateTime; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -80,7 +79,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { private static final String RYA_INSTANCE_NAME = "testInstance"; private static final String NAMESPACE = RyaSchema.NAMESPACE; - private static final ValueFactory VALUE_FACTORY = ValueFactoryImpl.getInstance(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); // People private static final RyaURI BOB = createRyaUri("Bob"); @@ -131,7 +130,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { * @return the {@link RyraURI}. */ private static RyaURI createRyaUri(final String namespace, final String localName) { - return RdfToRyaConversions.convertURI(VALUE_FACTORY.createURI(namespace, localName)); + return RdfToRyaConversions.convertURI(VF.createIRI(namespace, localName)); } private static Entity createBobEntity() { @@ -151,7 +150,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { .setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime()).minusYears(40)))) .setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(NOW))) .setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(true))) - .setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(new URIImpl("mailto:[email protected]";)))) + .setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:[email protected]";)))) .setProperty(PERSON_TYPE_URI, new Property(HAS_ATTRIBUTE_SPACE, stringRyaType("attribute space"))) .setProperty(PERSON_TYPE_URI, new Property(HAS_MOTTO, stringRyaType("!@#*\\&%20^ smörgåsbord"))) .setProperty(PERSON_TYPE_URI, new Property(HAS_BLOOD_TYPE, stringRyaType("A+ blood type"))) @@ -291,7 +290,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testBooleanProperty() throws SmartUriException { System.out.println("Boolean Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(false, tolerance, false)); @@ -326,7 +325,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testByteProperty() throws SmartUriException { System.out.println("Byte Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(Byte.MIN_VALUE, tolerance, false)); @@ -410,7 +409,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { public void testDateProperty() throws SmartUriException { System.out.println("Date Property Test"); final long ONE_YEAR_IN_MILLIS = 1000L * 60L * 60L * 24L * 365L; - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(new Date(0L), tolerance, false)); @@ -591,7 +590,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { System.out.println("DateTime Property Test"); final DateTime dob = new DateTime(NOW).minusYears(40); final long ONE_YEAR_IN_MILLIS = 1000L * 60L * 60L * 24L * 365L; - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(new DateTime(0L), tolerance, false)); @@ -770,7 +769,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testDoubleProperty() throws SmartUriException { System.out.println("Double Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(Double.MIN_VALUE, tolerance, false)); @@ -950,7 +949,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testFloatProperty() throws SmartUriException { System.out.println("Float Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(Float.MIN_VALUE, tolerance, false)); @@ -1117,7 +1116,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testIntegerProperty() throws SmartUriException { System.out.println("Integer Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(Integer.MIN_VALUE, tolerance, false)); @@ -1254,7 +1253,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testLongProperty() throws SmartUriException { System.out.println("Long Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(Long.MIN_VALUE, tolerance, false)); @@ -1373,7 +1372,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testShortProperty() throws SmartUriException { System.out.println("Short Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput(Short.MIN_VALUE, tolerance, false)); @@ -1482,7 +1481,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testStringProperty() throws SmartUriException { System.out.println("String Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); builder.add(new TestInput("123 Wrong St. Washington, DC 20024", tolerance, false)); @@ -1553,74 +1552,74 @@ public class DuplicateDataDetectorIT extends MongoITBase { @Test public void testUriProperty() throws SmartUriException { System.out.println("URI Property Test"); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 0.0 Tolerance tolerance = new Tolerance(0.0, ToleranceType.DIFFERENCE); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); // Equals value + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); // Equals value // Tolerance 1.0 tolerance = new Tolerance(1.0, ToleranceType.DIFFERENCE); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); // Equals value + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); // Equals value // Tolerance 2.0 tolerance = new Tolerance(2.0, ToleranceType.DIFFERENCE); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); // Equals value + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); // Equals value // Tolerance 0.0% tolerance = new Tolerance(0.00, ToleranceType.PERCENTAGE); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); // Equals value + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); // Equals value // Tolerance 5.0% tolerance = new Tolerance(0.05, ToleranceType.PERCENTAGE); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, false)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); // Equals value + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, false)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); // Equals value // Tolerance 100.0% tolerance = new Tolerance(1.00, ToleranceType.PERCENTAGE); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); - builder.add(new TestInput(new URIImpl("mailto:[email protected]";), tolerance, true)); // Equals value + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); + builder.add(new TestInput(VF.createIRI("mailto:[email protected]";), tolerance, true)); // Equals value final ImmutableList<TestInput> testInputs = builder.build(); @@ -1691,7 +1690,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { "blue" ) ); - final ImmutableList.Builder<TestInput> builder = ImmutableList.<TestInput>builder(); + final ImmutableList.Builder<TestInput> builder = ImmutableList.builder(); // Tolerance 1.0 - tolerance doesn't apply to equivalents but is still needed for the test final Tolerance tolerance = new Tolerance(1.0, ToleranceType.DIFFERENCE); // Color equivalents @@ -1813,7 +1812,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 1).minusYears(40)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 1)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(true))); - duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(new URIImpl("mailto:[email protected]";)))); + duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:[email protected]";)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("124 Fake St. Washington, DC 20024"))); duplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 556))); final Entity duplicateBobEntity = duplicateBobBuilder.build(); @@ -1841,7 +1840,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 10000000L).minusYears(40)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 10000000L)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(false))); - notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(new URIImpl("mailto:[email protected]";)))); + notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:[email protected]";)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("123456789 Fake St. Washington, DC 20024"))); notDuplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 1000))); final Entity notDuplicateBobEntity = notDuplicateBobBuilder.build(); @@ -1904,7 +1903,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 1).minusYears(40)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 1)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(true))); - duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(new URIImpl("mailto:[email protected]";)))); + duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:[email protected]";)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("124 Fake St. Washington, DC 20024"))); duplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 556))); final Entity duplicateBobEntity = duplicateBobBuilder.build(); @@ -1930,7 +1929,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 10000000L).minusYears(40)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 10000000L)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(false))); - notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(new URIImpl("mailto:[email protected]";)))); + notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:[email protected]";)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("123456789 Fake St. Washington, DC 20024"))); notDuplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 1000))); final Entity notDuplicateBobEntity = notDuplicateBobBuilder.build();
