http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java index bbdcfec..ca00934 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java @@ -17,6 +17,7 @@ package org.apache.rya.indexing.pcj.fluo; * specific language governing permissions and limitations * under the License. */ + import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -26,8 +27,8 @@ import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaSubGraph; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.eclipse.rdf4j.model.Statement; import org.junit.Assert; -import org.openrdf.model.Statement; import com.google.common.base.Objects; import com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java index 7676657..926af3e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java @@ -40,11 +40,11 @@ import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.indexing.pcj.storage.accumulo.ShiftVarOrderFactory; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.apache.rya.pcj.fluo.test.base.RyaExportITBase; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.sail.SailException; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.SailException; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java index 384ec5d..551afa6 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java @@ -38,13 +38,13 @@ import org.apache.rya.indexing.pcj.fluo.app.NodeType; import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.apache.rya.pcj.fluo.test.base.RyaExportITBase; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +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.eclipse.rdf4j.repository.RepositoryException; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.repository.RepositoryException; /** * Integration tests the methods of {@link FluoQueryMetadataDAO}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java index 5c8a1be..555e002 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java @@ -60,11 +60,11 @@ import org.apache.rya.indexing.pcj.fluo.app.util.FluoQueryUtils; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.pcj.fluo.test.base.RyaExportITBase; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.Test; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -72,8 +72,8 @@ import com.google.common.base.Preconditions; public class BatchIT extends RyaExportITBase { private static final Logger log = Logger.getLogger(BatchIT.class); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private static final FluoQueryMetadataDAO dao = new FluoQueryMetadataDAO(); - private static final ValueFactory vf = new ValueFactoryImpl(); @Test public void simpleScanDelete() throws Exception { @@ -140,12 +140,12 @@ public class BatchIT extends RyaExportITBase { String joinId = ids.get(2); String rightSp = ids.get(4); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("subject", vf.createURI("urn:subject_1")); - bs.addBinding("object1", vf.createURI("urn:object_0")); + bs.addBinding("subject", VF.createIRI("urn:subject_1")); + bs.addBinding("object1", VF.createIRI("urn:object_0")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs); //create sharded span for deletion - URI uri = vf.createURI("urn:subject_1"); + IRI uri = VF.createIRI("urn:subject_1"); Bytes prefixBytes = BindingHashShardingFunction.getShardedScanPrefix(rightSp, uri); Span span = Span.prefix(prefixBytes); @@ -190,11 +190,11 @@ public class BatchIT extends RyaExportITBase { String joinId = ids.get(2); String rightSp = ids.get(4); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("subject", vf.createURI("urn:subject_1")); - bs.addBinding("object1", vf.createURI("urn:object_0")); + bs.addBinding("subject", VF.createIRI("urn:subject_1")); + bs.addBinding("object1", VF.createIRI("urn:object_0")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs); - URI uri = vf.createURI("urn:subject_1"); + IRI uri = VF.createIRI("urn:subject_1"); Bytes prefixBytes = BindingHashShardingFunction.getShardedScanPrefix(rightSp, uri); Span span = Span.prefix(prefixBytes); @@ -368,7 +368,7 @@ public class BatchIT extends RyaExportITBase { for (int i = 0; i < ids.size(); i++) { String id = ids.get(i); String bsPrefix = prefixes.get(i); - URI uri = vf.createURI(bsPrefix); + IRI uri = VF.createIRI(bsPrefix); Bytes prefixBytes = BindingHashShardingFunction.getShardedScanPrefix(id, uri); NodeType type = NodeType.fromNodeId(id).get(); Column bsCol = type.getResultColumn(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java index ef5ab34..933a698 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeleteIT.java @@ -37,11 +37,11 @@ import org.apache.rya.api.client.RyaClient; import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory; import org.apache.rya.indexing.pcj.fluo.api.DeleteFluoPcj; import org.apache.rya.pcj.fluo.test.base.RyaExportITBase; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.repository.sail.SailRepositoryConnection; import com.google.common.collect.Sets; @@ -60,18 +60,18 @@ public class CreateDeleteIT extends RyaExportITBase { "}"; // Triples that are loaded into Rya before the PCJ is created. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Set<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), - vf.createStatement(vf.createURI("http://Bob";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), - vf.createStatement(vf.createURI("http://Charlie";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Bob";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Charlie";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), - vf.createStatement(vf.createURI("http://Eve";), vf.createURI("http://helps";), vf.createURI("http://Kevin";)), + vf.createStatement(vf.createIRI("http://Eve";), vf.createIRI("http://helps";), vf.createIRI("http://Kevin";)), - vf.createStatement(vf.createURI("http://Bob";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Charlie";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Eve";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://David";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";))); + vf.createStatement(vf.createIRI("http://Bob";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Charlie";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Eve";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://David";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadData(sparql, statements); @@ -100,11 +100,11 @@ public class CreateDeleteIT extends RyaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(2.50)), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:price"), vf.createLiteral(0.99)), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:price"), vf.createLiteral(4.99))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(2.50)), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:price"), vf.createLiteral(0.99)), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:price"), vf.createLiteral(4.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadData(sparql, statements); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeletePeriodicPCJ.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeletePeriodicPCJ.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeletePeriodicPCJ.java index eb21b34..46fa2c1 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeletePeriodicPCJ.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/CreateDeletePeriodicPCJ.java @@ -60,10 +60,10 @@ import org.apache.rya.periodic.notification.notification.CommandNotification; import org.apache.rya.periodic.notification.notification.CommandNotification.Command; import org.apache.rya.periodic.notification.registration.KafkaNotificationRegistrationClient; import org.apache.rya.periodic.notification.serialization.CommandNotificationSerializer; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; import com.google.common.collect.Sets; @@ -79,7 +79,7 @@ public class CreateDeletePeriodicPCJ extends KafkaExportITBase { + "?obs <uri:hasId> ?id }"; // n // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final DatatypeFactory dtf = DatatypeFactory.newInstance(); ZonedDateTime time = ZonedDateTime.now(); @@ -96,18 +96,18 @@ public class CreateDeletePeriodicPCJ extends KafkaExportITBase { String time4 = zTime4.format(DateTimeFormatter.ISO_INSTANT); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time1))), - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasId"), vf.createLiteral("id_1")), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasId"), vf.createLiteral("id_1")), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time2))), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasId"), vf.createLiteral("id_2")), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasId"), vf.createLiteral("id_2")), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time3))), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasId"), vf.createLiteral("id_3")), - vf.createStatement(vf.createURI("urn:obs_4"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasId"), vf.createLiteral("id_3")), + vf.createStatement(vf.createIRI("urn:obs_4"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time4))), - vf.createStatement(vf.createURI("urn:obs_4"), vf.createURI("uri:hasId"), vf.createLiteral("id_4"))); + vf.createStatement(vf.createIRI("urn:obs_4"), vf.createIRI("uri:hasId"), vf.createLiteral("id_4"))); runTest(query, statements, 30); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java index 866d32b..ff2dc28 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java @@ -35,13 +35,13 @@ import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.pcj.fluo.test.base.RyaExportITBase; +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.impl.MapBindingSet; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; 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.impl.MapBindingSet; -import org.openrdf.repository.sail.SailRepositoryConnection; import com.google.common.base.Optional; import com.google.common.collect.Sets; @@ -64,28 +64,28 @@ public class InputIT extends RyaExportITBase { "}"; // Triples that are loaded into Rya before the PCJ is created. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Set<Statement> historicTriples = Sets.newHashSet( - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), - vf.createStatement(vf.createURI("http://Bob";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), - vf.createStatement(vf.createURI("http://Charlie";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Bob";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Charlie";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), - vf.createStatement(vf.createURI("http://Eve";), vf.createURI("http://helps";), vf.createURI("http://Kevin";)), + vf.createStatement(vf.createIRI("http://Eve";), vf.createIRI("http://helps";), vf.createIRI("http://Kevin";)), - vf.createStatement(vf.createURI("http://Bob";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Charlie";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Eve";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://David";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";))); + vf.createStatement(vf.createIRI("http://Bob";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Charlie";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Eve";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://David";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";))); // The expected results of the SPARQL query once the PCJ has been computed. final Set<BindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("x", vf.createURI("http://Bob";)); + bs.addBinding("x", vf.createIRI("http://Bob";)); expected.add(bs); bs = new MapBindingSet(); - bs.addBinding("x", vf.createURI("http://Charlie";)); + bs.addBinding("x", vf.createIRI("http://Charlie";)); expected.add(bs); // Load the historic data into Rya. @@ -144,15 +144,15 @@ public class InputIT extends RyaExportITBase { new RyaStatement(new RyaURI("http://David";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";))); // The expected results of the SPARQL query once the PCJ has been computed. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Set<BindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("x", vf.createURI("http://Bob";)); + bs.addBinding("x", vf.createIRI("http://Bob";)); expected.add(bs); bs = new MapBindingSet(); - bs.addBinding("x", vf.createURI("http://Charlie";)); + bs.addBinding("x", vf.createIRI("http://Charlie";)); expected.add(bs); // Create the PCJ table. @@ -172,7 +172,7 @@ public class InputIT extends RyaExportITBase { } // Stream the data into Fluo. - new InsertTriples().insert(fluoClient, streamedTriples, Optional.<String>absent()); + new InsertTriples().insert(fluoClient, streamedTriples, Optional.absent()); // Verify the end results of the query match the expected results. super.getMiniFluo().waitForObservers(); @@ -204,10 +204,10 @@ public class InputIT extends RyaExportITBase { "}"; // Triples that are loaded into Rya before the PCJ is created. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Set<Statement> historicTriples = Sets.newHashSet( - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";))); + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";))); // Triples that will be streamed into Fluo after the PCJ has been created. final Set<RyaStatement> streamedTriples = Sets.newHashSet( @@ -236,7 +236,7 @@ public class InputIT extends RyaExportITBase { final Set<BindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("x", vf.createURI("http://Alice";)); + bs.addBinding("x", vf.createIRI("http://Alice";)); expected.add(bs); Set<BindingSet> results = new HashSet<>(); @@ -249,13 +249,13 @@ public class InputIT extends RyaExportITBase { assertEquals(expected, results); // Stream the data into Fluo. - new InsertTriples().insert(fluoClient, streamedTriples, Optional.<String>absent()); + new InsertTriples().insert(fluoClient, streamedTriples, Optional.absent()); // Verify the end results of the query also include Frank. super.getMiniFluo().waitForObservers(); bs = new MapBindingSet(); - bs.addBinding("x", vf.createURI("http://Frank";)); + bs.addBinding("x", vf.createIRI("http://Frank";)); expected.add(bs); results = new HashSet<>(); @@ -286,10 +286,10 @@ public class InputIT extends RyaExportITBase { "}"; // Triples that are loaded into Rya before the PCJ is created. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Set<Statement> historicTriples = Sets.newHashSet( - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";))); + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";))); // Triples that will be streamed into Fluo after the PCJ has been created. final Set<RyaStatement> streamedTriples = Sets.newHashSet( @@ -300,7 +300,7 @@ public class InputIT extends RyaExportITBase { final Set<BindingSet> expected = new HashSet<>(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("x", vf.createURI("http://Alice";)); + bs.addBinding("x", vf.createIRI("http://Alice";)); expected.add(bs); // Load the historic data into Rya. @@ -331,7 +331,7 @@ public class InputIT extends RyaExportITBase { assertEquals(expected, results); // Stream the same Alice triple into Fluo. - new InsertTriples().insert(fluoClient, streamedTriples, Optional.<String>absent()); + new InsertTriples().insert(fluoClient, streamedTriples, Optional.absent()); // Verify the end results of the query is stiill only Alice. super.getMiniFluo().waitForObservers(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaExportIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaExportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaExportIT.java index dd79c37..03a9b02 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaExportIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaExportIT.java @@ -35,13 +35,13 @@ import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.apache.rya.pcj.fluo.test.base.KafkaExportITBase; +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.XMLSchema; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Sets; @@ -67,24 +67,24 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Triples that will be streamed into Fluo after the PCJ has been created. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Bob";)), - vf.createStatement(vf.createURI("http://Bob";), vf.createURI("http://livesIn";), vf.createURI("http://London";)), - vf.createStatement(vf.createURI("http://Bob";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Charlie";)), - vf.createStatement(vf.createURI("http://Charlie";), vf.createURI("http://livesIn";), vf.createURI("http://London";)), - vf.createStatement(vf.createURI("http://Charlie";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://David";)), - vf.createStatement(vf.createURI("http://David";), vf.createURI("http://livesIn";), vf.createURI("http://London";)), - vf.createStatement(vf.createURI("http://David";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)), - vf.createStatement(vf.createURI("http://Eve";), vf.createURI("http://livesIn";), vf.createURI("http://Leeds";)), - vf.createStatement(vf.createURI("http://Eve";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";)), - vf.createStatement(vf.createURI("http://Frank";), vf.createURI("http://talksTo";), vf.createURI("http://Alice";)), - vf.createStatement(vf.createURI("http://Frank";), vf.createURI("http://livesIn";), vf.createURI("http://London";)), - vf.createStatement(vf.createURI("http://Frank";), vf.createURI("http://worksAt";), vf.createURI("http://Chipotle";))); + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Bob";)), + vf.createStatement(vf.createIRI("http://Bob";), vf.createIRI("http://livesIn";), vf.createIRI("http://London";)), + vf.createStatement(vf.createIRI("http://Bob";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Charlie";)), + vf.createStatement(vf.createIRI("http://Charlie";), vf.createIRI("http://livesIn";), vf.createIRI("http://London";)), + vf.createStatement(vf.createIRI("http://Charlie";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://David";)), + vf.createStatement(vf.createIRI("http://David";), vf.createIRI("http://livesIn";), vf.createIRI("http://London";)), + vf.createStatement(vf.createIRI("http://David";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)), + vf.createStatement(vf.createIRI("http://Eve";), vf.createIRI("http://livesIn";), vf.createIRI("http://Leeds";)), + vf.createStatement(vf.createIRI("http://Eve";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";)), + vf.createStatement(vf.createIRI("http://Frank";), vf.createIRI("http://talksTo";), vf.createIRI("http://Alice";)), + vf.createStatement(vf.createIRI("http://Frank";), vf.createIRI("http://livesIn";), vf.createIRI("http://London";)), + vf.createStatement(vf.createIRI("http://Frank";), vf.createIRI("http://worksAt";), vf.createIRI("http://Chipotle";))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -93,21 +93,21 @@ public class KafkaExportIT extends KafkaExportITBase { final Set<BindingSet> expectedResult = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("customer", vf.createURI("http://Alice";)); - bs.addBinding("worker", vf.createURI("http://Bob";)); - bs.addBinding("city", vf.createURI("http://London";)); + bs.addBinding("customer", vf.createIRI("http://Alice";)); + bs.addBinding("worker", vf.createIRI("http://Bob";)); + bs.addBinding("city", vf.createIRI("http://London";)); expectedResult.add( new VisibilityBindingSet(bs) ); bs = new MapBindingSet(); - bs.addBinding("customer", vf.createURI("http://Alice";)); - bs.addBinding("worker", vf.createURI("http://Charlie";)); - bs.addBinding("city", vf.createURI("http://London";)); + bs.addBinding("customer", vf.createIRI("http://Alice";)); + bs.addBinding("worker", vf.createIRI("http://Charlie";)); + bs.addBinding("city", vf.createIRI("http://London";)); expectedResult.add( new VisibilityBindingSet(bs) ); bs = new MapBindingSet(); - bs.addBinding("customer", vf.createURI("http://Alice";)); - bs.addBinding("worker", vf.createURI("http://David";)); - bs.addBinding("city", vf.createURI("http://London";)); + bs.addBinding("customer", vf.createIRI("http://Alice";)); + bs.addBinding("worker", vf.createIRI("http://David";)); + bs.addBinding("city", vf.createIRI("http://London";)); expectedResult.add( new VisibilityBindingSet(bs) ); // Ensure the last result matches the expected result. @@ -124,11 +124,11 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(2.50)), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:price"), vf.createLiteral(0.99)), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:price"), vf.createLiteral(4.99))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(2.50)), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:price"), vf.createLiteral(0.99)), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:price"), vf.createLiteral(4.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -151,11 +151,11 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(2.50)), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:price"), vf.createLiteral(0.99)), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:price"), vf.createLiteral(4.99))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(2.50)), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:price"), vf.createLiteral(0.99)), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:price"), vf.createLiteral(4.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -178,15 +178,15 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( // Three that are part of the count. - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:id"), vf.createLiteral(UUID.randomUUID().toString())), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:id"), vf.createLiteral(UUID.randomUUID().toString())), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:id"), vf.createLiteral(UUID.randomUUID().toString())), + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:id"), vf.createLiteral(UUID.randomUUID().toString())), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:id"), vf.createLiteral(UUID.randomUUID().toString())), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:id"), vf.createLiteral(UUID.randomUUID().toString())), // One that is not. - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:price"), vf.createLiteral(3.99))); + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:price"), vf.createLiteral(3.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -209,11 +209,11 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:count"), vf.createLiteral(5)), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:count"), vf.createLiteral(7)), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:count"), vf.createLiteral(2))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:count"), vf.createLiteral(5)), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:count"), vf.createLiteral(7)), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:count"), vf.createLiteral(2))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -236,11 +236,11 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(3)), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:price"), vf.createLiteral(4)), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:price"), vf.createLiteral(8))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(3)), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:price"), vf.createLiteral(4)), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:price"), vf.createLiteral(8))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -264,11 +264,11 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(2.50)), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:price"), vf.createLiteral(0.99)), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:price"), vf.createLiteral(4.99))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(2.50)), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:price"), vf.createLiteral(0.99)), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:price"), vf.createLiteral(4.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -291,11 +291,11 @@ public class KafkaExportIT extends KafkaExportITBase { "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(5.25)), - vf.createStatement(vf.createURI("urn:gum"), vf.createURI("urn:price"), vf.createLiteral(7)), - vf.createStatement(vf.createURI("urn:sandwich"), vf.createURI("urn:price"), vf.createLiteral(2.75))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(5.25)), + vf.createStatement(vf.createIRI("urn:gum"), vf.createIRI("urn:price"), vf.createLiteral(7)), + vf.createStatement(vf.createIRI("urn:sandwich"), vf.createIRI("urn:price"), vf.createLiteral(2.75))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -320,13 +320,13 @@ public class KafkaExportIT extends KafkaExportITBase { "GROUP BY ?item"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(5.25)), - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(7)), - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:price"), vf.createLiteral(2.75)), - vf.createStatement(vf.createURI("urn:banana"), vf.createURI("urn:price"), vf.createLiteral(2.75)), - vf.createStatement(vf.createURI("urn:banana"), vf.createURI("urn:price"), vf.createLiteral(1.99))); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(5.25)), + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(7)), + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:price"), vf.createLiteral(2.75)), + vf.createStatement(vf.createIRI("urn:banana"), vf.createIRI("urn:price"), vf.createLiteral(2.75)), + vf.createStatement(vf.createIRI("urn:banana"), vf.createIRI("urn:price"), vf.createLiteral(1.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -335,12 +335,12 @@ public class KafkaExportIT extends KafkaExportITBase { final Set<VisibilityBindingSet> expectedResults = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("item", vf.createURI("urn:apple")); + bs.addBinding("item", vf.createIRI("urn:apple")); bs.addBinding("averagePrice", vf.createLiteral("5.0", XMLSchema.DECIMAL)); expectedResults.add( new VisibilityBindingSet(bs) ); bs = new MapBindingSet(); - bs.addBinding("item", vf.createURI("urn:banana")); + bs.addBinding("item", vf.createIRI("urn:banana")); bs.addBinding("averagePrice", vf.createLiteral("2.37", XMLSchema.DECIMAL)); expectedResults.add( new VisibilityBindingSet(bs) ); @@ -361,33 +361,33 @@ public class KafkaExportIT extends KafkaExportITBase { "GROUP BY ?type ?location"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( // American items that will be averaged. - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:type"), vf.createLiteral("apple")), - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:price"), vf.createLiteral(2.50)), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:type"), vf.createLiteral("apple")), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:price"), vf.createLiteral(2.50)), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:type"), vf.createLiteral("cheese")), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:price"), vf.createLiteral(.99)), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:type"), vf.createLiteral("cheese")), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:price"), vf.createLiteral(.99)), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:type"), vf.createLiteral("cheese")), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:price"), vf.createLiteral(5.25)), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:type"), vf.createLiteral("cheese")), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:price"), vf.createLiteral(5.25)), // French items that will be averaged. - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:type"), vf.createLiteral("cheese")), - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:price"), vf.createLiteral(8.5)), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:type"), vf.createLiteral("cheese")), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:price"), vf.createLiteral(8.5)), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:type"), vf.createLiteral("cigarettes")), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:price"), vf.createLiteral(3.99)), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:type"), vf.createLiteral("cigarettes")), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:price"), vf.createLiteral(3.99)), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:type"), vf.createLiteral("cigarettes")), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:price"), vf.createLiteral(4.99))); + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:type"), vf.createLiteral("cigarettes")), + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:price"), vf.createLiteral(4.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -439,33 +439,33 @@ public class KafkaExportIT extends KafkaExportITBase { "GROUP BY ?type ?location }}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( // American items that will be averaged. - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:type"), vf.createLiteral("apple")), - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:price"), vf.createLiteral(2.50)), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:type"), vf.createLiteral("apple")), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:price"), vf.createLiteral(2.50)), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:type"), vf.createLiteral("cheese")), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:price"), vf.createLiteral(4.25)), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:type"), vf.createLiteral("cheese")), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:price"), vf.createLiteral(4.25)), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:type"), vf.createLiteral("cheese")), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:price"), vf.createLiteral(5.25)), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:type"), vf.createLiteral("cheese")), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:price"), vf.createLiteral(5.25)), // French items that will be averaged. - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:type"), vf.createLiteral("cheese")), - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:price"), vf.createLiteral(8.5)), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:type"), vf.createLiteral("cheese")), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:price"), vf.createLiteral(8.5)), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:type"), vf.createLiteral("cigarettes")), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:price"), vf.createLiteral(3.99)), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:type"), vf.createLiteral("cigarettes")), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:price"), vf.createLiteral(3.99)), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:type"), vf.createLiteral("cigarettes")), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:price"), vf.createLiteral(4.99))); + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:type"), vf.createLiteral("cigarettes")), + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:price"), vf.createLiteral(4.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -513,36 +513,36 @@ public class KafkaExportIT extends KafkaExportITBase { "GROUP BY ?type ?location }}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:type"), vf.createURI("urn:blue")), - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:1"), vf.createURI("urn:price"), vf.createLiteral(8.5)), - vf.createStatement(vf.createURI("urn:blue"), vf.createURI("urn:hasMilkType"), vf.createLiteral("cow", XMLSchema.STRING)), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:type"), vf.createIRI("urn:blue")), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:1"), vf.createIRI("urn:price"), vf.createLiteral(8.5)), + vf.createStatement(vf.createIRI("urn:blue"), vf.createIRI("urn:hasMilkType"), vf.createLiteral("cow", XMLSchema.STRING)), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:type"), vf.createURI("urn:american")), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:2"), vf.createURI("urn:price"), vf.createLiteral(.99)), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:type"), vf.createIRI("urn:american")), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:2"), vf.createIRI("urn:price"), vf.createLiteral(.99)), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:type"), vf.createURI("urn:cheddar")), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:location"), vf.createLiteral("USA")), - vf.createStatement(vf.createURI("urn:3"), vf.createURI("urn:price"), vf.createLiteral(5.25)), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:type"), vf.createIRI("urn:cheddar")), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:location"), vf.createLiteral("USA")), + vf.createStatement(vf.createIRI("urn:3"), vf.createIRI("urn:price"), vf.createLiteral(5.25)), // French items that will be averaged. - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:type"), vf.createURI("urn:goat")), - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:location"), vf.createLiteral("France")), - vf.createStatement(vf.createURI("urn:4"), vf.createURI("urn:price"), vf.createLiteral(6.5)), - vf.createStatement(vf.createURI("urn:goat"), vf.createURI("urn:hasMilkType"), vf.createLiteral("goat", XMLSchema.STRING)), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:type"), vf.createIRI("urn:goat")), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:location"), vf.createLiteral("France")), + vf.createStatement(vf.createIRI("urn:4"), vf.createIRI("urn:price"), vf.createLiteral(6.5)), + vf.createStatement(vf.createIRI("urn:goat"), vf.createIRI("urn:hasMilkType"), vf.createLiteral("goat", XMLSchema.STRING)), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:type"), vf.createURI("urn:fontina")), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:location"), vf.createLiteral("Italy")), - vf.createStatement(vf.createURI("urn:5"), vf.createURI("urn:price"), vf.createLiteral(3.99)), - vf.createStatement(vf.createURI("urn:fontina"), vf.createURI("urn:hasMilkType"), vf.createLiteral("cow", XMLSchema.STRING)), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:type"), vf.createIRI("urn:fontina")), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:location"), vf.createLiteral("Italy")), + vf.createStatement(vf.createIRI("urn:5"), vf.createIRI("urn:price"), vf.createLiteral(3.99)), + vf.createStatement(vf.createIRI("urn:fontina"), vf.createIRI("urn:hasMilkType"), vf.createLiteral("cow", XMLSchema.STRING)), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:type"), vf.createURI("urn:fontina")), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:location"), vf.createLiteral("Italy")), - vf.createStatement(vf.createURI("urn:6"), vf.createURI("urn:price"), vf.createLiteral(4.99))); + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:type"), vf.createIRI("urn:fontina")), + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:location"), vf.createLiteral("Italy")), + vf.createStatement(vf.createIRI("urn:6"), vf.createIRI("urn:price"), vf.createLiteral(4.99))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadDataAndCreateQuery(sparql, statements); @@ -551,21 +551,21 @@ public class KafkaExportIT extends KafkaExportITBase { final Set<VisibilityBindingSet> expectedResults = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("type", vf.createURI("urn:blue")); + bs.addBinding("type", vf.createIRI("urn:blue")); bs.addBinding("location", vf.createLiteral("France", XMLSchema.STRING)); bs.addBinding("averagePrice", vf.createLiteral("8.5", XMLSchema.DECIMAL)); bs.addBinding("milkType", vf.createLiteral("cow", XMLSchema.STRING)); expectedResults.add( new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("type", vf.createURI("urn:goat")); + bs.addBinding("type", vf.createIRI("urn:goat")); bs.addBinding("location", vf.createLiteral("France", XMLSchema.STRING)); bs.addBinding("averagePrice", vf.createLiteral("6.5", XMLSchema.DECIMAL)); bs.addBinding("milkType", vf.createLiteral("goat", XMLSchema.STRING)); expectedResults.add( new VisibilityBindingSet(bs) ); bs = new MapBindingSet(); - bs.addBinding("type", vf.createURI("urn:fontina")); + bs.addBinding("type", vf.createIRI("urn:fontina")); bs.addBinding("location", vf.createLiteral("Italy", XMLSchema.STRING)); bs.addBinding("averagePrice", vf.createLiteral("4.49", XMLSchema.DECIMAL)); bs.addBinding("milkType", vf.createLiteral("cow", XMLSchema.STRING)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java index b2944ca..309d1ca 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java @@ -17,6 +17,7 @@ package org.apache.rya.indexing.pcj.fluo.integration; * specific language governing permissions and limitations * under the License. */ + import static java.util.Objects.requireNonNull; import java.util.ArrayList; @@ -33,7 +34,6 @@ import java.util.stream.Collectors; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.config.ObserverSpecification; import org.apache.fluo.core.client.FluoClientImpl; -import org.apache.fluo.recipes.test.FluoITHelper; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -58,13 +58,13 @@ import org.apache.rya.indexing.pcj.fluo.app.observers.QueryResultObserver; import org.apache.rya.indexing.pcj.fluo.app.observers.StatementPatternObserver; import org.apache.rya.indexing.pcj.fluo.app.observers.TripleObserver; import org.apache.rya.pcj.fluo.test.base.KafkaExportITBase; +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.RDF; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.XMLSchema; import com.google.common.collect.Sets; @@ -114,11 +114,11 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { + "?customer <urn:talksTo> ?worker. " + "?worker <urn:livesIn> ?city. " + "?worker <urn:worksAt> <urn:burgerShack>. " + "}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:Joe"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:livesIn"), vf.createURI("urn:London")), - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:burgerShack"))); + vf.createStatement(vf.createIRI("urn:Joe"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:livesIn"), vf.createIRI("urn:London")), + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:burgerShack"))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadStatements(sparql, statements); @@ -306,24 +306,24 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { + "}GROUP BY ?location }}"; // Create the Statements that will be loaded into Rya. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:obs1"), vf.createURI("urn:hasVelocity"), vf.createLiteral(77)), - vf.createStatement(vf.createURI("urn:obs1"), vf.createURI("urn:hasLocation"), vf.createLiteral("OldTown")), - vf.createStatement(vf.createURI("urn:obs2"), vf.createURI("urn:hasVelocity"), vf.createLiteral(81)), - vf.createStatement(vf.createURI("urn:obs2"), vf.createURI("urn:hasLocation"), vf.createLiteral("OldTown")), - vf.createStatement(vf.createURI("urn:obs3"), vf.createURI("urn:hasVelocity"), vf.createLiteral(70)), - vf.createStatement(vf.createURI("urn:obs3"), vf.createURI("urn:hasLocation"), vf.createLiteral("OldTown")), - vf.createStatement(vf.createURI("urn:obs5"), vf.createURI("urn:hasVelocity"), vf.createLiteral(87)), - vf.createStatement(vf.createURI("urn:obs5"), vf.createURI("urn:hasLocation"), vf.createLiteral("Rosslyn")), - vf.createStatement(vf.createURI("urn:obs6"), vf.createURI("urn:hasVelocity"), vf.createLiteral(81)), - vf.createStatement(vf.createURI("urn:obs6"), vf.createURI("urn:hasLocation"), vf.createLiteral("Rosslyn")), - vf.createStatement(vf.createURI("urn:obs7"), vf.createURI("urn:hasVelocity"), vf.createLiteral(67)), - vf.createStatement(vf.createURI("urn:obs7"), vf.createURI("urn:hasLocation"), vf.createLiteral("Clarendon")), - vf.createStatement(vf.createURI("urn:obs8"), vf.createURI("urn:hasVelocity"), vf.createLiteral(77)), - vf.createStatement(vf.createURI("urn:obs8"), vf.createURI("urn:hasLocation"), vf.createLiteral("Ballston")), - vf.createStatement(vf.createURI("urn:obs9"), vf.createURI("urn:hasVelocity"), vf.createLiteral(87)), - vf.createStatement(vf.createURI("urn:obs9"), vf.createURI("urn:hasLocation"), vf.createLiteral("FallsChurch"))); + vf.createStatement(vf.createIRI("urn:obs1"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(77)), + vf.createStatement(vf.createIRI("urn:obs1"), vf.createIRI("urn:hasLocation"), vf.createLiteral("OldTown")), + vf.createStatement(vf.createIRI("urn:obs2"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(81)), + vf.createStatement(vf.createIRI("urn:obs2"), vf.createIRI("urn:hasLocation"), vf.createLiteral("OldTown")), + vf.createStatement(vf.createIRI("urn:obs3"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(70)), + vf.createStatement(vf.createIRI("urn:obs3"), vf.createIRI("urn:hasLocation"), vf.createLiteral("OldTown")), + vf.createStatement(vf.createIRI("urn:obs5"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(87)), + vf.createStatement(vf.createIRI("urn:obs5"), vf.createIRI("urn:hasLocation"), vf.createLiteral("Rosslyn")), + vf.createStatement(vf.createIRI("urn:obs6"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(81)), + vf.createStatement(vf.createIRI("urn:obs6"), vf.createIRI("urn:hasLocation"), vf.createLiteral("Rosslyn")), + vf.createStatement(vf.createIRI("urn:obs7"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(67)), + vf.createStatement(vf.createIRI("urn:obs7"), vf.createIRI("urn:hasLocation"), vf.createLiteral("Clarendon")), + vf.createStatement(vf.createIRI("urn:obs8"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(77)), + vf.createStatement(vf.createIRI("urn:obs8"), vf.createIRI("urn:hasLocation"), vf.createLiteral("Ballston")), + vf.createStatement(vf.createIRI("urn:obs9"), vf.createIRI("urn:hasVelocity"), vf.createLiteral(87)), + vf.createStatement(vf.createIRI("urn:obs9"), vf.createIRI("urn:hasLocation"), vf.createLiteral("FallsChurch"))); // Create the PCJ in Fluo and load the statements into Rya. final String pcjId = loadStatements(sparql, statements); @@ -353,7 +353,7 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { expectedResults.add(subGraph2); Assert.assertEquals(expectedResults.size(), results.size()); - ConstructGraphTestUtils.subGraphsEqualIgnoresBlankNode(expectedResults, results);; + ConstructGraphTestUtils.subGraphsEqualIgnoresBlankNode(expectedResults, results); }
