http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java index 2b14f6e..6bddd85 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetTest.java @@ -18,6 +18,7 @@ */ package org.apache.rya.indexing.external.tupleSet; +import java.math.BigInteger; import java.net.UnknownHostException; import java.util.HashMap; import java.util.HashSet; @@ -30,35 +31,6 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.hadoop.conf.Configuration; -import org.apache.rya.indexing.pcj.storage.PcjException; -import org.apache.rya.indexing.pcj.storage.accumulo.PcjTableNameFactory; -import org.apache.rya.indexing.pcj.storage.accumulo.PcjVarOrderFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.NumericLiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.SailException; - -import com.google.common.base.Optional; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - -import info.aduna.iteration.CloseableIteration; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.persist.RyaDAOException; @@ -66,9 +38,33 @@ import org.apache.rya.api.resolver.RyaTypeResolverException; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.external.PcjIntegrationTestingUtil; import org.apache.rya.indexing.pcj.matching.QueryVariableNormalizer; +import org.apache.rya.indexing.pcj.storage.PcjException; +import org.apache.rya.indexing.pcj.storage.accumulo.PcjTableNameFactory; import org.apache.rya.rdftriplestore.RyaSailRepository; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +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.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.sail.SailException; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.google.common.base.Optional; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; public class AccumuloIndexSetTest { @@ -77,6 +73,7 @@ public class AccumuloIndexSetTest { protected RepositoryConnection ryaConn = null; protected Configuration conf = getConf(); protected String prefix = "rya_"; + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Before public void init() throws AccumuloException, AccumuloSecurityException, @@ -104,14 +101,14 @@ public class AccumuloIndexSetTest { RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -128,7 +125,7 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName); @@ -139,18 +136,18 @@ public class AccumuloIndexSetTest { } // Ensure the expected results match those that were stored. final QueryBindingSet alice = new QueryBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final QueryBindingSet bob = new QueryBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final QueryBindingSet charlie = new QueryBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); - final Set<BindingSet> expectedResults = Sets.<BindingSet>newHashSet(alice, bob, charlie); + final Set<BindingSet> expectedResults = Sets.newHashSet(alice, bob, charlie); Assert.assertEquals(expectedResults, fetchedResults); } @@ -167,14 +164,14 @@ public class AccumuloIndexSetTest { RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -192,17 +189,17 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("name",new URIImpl("http://Alice";)); - bs.addBinding("location",new URIImpl("http://Virginia";)); + bs.addBinding("name",VF.createIRI("http://Alice";)); + bs.addBinding("location",VF.createIRI("http://Virginia";)); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bs); - bs.addBinding("age",new NumericLiteralImpl(14, XMLSchema.INTEGER)); + bs.addBinding("age",VF.createLiteral(BigInteger.valueOf(14))); Assert.assertEquals(bs, results.next()); } @@ -211,14 +208,14 @@ public class AccumuloIndexSetTest { RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -236,31 +233,31 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs.addBinding("name",new URIImpl("http://Alice";)); + bs.addBinding("birthDate",VF.createLiteral("1983-03-17",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs.addBinding("name",VF.createIRI("http://Alice";)); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("birthDate",new LiteralImpl("1983-04-18",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs2.addBinding("name",new URIImpl("http://Bob";)); + bs2.addBinding("birthDate",VF.createLiteral("1983-04-18",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs2.addBinding("name",VF.createIRI("http://Bob";)); - final Set<BindingSet> bSets = Sets.<BindingSet>newHashSet(bs,bs2); + final Set<BindingSet> bSets = Sets.newHashSet(bs,bs2); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bSets); final QueryBindingSet alice = new QueryBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); - alice.addBinding("birthDate", new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); + alice.addBinding("birthDate", VF.createLiteral("1983-03-17",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); final QueryBindingSet bob = new QueryBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); - bob.addBinding("birthDate", new LiteralImpl("1983-04-18",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); + bob.addBinding("birthDate", VF.createLiteral("1983-04-18",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); final Set<BindingSet> fetchedResults = new HashSet<>(); while(results.hasNext()) { @@ -277,14 +274,14 @@ public class AccumuloIndexSetTest { RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -302,7 +299,7 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName); @@ -317,14 +314,14 @@ public class AccumuloIndexSetTest { RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -342,29 +339,29 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs.addBinding("location",new URIImpl("http://Virginia";)); + bs.addBinding("birthDate",VF.createLiteral("1983-03-17",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs.addBinding("location",VF.createIRI("http://Virginia";)); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bs); final QueryBindingSet alice = new QueryBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); alice.addAll(bs); final QueryBindingSet bob = new QueryBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); bob.addAll(bs); final QueryBindingSet charlie = new QueryBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); charlie.addAll(bs); final Set<BindingSet> fetchedResults = new HashSet<>(); @@ -380,14 +377,14 @@ public class AccumuloIndexSetTest { RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -405,50 +402,50 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs.addBinding("location",new URIImpl("http://Virginia";)); + bs.addBinding("birthDate",VF.createLiteral("1983-03-17",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs.addBinding("location",VF.createIRI("http://Virginia";)); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("birthDate",new LiteralImpl("1983-04-18",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs2.addBinding("location",new URIImpl("http://Georgia";)); + bs2.addBinding("birthDate",VF.createLiteral("1983-04-18",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs2.addBinding("location",VF.createIRI("http://Georgia";)); - final Set<BindingSet> bSets = Sets.<BindingSet>newHashSet(bs,bs2); + final Set<BindingSet> bSets = Sets.newHashSet(bs,bs2); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bSets); final QueryBindingSet alice1 = new QueryBindingSet(); - alice1.addBinding("name", new URIImpl("http://Alice";)); - alice1.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice1.addBinding("name", VF.createIRI("http://Alice";)); + alice1.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); alice1.addAll(bs); final QueryBindingSet bob1 = new QueryBindingSet(); - bob1.addBinding("name", new URIImpl("http://Bob";)); - bob1.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob1.addBinding("name", VF.createIRI("http://Bob";)); + bob1.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); bob1.addAll(bs); final QueryBindingSet charlie1 = new QueryBindingSet(); - charlie1.addBinding("name", new URIImpl("http://Charlie";)); - charlie1.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie1.addBinding("name", VF.createIRI("http://Charlie";)); + charlie1.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); charlie1.addAll(bs); final QueryBindingSet alice2 = new QueryBindingSet(); - alice2.addBinding("name", new URIImpl("http://Alice";)); - alice2.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice2.addBinding("name", VF.createIRI("http://Alice";)); + alice2.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); alice2.addAll(bs2); final QueryBindingSet bob2 = new QueryBindingSet(); - bob2.addBinding("name", new URIImpl("http://Bob";)); - bob2.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob2.addBinding("name", VF.createIRI("http://Bob";)); + bob2.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); bob2.addAll(bs2); final QueryBindingSet charlie2 = new QueryBindingSet(); - charlie2.addBinding("name", new URIImpl("http://Charlie";)); - charlie2.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie2.addBinding("name", VF.createIRI("http://Charlie";)); + charlie2.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); charlie2.addAll(bs2); final Set<BindingSet> fetchedResults = new HashSet<>(); @@ -466,14 +463,14 @@ public class AccumuloIndexSetTest { RyaTypeResolverException, MalformedQueryException, SailException, QueryEvaluationException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -491,7 +488,7 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final String sparql2 = "SELECT ?x ?y " + @@ -510,29 +507,29 @@ public class AccumuloIndexSetTest { final AccumuloIndexSet ais = new AccumuloIndexSet(conf, pcjTableName); ais.setProjectionExpr((Projection) pq.getTupleExpr()); ais.setTableVarMap(map); - ais.setSupportedVariableOrderMap(Lists.<String>newArrayList("x;y","y;x")); + ais.setSupportedVariableOrderMap(Lists.newArrayList("x;y","y;x")); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs.addBinding("x",new URIImpl("http://Alice";)); + bs.addBinding("birthDate",VF.createLiteral("1983-03-17",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs.addBinding("x",VF.createIRI("http://Alice";)); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("birthDate",new LiteralImpl("1983-04-18",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs2.addBinding("x",new URIImpl("http://Bob";)); + bs2.addBinding("birthDate",VF.createLiteral("1983-04-18",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs2.addBinding("x",VF.createIRI("http://Bob";)); - final Set<BindingSet> bSets = Sets.<BindingSet>newHashSet(bs,bs2); + final Set<BindingSet> bSets = Sets.newHashSet(bs,bs2); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bSets); final QueryBindingSet alice = new QueryBindingSet(); - alice.addBinding("x", new URIImpl("http://Alice";)); - alice.addBinding("y", new NumericLiteralImpl(14, XMLSchema.INTEGER)); - alice.addBinding("birthDate", new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); + alice.addBinding("x", VF.createIRI("http://Alice";)); + alice.addBinding("y", VF.createLiteral(BigInteger.valueOf(14))); + alice.addBinding("birthDate", VF.createLiteral("1983-03-17",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); final QueryBindingSet bob = new QueryBindingSet(); - bob.addBinding("x", new URIImpl("http://Bob";)); - bob.addBinding("y", new NumericLiteralImpl(16, XMLSchema.INTEGER)); - bob.addBinding("birthDate", new LiteralImpl("1983-04-18",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); + bob.addBinding("x", VF.createIRI("http://Bob";)); + bob.addBinding("y", VF.createLiteral(BigInteger.valueOf(16))); + bob.addBinding("birthDate", VF.createLiteral("1983-04-18",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); final Set<BindingSet> fetchedResults = new HashSet<>(); @@ -549,14 +546,14 @@ public class AccumuloIndexSetTest { public void accumuloIndexSetTestWithTwoDirectProductBindingSetsWithConstantMapping() throws Exception { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -573,7 +570,7 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final String sparql2 = "SELECT ?x " + @@ -590,14 +587,14 @@ public class AccumuloIndexSetTest { ais.setProjectionExpr((Projection) QueryVariableNormalizer.getNormalizedIndex(pq2.getTupleExpr(), pq1.getTupleExpr()).get(0)); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("birthDate",new LiteralImpl("1983-03-17",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs.addBinding("x",new URIImpl("http://Alice";)); + bs.addBinding("birthDate",VF.createLiteral("1983-03-17",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs.addBinding("x",VF.createIRI("http://Alice";)); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("birthDate",new LiteralImpl("1983-04-18",new URIImpl("http://www.w3.org/2001/XMLSchema#date";))); - bs2.addBinding("x",new URIImpl("http://Bob";)); + bs2.addBinding("birthDate",VF.createLiteral("1983-04-18",VF.createIRI("http://www.w3.org/2001/XMLSchema#date";))); + bs2.addBinding("x",VF.createIRI("http://Bob";)); - final Set<BindingSet> bSets = Sets.<BindingSet>newHashSet(bs,bs2); + final Set<BindingSet> bSets = Sets.newHashSet(bs,bs2); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bSets); @@ -611,13 +608,13 @@ public class AccumuloIndexSetTest { } @Test - public void accumuloIndexSetTestAttemptJoinAccrossTypes() throws Exception { + public void accumuloIndexSetTestAttemptJoinAcrossTypes() throws Exception { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -634,15 +631,15 @@ public class AccumuloIndexSetTest { final String pcjTableName = new PcjTableNameFactory().makeTableName(prefix, "testPcj"); // Create and populate the PCJ table. - PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + PcjIntegrationTestingUtil.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); final AccumuloIndexSet ais = new AccumuloIndexSet(conf,pcjTableName); final QueryBindingSet bs1 = new QueryBindingSet(); - bs1.addBinding("age",new LiteralImpl("16")); + bs1.addBinding("age", VF.createLiteral("16")); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("age",new NumericLiteralImpl(14, XMLSchema.INTEGER)); + bs2.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); - final Set<BindingSet> bSets = Sets.<BindingSet>newHashSet(bs1,bs2); + final Set<BindingSet> bSets = Sets.newHashSet(bs1,bs2); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bSets); @@ -652,7 +649,7 @@ public class AccumuloIndexSetTest { fetchedResults.add(next); } - bs2.addBinding("name", new URIImpl("http://Alice";)); + bs2.addBinding("name", VF.createIRI("http://Alice";)); Assert.assertEquals(Sets.<BindingSet>newHashSet(bs2), fetchedResults); }
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtilTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtilTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtilTest.java index cc260af..607c1ef 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtilTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtilTest.java @@ -20,11 +20,11 @@ package org.apache.rya.indexing.external.tupleSet; import static org.junit.Assert.assertTrue; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/QueryVariableNormalizerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/QueryVariableNormalizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/QueryVariableNormalizerTest.java index c191003..9c76f4d 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/QueryVariableNormalizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/QueryVariableNormalizerTest.java @@ -19,25 +19,20 @@ package org.apache.rya.indexing.external.tupleSet; * under the License. */ - - import java.util.List; import java.util.Set; import org.apache.rya.indexing.pcj.matching.QueryVariableNormalizer; - +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Sets; - - public class QueryVariableNormalizerTest { private String q1 = ""// http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSetTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSetTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSetTest.java index 15dfff4..f9ec5c7 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSetTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSetTest.java @@ -26,11 +26,11 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; /** * Tests {@link SimpleExternalTupleSet}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/VarConstQueryVariableNormalizerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/VarConstQueryVariableNormalizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/VarConstQueryVariableNormalizerTest.java index ebd1294..2a0afe0 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/VarConstQueryVariableNormalizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/VarConstQueryVariableNormalizerTest.java @@ -19,22 +19,20 @@ package org.apache.rya.indexing.external.tupleSet; * under the License. */ - import java.util.List; import java.util.Set; import org.apache.rya.indexing.pcj.matching.QueryVariableNormalizer; - +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -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; @@ -723,7 +721,7 @@ public class VarConstQueryVariableNormalizerTest { - private static class FilterCollector extends QueryModelVisitorBase<RuntimeException> { + private static class FilterCollector extends AbstractQueryModelVisitor<RuntimeException> { private List<QueryModelNode> filterList = Lists.newArrayList(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java index 6b73691..8d86a6d 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java @@ -52,34 +52,31 @@ import org.apache.rya.indexing.mongodb.MongoDbSmartUri; import org.apache.rya.indexing.smarturi.SmartUriAdapter; import org.apache.rya.indexing.smarturi.SmartUriException; 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.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.joda.time.DateTime; 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.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import info.aduna.iteration.CloseableIteration; - /** * Tests for MongoDB based Smart URI. */ public class MongoDbSmartUriIT extends MongoITBase { 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"); @@ -142,7 +139,7 @@ public class MongoDbSmartUriIT 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() { @@ -162,7 +159,7 @@ public class MongoDbSmartUriIT extends MongoITBase { .setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime().minusYears(40)))) .setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date()))) .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"))) @@ -214,18 +211,18 @@ public class MongoDbSmartUriIT extends MongoITBase { } private static String getRyaUriLocalName(final RyaURI ryaUri) { - return new URIImpl(ryaUri.getData()).getLocalName(); + return VF.createIRI(ryaUri.getData()).getLocalName(); } @Test public void testSerializeDeserialize() throws SmartUriException, URISyntaxException { - final URI smartUri = SmartUriAdapter.serializeUriEntity(BOB_ENTITY); + final IRI smartUri = SmartUriAdapter.serializeUriEntity(BOB_ENTITY); final Entity resultEntity = SmartUriAdapter.deserializeUriEntity(smartUri); assertEquals(BOB_ENTITY.getSubject(), resultEntity.getSubject()); } @Test - public void testStorage() throws SmartUriException, MalformedQueryException, RuntimeException, QueryEvaluationException { + public void testStorage() throws SmartUriException, RuntimeException { smartUriConverter.storeEntity(BOB_ENTITY); final String sparql = "SELECT * WHERE { " + @@ -295,7 +292,7 @@ public class MongoDbSmartUriIT extends MongoITBase { // Look up Person Type Entities that match Bob's SSN property final Set<Property> properties = new LinkedHashSet<>(); properties.add(BOB_ENTITY.lookupTypeProperty(PERSON_TYPE, HAS_SSN).get()); - final Map<URI, Value> map = SmartUriAdapter.propertiesToMap(properties); + final Map<IRI, Value> map = SmartUriAdapter.propertiesToMap(properties); final ConvertingCursor<TypedEntity> cursor = smartUriConverter.queryEntity(PERSON_TYPE, map); int count = 0; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java index ee3869f..3a38923 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.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 @@ -30,18 +30,17 @@ import org.apache.rya.indexing.entity.query.EntityQueryNode; import org.apache.rya.indexing.entity.storage.EntityStorage; import org.apache.rya.indexing.entity.storage.TypeStorage; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.MalformedQueryException; +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.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.MalformedQueryException; -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.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.ImmutableSet; @@ -230,7 +229,7 @@ public class MongoEntityIndex2IT extends MongoITBase { expr.visit(new EntityFetchingAsserterVisitor(expected)); } - private class EntityFetchingAsserterVisitor extends QueryModelVisitorBase<Exception> { + private class EntityFetchingAsserterVisitor extends AbstractQueryModelVisitor<Exception> { private final EntityQueryNode expected; public EntityFetchingAsserterVisitor(final EntityQueryNode expected) { this.expected = expected; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java index 463cabc..f49f274 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.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 @@ -21,6 +21,7 @@ package org.apache.rya.indexing.mongo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.math.BigInteger; import java.util.HashSet; import java.util.Optional; import java.util.Set; @@ -35,24 +36,24 @@ import org.apache.rya.indexing.entity.update.mongo.MongoEntityIndexer; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +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.model.vocabulary.RDF; -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; import com.google.common.collect.ImmutableSet; public class MongoEntityIndexIT extends MongoITBase { - private static final ValueFactory VF = ValueFactoryImpl.getInstance(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Override protected void updateConfiguration(final MongoDBRdfConfiguration conf) { @@ -108,8 +109,8 @@ public class MongoEntityIndexIT extends MongoITBase { results.add(bs); } final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("flavor", ValueFactoryImpl.getInstance().createLiteral("Strawberry")); - expected.addBinding("brand", ValueFactoryImpl.getInstance().createLiteral("Awesome Icecream")); + expected.addBinding("flavor", VF.createLiteral("Strawberry")); + expected.addBinding("brand", VF.createLiteral("Awesome Icecream")); assertEquals(1, results.size()); assertEquals(expected, results.iterator().next()); @@ -145,11 +146,10 @@ public class MongoEntityIndexIT extends MongoITBase { System.out.println(bs); results.add(bs); } - final ValueFactory vf = ValueFactoryImpl.getInstance(); final MapBindingSet expected = new MapBindingSet(); - //expected.addBinding("name", vf.createURI("http://www.w3.org/2001/SMLSchema#string";, "George")); - expected.addBinding("name", vf.createLiteral("George")); - expected.addBinding("eye", vf.createLiteral("blue")); + //expected.addBinding("name", VF.createIRI("http://www.w3.org/2001/SMLSchema#string";, "George")); + expected.addBinding("name", VF.createLiteral("George")); + expected.addBinding("eye", VF.createLiteral("blue")); assertEquals(1, results.size()); assertEquals(expected, results.iterator().next()); @@ -197,122 +197,124 @@ public class MongoEntityIndexIT extends MongoITBase { private void addStatements(SailRepositoryConnection conn) throws Exception { //alice - URI subject = VF.createURI("urn:alice"); - URI predicate = VF.createURI("urn:name"); + IRI subject = VF.createIRI("urn:alice"); + IRI predicate = VF.createIRI("urn:name"); Value object = VF.createLiteral("Alice"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:eye"); + predicate = VF.createIRI("urn:eye"); object = VF.createLiteral("blue"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:age"); - object = VF.createLiteral(30); + predicate = VF.createIRI("urn:age"); + object = VF.createLiteral(BigInteger.valueOf(30)); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:person"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:person"))); //bob - subject = VF.createURI("urn:bob"); - predicate = VF.createURI("urn:name"); + subject = VF.createIRI("urn:bob"); + predicate = VF.createIRI("urn:name"); object = VF.createLiteral("Bob"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:eye"); + predicate = VF.createIRI("urn:eye"); object = VF.createLiteral("brown"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:age"); - object = VF.createLiteral(57); + predicate = VF.createIRI("urn:age"); + object = VF.createLiteral(BigInteger.valueOf(57)); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:person"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:person"))); //charlie - subject = VF.createURI("urn:charlie"); - predicate = VF.createURI("urn:name"); + subject = VF.createIRI("urn:charlie"); + predicate = VF.createIRI("urn:name"); object = VF.createLiteral("Charlie"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:eye"); + predicate = VF.createIRI("urn:eye"); object = VF.createLiteral("hazel"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:age"); - object = VF.createLiteral(25); + predicate = VF.createIRI("urn:age"); + object = VF.createLiteral(BigInteger.valueOf(25)); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:person"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:person"))); //david - subject = VF.createURI("urn:david"); - predicate = VF.createURI("urn:name"); + subject = VF.createIRI("urn:david"); + predicate = VF.createIRI("urn:name"); object = VF.createLiteral("David"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:eye"); + predicate = VF.createIRI("urn:eye"); object = VF.createLiteral("brown"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:age"); - object = VF.createLiteral(30); + predicate = VF.createIRI("urn:age"); + object = VF.createLiteral(BigInteger.valueOf(30)); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:person"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:person"))); //eve - subject = VF.createURI("urn:eve"); - predicate = VF.createURI("urn:name"); + subject = VF.createIRI("urn:eve"); + predicate = VF.createIRI("urn:name"); object = VF.createLiteral("Bob"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:age"); - object = VF.createLiteral(25); + predicate = VF.createIRI("urn:age"); + object = VF.createLiteral(BigInteger.valueOf(25)); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:person"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:person"))); //frank - subject = VF.createURI("urn:frank"); - predicate = VF.createURI("urn:name"); + subject = VF.createIRI("urn:frank"); + predicate = VF.createIRI("urn:name"); object = VF.createLiteral("Frank"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:eye"); + predicate = VF.createIRI("urn:eye"); object = VF.createLiteral("Hazel"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:age"); - object = VF.createLiteral(57); + predicate = VF.createIRI("urn:age"); + object = VF.createLiteral(BigInteger.valueOf(57)); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:person"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:person"))); //george - subject = VF.createURI("urn:george"); - predicate = VF.createURI("urn:name"); + subject = VF.createIRI("urn:george"); + predicate = VF.createIRI("urn:name"); object = VF.createLiteral("George"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:eye"); + predicate = VF.createIRI("urn:eye"); object = VF.createLiteral("blue"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:age"); - object = VF.createLiteral(30); + predicate = VF.createIRI("urn:age"); + object = VF.createLiteral(BigInteger.valueOf(30)); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:person"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:person"))); // Some Icecream typed objects. //chocolate - subject = VF.createURI("urn:chocolate"); - predicate = VF.createURI("urn:brand"); + subject = VF.createIRI("urn:chocolate"); + predicate = VF.createIRI("urn:brand"); object = VF.createLiteral("Awesome Icecream"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:flavor"); + predicate = VF.createIRI("urn:flavor"); object = VF.createLiteral("Chocolate"); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:icecream"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:icecream"))); //vanilla - subject = VF.createURI("urn:vanilla"); - predicate = VF.createURI("urn:brand"); + subject = VF.createIRI("urn:vanilla"); + predicate = VF.createIRI("urn:brand"); object = VF.createLiteral("Awesome Icecream"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:flavor"); + predicate = VF.createIRI("urn:flavor"); object = VF.createLiteral("Vanilla"); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:icecream"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:icecream"))); //strawberry - subject = VF.createURI("urn:strawberry"); - predicate = VF.createURI("urn:brand"); + subject = VF.createIRI("urn:strawberry"); + predicate = VF.createIRI("urn:brand"); object = VF.createLiteral("Awesome Icecream"); conn.add(VF.createStatement(subject, predicate, object)); - predicate = VF.createURI("urn:flavor"); + predicate = VF.createIRI("urn:flavor"); object = VF.createLiteral("Strawberry"); conn.add(VF.createStatement(subject, predicate, object)); - conn.add(VF.createStatement(subject, RDF.TYPE, VF.createURI("urn:icecream"))); + conn.add(VF.createStatement(subject, RDF.TYPE, VF.createIRI("urn:icecream"))); + + conn.commit(); } } \ 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/MongoFreeTextIndexerIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java index a8d496e..d827f78 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java @@ -33,19 +33,17 @@ import org.apache.rya.indexing.StatementConstraints; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.mongodb.freetext.MongoFreeTextIndexer; 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.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import org.junit.Test; -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.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDFS; import com.google.common.collect.Sets; -import info.aduna.iteration.CloseableIteration; - /** * Integration tests the methods of {@link MongoFreeTextIndexer}. */ @@ -58,13 +56,13 @@ public class MongoFreeTextIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); - final URI subject = new URIImpl("foo:subj"); - final URI predicate = RDFS.LABEL; + final IRI subject = vf.createIRI("foo:subj"); + final IRI predicate = RDFS.LABEL; final Value object = vf.createLiteral("this is a new hat"); - final URI context = new URIImpl("foo:context"); + final IRI context = vf.createIRI("foo:context"); final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(RdfToRyaConversions.convertStatement(statement)); @@ -83,22 +81,22 @@ public class MongoFreeTextIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); - final URI subject1 = new URIImpl("foo:subj"); - final URI predicate1 = RDFS.LABEL; + final IRI subject1 = vf.createIRI("foo:subj"); + final IRI predicate1 = RDFS.LABEL; final Value object1 = vf.createLiteral("this is a new hat"); - final URI context1 = new URIImpl("foo:context"); + final IRI context1 = vf.createIRI("foo:context"); final Statement statement1 = vf.createStatement(subject1, predicate1, object1, context1); f.storeStatement(RdfToRyaConversions.convertStatement(statement1)); - final URI subject2 = new URIImpl("foo:subject"); - final URI predicate2 = RDFS.LABEL; + final IRI subject2 = vf.createIRI("foo:subject"); + final IRI predicate2 = RDFS.LABEL; final Value object2 = vf.createLiteral("Do you like my new hat?"); - final URI context2 = new URIImpl("foo:context"); + final IRI context2 = vf.createIRI("foo:context"); final Statement statement2 = vf.createStatement(subject2, predicate2, object2, context2); f.storeStatement(RdfToRyaConversions.convertStatement(statement2)); @@ -161,11 +159,11 @@ public class MongoFreeTextIndexerIT extends MongoITBase { f.setConf(conf); f.init(); - final ValueFactory vf = new ValueFactoryImpl(); - final URI subject = new URIImpl("foo:subj"); - final URI predicate = new URIImpl(RDFS.COMMENT.toString()); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final IRI subject = vf.createIRI("foo:subj"); + final IRI predicate = vf.createIRI(RDFS.COMMENT.toString()); final Value object = vf.createLiteral("this is a new hat"); - final URI context = new URIImpl("foo:context"); + final IRI context = vf.createIRI("foo:context"); final Statement statement = vf.createStatement(subject, predicate, object, context); f.storeStatement(RdfToRyaConversions.convertStatement(statement)); @@ -174,7 +172,7 @@ public class MongoFreeTextIndexerIT extends MongoITBase { assertEquals(Sets.newHashSet(statement), getSet(f.queryText("hat", EMPTY_CONSTRAINTS))); assertEquals(Sets.newHashSet(statement), getSet(f.queryText("hat", new StatementConstraints().setContext(context)))); assertEquals(Sets.newHashSet(), - getSet(f.queryText("hat", new StatementConstraints().setContext(vf.createURI("foo:context2"))))); + getSet(f.queryText("hat", new StatementConstraints().setContext(vf.createIRI("foo:context2"))))); } }
