http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java index 7fb228a..f2a8d36 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java @@ -34,11 +34,11 @@ import org.apache.rya.streams.kafka.processors.filter.FilterProcessorSupplier.Fi import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetDeserializer; import org.apache.rya.streams.kafka.topology.TopologyFactory; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Integration tests the methods of {@link FilterProcessor}. @@ -68,15 +68,15 @@ public class FilterProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create the statements that will be input into the query. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); - statements.add(new VisibilityStatement(vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:age"), vf.createLiteral(11)), "a")); - statements.add(new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:age"), vf.createLiteral(9)), "a")); + statements.add(new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:age"), vf.createLiteral(11)), "a")); + statements.add(new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:age"), vf.createLiteral(9)), "a")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("age", vf.createLiteral(9)); expected.add( new VisibilityBindingSet(bs, "a") );
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorTest.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorTest.java index 3ff8e8d..51bd919 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorTest.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorTest.java @@ -30,11 +30,11 @@ import org.apache.rya.streams.kafka.RdfTestUtil; import org.apache.rya.streams.kafka.processors.ProcessorResult; import org.apache.rya.streams.kafka.processors.ProcessorResult.UnaryResult; import org.apache.rya.streams.kafka.processors.filter.FilterProcessorSupplier.FilterProcessor; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.impl.MapBindingSet; /** * Unit tests the methods of {@link FilterProcessor}. @@ -52,9 +52,9 @@ public class FilterProcessorTest { "}"); // Create a Binding Set that will be passed into the Filter function based on the where clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("age", vf.createLiteral(9)); final VisibilityBindingSet inputVisBs = new VisibilityBindingSet(bs, "a"); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java index 11637b7..15c33ee 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java @@ -39,24 +39,23 @@ import org.apache.rya.streams.kafka.processors.filter.FilterProcessorSupplier.Fi import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetDeserializer; import org.apache.rya.streams.kafka.topology.TopologyFactory; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.query.algebra.evaluation.function.FunctionRegistry; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.evaluation.function.Function; -import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; -import org.openrdf.query.impl.MapBindingSet; /** * Integration tests the temporal methods of {@link FilterProcessor}. */ public class TemporalFilterIT { - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private static final String TEMPORAL = "http://rya.apache.org/ns/temporal";; private static final ZonedDateTime TIME = ZonedDateTime.parse("2015-12-30T12:00:00Z"); private static final ZonedDateTime TIME_10 = ZonedDateTime.parse("2015-12-30T12:00:10Z"); @@ -100,13 +99,12 @@ public class TemporalFilterIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create the statements that will be input into the query. - final ValueFactory vf = new ValueFactoryImpl(); final List<VisibilityStatement> statements = getStatements(); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("date", vf.createLiteral(TIME.toString())); + bs.addBinding("date", VF.createLiteral(TIME.toString())); expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. @@ -134,13 +132,12 @@ public class TemporalFilterIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create the statements that will be input into the query. - final ValueFactory vf = new ValueFactoryImpl(); final List<VisibilityStatement> statements = getStatements(); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("date", vf.createLiteral(TIME.toString())); + bs.addBinding("date", VF.createLiteral(TIME.toString())); expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. @@ -168,13 +165,12 @@ public class TemporalFilterIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create the statements that will be input into the query. - final ValueFactory vf = new ValueFactoryImpl(); final List<VisibilityStatement> statements = getStatements(); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("date", vf.createLiteral(TIME_20.toString())); + bs.addBinding("date", VF.createLiteral(TIME_20.toString())); expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. @@ -202,13 +198,12 @@ public class TemporalFilterIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create the statements that will be input into the query. - final ValueFactory vf = new ValueFactoryImpl(); final List<VisibilityStatement> statements = getStatements(); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("date", vf.createLiteral(TIME_10.toString())); + bs.addBinding("date", VF.createLiteral(TIME_10.toString())); expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. @@ -224,9 +219,9 @@ public class TemporalFilterIT { } private static Statement statement(final ZonedDateTime time) { - final Resource subject = vf.createURI("urn:time"); - final URI predicate = vf.createURI("http://www.w3.org/2006/time/atTime";); - final Value object = vf.createLiteral(time.toString()); - return new StatementImpl(subject, predicate, object); + final Resource subject = VF.createIRI("urn:time"); + final IRI predicate = VF.createIRI("http://www.w3.org/2006/time/atTime";); + final Value object = VF.createLiteral(time.toString()); + return VF.createStatement(subject, predicate, object); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java index 5f09372..0de176d 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java @@ -37,11 +37,11 @@ import org.apache.rya.streams.kafka.processors.join.JoinProcessorSupplier.JoinPr import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetDeserializer; import org.apache.rya.streams.kafka.topology.TopologyFactory; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; @@ -81,33 +81,33 @@ public class JoinProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements that generate a bunch of right SP results. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:TacoPlace")), "a&b") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:TacoPlace")), "a&b") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "a") ); + vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "a") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:worksAt"), vf.createURI("urn:CoffeeShop")), "b") ); + vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:CoffeeShop")), "b") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "b|c") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "b|c") ); // Add a statement that will generate a left result that joins with some of those right results. statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "c") ); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "c") ); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoPlace")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoPlace")); expected.add( new VisibilityBindingSet(bs, "a&b&c") ); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:BurgerJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:BurgerJoint")); expected.add( new VisibilityBindingSet(bs, "c&(b|c)") ); // Run the test. @@ -132,33 +132,33 @@ public class JoinProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements that generate a bunch of right SP results. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:TacoPlace")), "a&b") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:TacoPlace")), "a&b") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "a") ); + vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "a") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:worksAt"), vf.createURI("urn:CoffeeShop")), "b") ); + vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:CoffeeShop")), "b") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "b|c") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "b|c") ); // Add a statement that will generate a left result that joins with some of those right results. statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "c") ); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "c") ); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoPlace")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoPlace")); expected.add( new VisibilityBindingSet(bs, "a&b&c") ); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:BurgerJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:BurgerJoint")); expected.add( new VisibilityBindingSet(bs, "c&(b|c)") ); // Run the test. @@ -183,39 +183,39 @@ public class JoinProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements that generate a bunch of right SP results. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:TacoPlace")), "a&b") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:TacoPlace")), "a&b") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "c") ); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "c") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "a") ); + vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "a") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:worksAt"), vf.createURI("urn:CoffeeShop")), "b") ); + vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:CoffeeShop")), "b") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "b|c") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "b|c") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:talksTo"), vf.createURI("urn:Charlie")), "c") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Charlie")), "c") ); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoPlace")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoPlace")); expected.add( new VisibilityBindingSet(bs, "a&b&c") ); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:BurgerJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:BurgerJoint")); expected.add( new VisibilityBindingSet(bs, "c&(b|c)") ); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Bob")); - bs.addBinding("employee", vf.createURI("urn:Charlie")); - bs.addBinding("business", vf.createURI("urn:BurgerJoint")); + bs.addBinding("person", vf.createIRI("urn:Bob")); + bs.addBinding("employee", vf.createIRI("urn:Charlie")); + bs.addBinding("business", vf.createIRI("urn:BurgerJoint")); expected.add( new VisibilityBindingSet(bs, "a&c") ); // Run the test. @@ -241,21 +241,21 @@ public class JoinProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements that generate a bunch of right SP results. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "a") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "a") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:hourlyWage"), vf.createLiteral(7.25)), "a") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:hourlyWage"), vf.createLiteral(7.25)), "a") ); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:BurgerJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:BurgerJoint")); bs.addBinding("wage", vf.createLiteral(7.25)); expected.add( new VisibilityBindingSet(bs, "a") ); @@ -281,33 +281,33 @@ public class JoinProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements that generate a result that includes the optional value as well as one that does not. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:TacoPlace")), "b") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:TacoPlace")), "b") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:talksTo"), vf.createURI("urn:Charlie")), "c") ); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Charlie")), "c") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:David"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "d") ); + vf.createStatement(vf.createIRI("urn:David"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "d") ); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); expected.add( new VisibilityBindingSet(bs, "a") ); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoPlace")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoPlace")); expected.add( new VisibilityBindingSet(bs, "a&b") ); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Bob")); - bs.addBinding("employee", vf.createURI("urn:Charlie")); + bs.addBinding("person", vf.createIRI("urn:Bob")); + bs.addBinding("employee", vf.createIRI("urn:Charlie")); expected.add( new VisibilityBindingSet(bs, "c") ); // Run the test. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java index c6fd1cf..7142cb7 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java @@ -32,12 +32,12 @@ import org.apache.rya.streams.kafka.processors.projection.MultiProjectionProcess import org.apache.rya.streams.kafka.serialization.VisibilityStatementDeserializer; import org.apache.rya.streams.kafka.topology.TopologyFactory; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.BNode; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; /** * Integration tests the methods of {@link MultiProjectionProcessor}. @@ -71,20 +71,20 @@ public class MultiProjectionProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, () -> bNodeId); // Create the statements that will be input into the query. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:car1"), vf.createURI("urn:compass"), vf.createURI("urn:NW")), "a") ); + vf.createStatement(vf.createIRI("urn:car1"), vf.createIRI("urn:compass"), vf.createIRI("urn:NW")), "a") ); statements.add( new VisibilityStatement( - vf.createStatement(vf.createURI("urn:car1"), vf.createURI("urn:corner"), vf.createURI("urn:corner1")), "a") ); + vf.createStatement(vf.createIRI("urn:car1"), vf.createIRI("urn:corner"), vf.createIRI("urn:corner1")), "a") ); // Make the expected results. final Set<VisibilityStatement> expected = new HashSet<>(); final BNode blankNode = vf.createBNode(bNodeId); - expected.add(new VisibilityStatement(vf.createStatement(blankNode, RDF.TYPE, vf.createURI("urn:movementObservation")), "a")); - expected.add(new VisibilityStatement(vf.createStatement(blankNode, vf.createURI("urn:direction"), vf.createURI("urn:NW")), "a")); - expected.add(new VisibilityStatement(vf.createStatement(blankNode, vf.createURI("urn:location"), vf.createURI("urn:corner1")), "a")); + expected.add(new VisibilityStatement(vf.createStatement(blankNode, RDF.TYPE, vf.createIRI("urn:movementObservation")), "a")); + expected.add(new VisibilityStatement(vf.createStatement(blankNode, vf.createIRI("urn:direction"), vf.createIRI("urn:NW")), "a")); + expected.add(new VisibilityStatement(vf.createStatement(blankNode, vf.createIRI("urn:location"), vf.createIRI("urn:corner1")), "a")); // Run the test. RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityStatementDeserializer.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java index f53f2c4..977e453 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java @@ -34,11 +34,11 @@ import org.apache.rya.streams.kafka.processors.StatementPatternProcessorSupplier import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetDeserializer; import org.apache.rya.streams.kafka.topology.TopologyFactory; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Sets; @@ -68,16 +68,16 @@ public class ProjectionProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Load some data into the input topic. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); // Show the correct binding set results from the job. final Set<VisibilityBindingSet> expected = new HashSet<>(); final MapBindingSet expectedBs = new MapBindingSet(); - expectedBs.addBinding("p", vf.createURI("urn:Alice")); - expectedBs.addBinding("otherPerson", vf.createURI("urn:Bob")); + expectedBs.addBinding("p", vf.createIRI("urn:Alice")); + expectedBs.addBinding("otherPerson", vf.createIRI("urn:Bob")); expected.add(new VisibilityBindingSet(expectedBs, "a")); RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, Sets.newHashSet(expected), VisibilityBindingSetDeserializer.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/sp/StatementPatternProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/sp/StatementPatternProcessorIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/sp/StatementPatternProcessorIT.java index fd0a48d..1e65827 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/sp/StatementPatternProcessorIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/sp/StatementPatternProcessorIT.java @@ -34,11 +34,11 @@ import org.apache.rya.streams.kafka.processors.StatementPatternProcessorSupplier import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetDeserializer; import org.apache.rya.streams.kafka.topology.TopologyFactory; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; /** * Integration tests the methods of {@link StatementPatternProcessor}. @@ -62,16 +62,16 @@ public class StatementPatternProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create a statement that generate an SP result. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); // Show the correct binding set results from the job. final Set<VisibilityBindingSet> expected = new HashSet<>(); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("otherPerson", vf.createURI("urn:Bob")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("otherPerson", vf.createIRI("urn:Bob")); expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. @@ -92,24 +92,24 @@ public class StatementPatternProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements where some generates SP results and others do not. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:worksAt"), vf.createURI("urn:TacoJoin")), "b") ); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:talksTo"), vf.createURI("urn:Alice")), "a|b") ); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:BurgerJoint")), "c") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:TacoJoin")), "b") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Alice")), "a|b") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:BurgerJoint")), "c") ); // Show the correct binding set results from the job. final Set<VisibilityBindingSet> expected = new HashSet<>(); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("otherPerson", vf.createURI("urn:Bob")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("otherPerson", vf.createIRI("urn:Bob")); expected.add( new VisibilityBindingSet(bs, "a") ); bs = new QueryBindingSet(); - bs.addBinding("person", vf.createURI("urn:Bob")); - bs.addBinding("otherPerson", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Bob")); + bs.addBinding("otherPerson", vf.createIRI("urn:Alice")); expected.add( new VisibilityBindingSet(bs, "a|b") ); // Run the test. @@ -133,17 +133,17 @@ public class StatementPatternProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements where some generates SP results and others do not. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); // Show the correct binding set results from the job. final Set<VisibilityBindingSet> expected = new HashSet<>(); final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("action", vf.createURI("urn:talksTo")); - bs.addBinding("otherPerson", vf.createURI("urn:Bob")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("action", vf.createIRI("urn:talksTo")); + bs.addBinding("otherPerson", vf.createIRI("urn:Bob")); expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. @@ -167,26 +167,26 @@ public class StatementPatternProcessorIT { final TopologyBuilder builder = factory.build(query, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Create some statements where some generates SP results and others do not. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Charlie")), "a|b") ); - statements.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:walksWith"), vf.createURI("urn:Bob")), "b") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Charlie")), "a|b") ); + statements.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:walksWith"), vf.createIRI("urn:Bob")), "b") ); // Show the correct binding set results from the job. final Set<VisibilityBindingSet> expected = new HashSet<>(); QueryBindingSet bs = new QueryBindingSet(); bs = new QueryBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("action", vf.createURI("urn:talksTo")); - bs.addBinding("otherPerson", vf.createURI("urn:Charlie")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("action", vf.createIRI("urn:talksTo")); + bs.addBinding("otherPerson", vf.createIRI("urn:Charlie")); expected.add(new VisibilityBindingSet(bs, "a&(a|b)")); bs = new QueryBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("action", vf.createURI("urn:talksTo")); - bs.addBinding("otherPerson", vf.createURI("urn:Bob")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("action", vf.createIRI("urn:talksTo")); + bs.addBinding("otherPerson", vf.createIRI("urn:Bob")); expected.add(new VisibilityBindingSet(bs, "a")); // Run the test. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/pom.xml b/extras/rya.streams/kafka/pom.xml index 3f3227d..a1b518b 100644 --- a/extras/rya.streams/kafka/pom.xml +++ b/extras/rya.streams/kafka/pom.xml @@ -68,6 +68,10 @@ under the License. <groupId>org.apache.rya</groupId> <artifactId>rya.api</artifactId> </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.sail</artifactId> + </dependency> <!-- Kafka dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/SingleThreadKafkaStreamsFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/SingleThreadKafkaStreamsFactory.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/SingleThreadKafkaStreamsFactory.java index 63d64b9..efcc21e 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/SingleThreadKafkaStreamsFactory.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/SingleThreadKafkaStreamsFactory.java @@ -31,7 +31,7 @@ import org.apache.rya.streams.api.entity.StreamsQuery; import org.apache.rya.streams.kafka.topology.TopologyBuilderFactory; import org.apache.rya.streams.kafka.topology.TopologyBuilderFactory.TopologyBuilderException; import org.apache.rya.streams.kafka.topology.TopologyFactory; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.MalformedQueryException; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatements.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatements.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatements.java index cf10f6a..ab026f3 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatements.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatements.java @@ -28,15 +28,17 @@ import java.util.Collection; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.rya.api.model.VisibilityStatement; +import org.apache.rya.rdftriplestore.utils.RdfFormatUtils; import org.apache.rya.streams.api.exception.RyaStreamsException; import org.apache.rya.streams.api.interactor.LoadStatements; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.Rio; -import org.openrdf.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.Rio; +import org.eclipse.rdf4j.rio.UnsupportedRDFormatException; +import org.eclipse.rdf4j.rio.helpers.AbstractRDFHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,11 +77,15 @@ public class KafkaLoadStatements implements LoadStatements { } // Create an RDF Parser whose format is derived from the statementPath's file extension. - final RDFFormat format = RDFFormat.forFileName(statementsPath.getFileName().toString()); + final String filename = statementsPath.getFileName().toString(); + final RDFFormat format = RdfFormatUtils.forFileName(filename); + if (format == null) { + throw new UnsupportedRDFormatException("Unknown RDF format for the file: " + filename); + } final RDFParser parser = Rio.createParser(format); // Set a handler that writes the statements to the specified kafka topic. - parser.setRDFHandler(new RDFHandlerBase() { + parser.setRDFHandler(new AbstractRDFHandler() { @Override public void startRDF() throws RDFHandlerException { log.trace("Starting loading statements."); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorSupplier.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorSupplier.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorSupplier.java index f7c2e5e..46415d0 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorSupplier.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorSupplier.java @@ -28,8 +28,8 @@ import org.apache.kafka.streams.processor.ProcessorSupplier; import org.apache.rya.api.function.sp.StatementPatternMatcher; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.model.VisibilityStatement; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.StatementPattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorSupplier.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorSupplier.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorSupplier.java index c101914..5af54d3 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorSupplier.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorSupplier.java @@ -35,7 +35,7 @@ import org.apache.rya.streams.kafka.processors.ProcessorResult.ResultType; import org.apache.rya.streams.kafka.processors.ProcessorResultFactory; import org.apache.rya.streams.kafka.processors.RyaStreamsProcessor; import org.apache.rya.streams.kafka.processors.RyaStreamsProcessorSupplier; -import org.openrdf.query.algebra.Group; +import org.eclipse.rdf4j.query.algebra.Group; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/KeyValueAggregationStateStore.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/KeyValueAggregationStateStore.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/KeyValueAggregationStateStore.java index 3300590..4eb7474 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/KeyValueAggregationStateStore.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/aggregation/KeyValueAggregationStateStore.java @@ -28,7 +28,7 @@ import org.apache.kafka.streams.state.KeyValueStore; import org.apache.rya.api.function.aggregation.AggregationState; import org.apache.rya.api.function.aggregation.AggregationStateStore; import org.apache.rya.api.model.VisibilityBindingSet; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/join/KeyValueJoinStateStore.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/join/KeyValueJoinStateStore.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/join/KeyValueJoinStateStore.java index 61ca141..c2d6190 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/join/KeyValueJoinStateStore.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/join/KeyValueJoinStateStore.java @@ -31,7 +31,7 @@ import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.utils.CloseableIterator; import org.apache.rya.streams.kafka.processors.ProcessorResult.BinaryResult; import org.apache.rya.streams.kafka.processors.ProcessorResult.BinaryResult.Side; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterSupplier.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterSupplier.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterSupplier.java index 74a6f96..6e68908 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterSupplier.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterSupplier.java @@ -26,12 +26,12 @@ import org.apache.kafka.streams.processor.ProcessorSupplier; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.model.VisibilityStatement; import org.apache.rya.streams.kafka.processors.ProcessorResult; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.google.common.collect.Sets; @@ -56,7 +56,7 @@ public class StatementOutputFormatterSupplier implements ProcessorSupplier<Objec @DefaultAnnotation(NonNull.class) public static final class StatementOutputFormatter implements Processor<Object, ProcessorResult> { - private static final ValueFactory VF = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private static final Collection<String> REQURIED_BINDINGS = Sets.newHashSet("subject", "predicate", "object"); private ProcessorContext processorContext; @@ -88,14 +88,14 @@ public class StatementOutputFormatterSupplier implements ProcessorSupplier<Objec // Make sure the Predicate is the correct type. final Value predVal = result.getValue("predicate"); - if(!(predVal instanceof URI)) { + if(!(predVal instanceof IRI)) { return; } // Forward the visibility statement. final Statement statement = VF.createStatement( (Resource) subjVal, - (URI) predVal, + (IRI) predVal, result.getValue("object")); processorContext.forward(key, new VisibilityStatement(statement, result.getVisibility())); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLog.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLog.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLog.java index 2822272..e536efc 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLog.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/queries/KafkaQueryChangeLog.java @@ -35,12 +35,12 @@ import org.apache.kafka.common.TopicPartition; import org.apache.rya.streams.api.queries.ChangeLogEntry; import org.apache.rya.streams.api.queries.QueryChange; import org.apache.rya.streams.api.queries.QueryChangeLog; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; -import info.aduna.iteration.CloseableIteration; /** * A Kafka implementation of a {@link QueryChangeLog}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyBuilderFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyBuilderFactory.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyBuilderFactory.java index c533854..e57503b 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyBuilderFactory.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyBuilderFactory.java @@ -20,7 +20,7 @@ package org.apache.rya.streams.kafka.topology; import org.apache.kafka.streams.processor.TopologyBuilder; import org.apache.rya.api.function.projection.BNodeIdFactory; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.MalformedQueryException; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyFactory.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyFactory.java b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyFactory.java index f330fa3..f2e721e 100644 --- a/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyFactory.java +++ b/extras/rya.streams/kafka/src/main/java/org/apache/rya/streams/kafka/topology/TopologyFactory.java @@ -62,22 +62,22 @@ import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetSerde; import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetSerializer; import org.apache.rya.streams.kafka.serialization.VisibilityStatementDeserializer; import org.apache.rya.streams.kafka.serialization.VisibilityStatementSerializer; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.BinaryTupleOperator; -import org.openrdf.query.algebra.Extension; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Group; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.MultiProjection; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.Reduced; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.BinaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.Extension; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Group; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.MultiProjection; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.Reduced; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; @@ -334,7 +334,7 @@ public class TopologyFactory implements TopologyBuilderFactory { * {@link ProcessorSupplier} and meta information needed for creating a * {@link TopologyBuilder}. */ - final static class QueryVisitor extends QueryModelVisitorBase<TopologyBuilderException> { + final static class QueryVisitor extends AbstractQueryModelVisitor<TopologyBuilderException> { // Each node needs a ProcessorEntry to be a processor node in the TopologyBuilder. private final List<ProcessorEntry> entries = new ArrayList<>(); private final Map<TupleExpr, String> idMap = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaGetQueryResultStreamIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaGetQueryResultStreamIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaGetQueryResultStreamIT.java index 59c08b7..3538ac6 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaGetQueryResultStreamIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaGetQueryResultStreamIT.java @@ -39,11 +39,11 @@ import org.apache.rya.streams.kafka.serialization.VisibilityStatementDeserialize import org.apache.rya.streams.kafka.serialization.VisibilityStatementSerializer; import org.apache.rya.test.kafka.KafkaTestInstanceRule; import org.apache.rya.test.kafka.KafkaTestUtil; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Integration tests the methods of {@link KafkaGetQueryResultStream}. @@ -91,7 +91,7 @@ public class KafkaGetQueryResultStreamIT { // Create a list of test VisibilityBindingSets. final List<VisibilityBindingSet> original = new ArrayList<>(); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); bs.addBinding("urn:name", vf.createLiteral("Alice")); original.add(new VisibilityBindingSet(bs, "a|b|c")); @@ -133,7 +133,7 @@ public class KafkaGetQueryResultStreamIT { final String resultTopic = KafkaTopics.queryResultsTopic(ryaInstance, queryId); // Write a single visibility binding set to the query's result topic. This will not appear in the expected results. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); bs.addBinding("urn:name", vf.createLiteral("Alice")); producer.send(new ProducerRecord<>(resultTopic, new VisibilityBindingSet(bs, "a|b|c"))); @@ -201,10 +201,10 @@ public class KafkaGetQueryResultStreamIT { // Create some statements that will be written to the result topic. final List<VisibilityStatement> original = new ArrayList<>(); - final ValueFactory vf = new ValueFactoryImpl(); - original.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")), "a") ); - original.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:age"), vf.createLiteral(63)), "b") ); - original.add( new VisibilityStatement(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:age"), vf.createLiteral("urn:34")), "") ); + final ValueFactory vf = SimpleValueFactory.getInstance(); + original.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")), "a") ); + original.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:age"), vf.createLiteral(63)), "b") ); + original.add( new VisibilityStatement(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:age"), vf.createLiteral("urn:34")), "") ); // Write the entries to the query result topic in Kafka. try(final Producer<?, VisibilityStatement> producer = http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatementsIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatementsIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatementsIT.java index 7bfa560..4df2479 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatementsIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaLoadStatementsIT.java @@ -35,11 +35,11 @@ import org.apache.rya.streams.kafka.serialization.VisibilityStatementDeserialize import org.apache.rya.streams.kafka.serialization.VisibilityStatementSerializer; import org.apache.rya.test.kafka.KafkaTestInstanceRule; import org.apache.rya.test.kafka.KafkaTestUtil; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.rio.UnsupportedRDFormatException; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.rio.UnsupportedRDFormatException; /** * Integration tests the {@link KafkaLoadStatements} command @@ -81,16 +81,16 @@ public class KafkaLoadStatementsIT { } final List<VisibilityStatement> original = new ArrayList<>(); - final ValueFactory VF = ValueFactoryImpl.getInstance(); + final ValueFactory vf = SimpleValueFactory.getInstance(); original.add(new VisibilityStatement( - VF.createStatement(VF.createURI("http://example#alice";), VF.createURI("http://example#talksTo";), VF.createURI("http://example#bob";)), + vf.createStatement(vf.createIRI("http://example#alice";), vf.createIRI("http://example#talksTo";), vf.createIRI("http://example#bob";)), visibilities)); original.add(new VisibilityStatement( - VF.createStatement(VF.createURI("http://example#bob";), VF.createURI("http://example#talksTo";), VF.createURI("http://example#charlie";)), + vf.createStatement(vf.createIRI("http://example#bob";), vf.createIRI("http://example#talksTo";), vf.createIRI("http://example#charlie";)), visibilities)); original.add(new VisibilityStatement( - VF.createStatement(VF.createURI("http://example#charlie";), VF.createURI("http://example#likes";), VF.createURI("http://example#icecream";)), + vf.createStatement(vf.createIRI("http://example#charlie";), vf.createIRI("http://example#likes";), vf.createIRI("http://example#icecream";)), visibilities)); // Show the written statement matches the read one. assertEquals(original, read); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaRunQueryIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaRunQueryIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaRunQueryIT.java index 4459057..b1a801e 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaRunQueryIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/interactor/KafkaRunQueryIT.java @@ -44,13 +44,13 @@ import org.apache.rya.streams.kafka.serialization.VisibilityStatementSerializer; import org.apache.rya.streams.kafka.topology.TopologyFactory; import org.apache.rya.test.kafka.KafkaTestInstanceRule; import org.apache.rya.test.kafka.KafkaTestUtil; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; import com.google.common.util.concurrent.AbstractScheduledService.Scheduler; @@ -116,34 +116,34 @@ public class KafkaRunQueryIT { kafka.createTopic(resultsTopic); // Create the statements that will be loaded. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<VisibilityStatement> statements = new ArrayList<>(); statements.add(new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Alice"), - vf.createURI("urn:worksAt"), - vf.createURI("urn:BurgerJoint")), "a")); + vf.createIRI("urn:Alice"), + vf.createIRI("urn:worksAt"), + vf.createIRI("urn:BurgerJoint")), "a")); statements.add(new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Bob"), - vf.createURI("urn:worksAt"), - vf.createURI("urn:TacoShop")), "a")); + vf.createIRI("urn:Bob"), + vf.createIRI("urn:worksAt"), + vf.createIRI("urn:TacoShop")), "a")); statements.add(new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Charlie"), - vf.createURI("urn:worksAt"), - vf.createURI("urn:TacoShop")), "a")); + vf.createIRI("urn:Charlie"), + vf.createIRI("urn:worksAt"), + vf.createIRI("urn:TacoShop")), "a")); // Create the expected results. final List<VisibilityBindingSet> expected = new ArrayList<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("business", vf.createURI("urn:BurgerJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("business", vf.createIRI("urn:BurgerJoint")); expected.add(new VisibilityBindingSet(bs, "a")); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoShop")); + bs.addBinding("person", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoShop")); expected.add(new VisibilityBindingSet(bs, "a")); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Charlie")); - bs.addBinding("business", vf.createURI("urn:TacoShop")); + bs.addBinding("person", vf.createIRI("urn:Charlie")); + bs.addBinding("business", vf.createIRI("urn:TacoShop")); expected.add(new VisibilityBindingSet(bs, "a")); // Execute the test. This will result in a set of results that were read from the results topic. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/BindingSetOutputFormatterTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/BindingSetOutputFormatterTest.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/BindingSetOutputFormatterTest.java index 3c810b1..1560f50 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/BindingSetOutputFormatterTest.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/BindingSetOutputFormatterTest.java @@ -30,10 +30,10 @@ import org.apache.rya.streams.kafka.processors.ProcessorResult.BinaryResult; import org.apache.rya.streams.kafka.processors.ProcessorResult.BinaryResult.Side; import org.apache.rya.streams.kafka.processors.ProcessorResult.UnaryResult; import org.apache.rya.streams.kafka.processors.output.BindingSetOutputFormatterSupplier.BindingSetOutputFormatter; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Unit tests the methods of {@link BindingSetOutputFormatter}. @@ -43,9 +43,9 @@ public class BindingSetOutputFormatterTest { @Test public void unaryResult() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("person", vf.createURI("urn:Alice")); + bindingSet.addBinding("person", vf.createIRI("urn:Alice")); bindingSet.addBinding("age", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); @@ -64,9 +64,9 @@ public class BindingSetOutputFormatterTest { @Test public void binaryResult() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("person", vf.createURI("urn:Alice")); + bindingSet.addBinding("person", vf.createIRI("urn:Alice")); bindingSet.addBinding("age", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterTest.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterTest.java index 5f7e9a6..0f5c9fb 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterTest.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/output/StatementOutputFormatterTest.java @@ -32,10 +32,10 @@ import org.apache.rya.streams.kafka.processors.ProcessorResult.BinaryResult; import org.apache.rya.streams.kafka.processors.ProcessorResult.BinaryResult.Side; import org.apache.rya.streams.kafka.processors.ProcessorResult.UnaryResult; import org.apache.rya.streams.kafka.processors.output.StatementOutputFormatterSupplier.StatementOutputFormatter; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Unit tests the methods of {@link StatementOutputFormatter}. @@ -45,10 +45,10 @@ public class StatementOutputFormatterTest { @Test public void unaryResult() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("subject", vf.createURI("urn:Alice")); - bindingSet.addBinding("predicate", vf.createURI("urn:age")); + bindingSet.addBinding("subject", vf.createIRI("urn:Alice")); + bindingSet.addBinding("predicate", vf.createIRI("urn:age")); bindingSet.addBinding("object", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); @@ -62,8 +62,8 @@ public class StatementOutputFormatterTest { // Verify the mock was invoked with the expected output. final VisibilityStatement expectedStmt = new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Alice"), - vf.createURI("urn:age"), + vf.createIRI("urn:Alice"), + vf.createIRI("urn:age"), vf.createLiteral(34)), "a"); verify(context, times(1)).forward(eq("key"), eq(expectedStmt)); } @@ -71,10 +71,10 @@ public class StatementOutputFormatterTest { @Test public void binaryResult() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("subject", vf.createURI("urn:Alice")); - bindingSet.addBinding("predicate", vf.createURI("urn:age")); + bindingSet.addBinding("subject", vf.createIRI("urn:Alice")); + bindingSet.addBinding("predicate", vf.createIRI("urn:age")); bindingSet.addBinding("object", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); @@ -88,8 +88,8 @@ public class StatementOutputFormatterTest { // Verify the mock was invoked with the expected output. final VisibilityStatement expectedStmt = new VisibilityStatement(vf.createStatement( - vf.createURI("urn:Alice"), - vf.createURI("urn:age"), + vf.createIRI("urn:Alice"), + vf.createIRI("urn:age"), vf.createLiteral(34)), "a"); verify(context, times(1)).forward(eq("key"), eq(expectedStmt)); } @@ -97,9 +97,9 @@ public class StatementOutputFormatterTest { @Test public void missingSubject() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("predicate", vf.createURI("urn:age")); + bindingSet.addBinding("predicate", vf.createIRI("urn:age")); bindingSet.addBinding("object", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); @@ -118,10 +118,10 @@ public class StatementOutputFormatterTest { @Test public void subjectWrongType() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); bindingSet.addBinding("subject", vf.createLiteral("Alice")); - bindingSet.addBinding("predicate", vf.createURI("urn:age")); + bindingSet.addBinding("predicate", vf.createIRI("urn:age")); bindingSet.addBinding("object", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); @@ -140,9 +140,9 @@ public class StatementOutputFormatterTest { @Test public void missingPredicate() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("subject", vf.createURI("urn:Alice")); + bindingSet.addBinding("subject", vf.createIRI("urn:Alice")); bindingSet.addBinding("object", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); @@ -161,9 +161,9 @@ public class StatementOutputFormatterTest { @Test public void predicateWrongType() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("subject", vf.createURI("urn:Alice")); + bindingSet.addBinding("subject", vf.createIRI("urn:Alice")); bindingSet.addBinding("predicate", vf.createLiteral("age")); bindingSet.addBinding("object", vf.createLiteral(34)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); @@ -183,10 +183,10 @@ public class StatementOutputFormatterTest { @Test public void missingObject() { // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bindingSet = new MapBindingSet(); - bindingSet.addBinding("subject", vf.createURI("urn:Alice")); - bindingSet.addBinding("predicate", vf.createURI("urn:age")); + bindingSet.addBinding("subject", vf.createIRI("urn:Alice")); + bindingSet.addBinding("predicate", vf.createIRI("urn:age")); final VisibilityBindingSet visBs = new VisibilityBindingSet(bindingSet, "a"); // Mock the processor context that will be invoked. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorTest.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorTest.java index d25db23..a52c73c 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorTest.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorTest.java @@ -37,14 +37,14 @@ import org.apache.rya.streams.kafka.processors.ProcessorResult; import org.apache.rya.streams.kafka.processors.ProcessorResult.ResultType; import org.apache.rya.streams.kafka.processors.ProcessorResult.UnaryResult; import org.apache.rya.streams.kafka.processors.projection.MultiProjectionProcessorSupplier.MultiProjectionProcessor; +import org.eclipse.rdf4j.model.BNode; +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.algebra.MultiProjection; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.openrdf.model.BNode; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.MultiProjection; -import org.openrdf.query.impl.MapBindingSet; /** * Unit test the methods of {@link MultiProjectionProcessor}. @@ -66,10 +66,10 @@ public class MultiProjectionProcessorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet inputBs = new MapBindingSet(); - inputBs.addBinding("location", vf.createURI("urn:corner1")); - inputBs.addBinding("direction", vf.createURI("urn:NW")); + inputBs.addBinding("location", vf.createIRI("urn:corner1")); + inputBs.addBinding("direction", vf.createIRI("urn:NW")); final VisibilityBindingSet inputVisBs = new VisibilityBindingSet(inputBs, "a|b"); // Make the expected results. @@ -80,19 +80,19 @@ public class MultiProjectionProcessorTest { MapBindingSet expectedBs = new MapBindingSet(); expectedBs.addBinding("subject", blankNode); expectedBs.addBinding("predicate", RDF.TYPE); - expectedBs.addBinding("object", vf.createURI("urn:movementObservation")); + expectedBs.addBinding("object", vf.createIRI("urn:movementObservation")); expected.add(new VisibilityBindingSet(expectedBs, "a|b")); expectedBs = new MapBindingSet(); expectedBs.addBinding("subject", blankNode); - expectedBs.addBinding("predicate", vf.createURI("urn:direction")); - expectedBs.addBinding("object", vf.createURI("urn:NW")); + expectedBs.addBinding("predicate", vf.createIRI("urn:direction")); + expectedBs.addBinding("object", vf.createIRI("urn:NW")); expected.add(new VisibilityBindingSet(expectedBs, "a|b")); expectedBs = new MapBindingSet(); expectedBs.addBinding("subject", blankNode); - expectedBs.addBinding("predicate", vf.createURI("urn:location")); - expectedBs.addBinding("object", vf.createURI("urn:corner1")); + expectedBs.addBinding("predicate", vf.createIRI("urn:location")); + expectedBs.addBinding("object", vf.createIRI("urn:corner1")); expected.add(new VisibilityBindingSet(expectedBs, "a|b")); // Mock the processor context that will be invoked.
