http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/Schema.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/Schema.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/Schema.java index d1a7236..fabc074 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/Schema.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/Schema.java @@ -19,18 +19,18 @@ package org.apache.rya.reasoning; * under the License. */ -import java.util.HashSet; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.model.vocabulary.OWL; +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.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; /** * Hold on to facts about the schema (TBox/RBox) and perform what reasoning we @@ -56,8 +56,8 @@ import org.openrdf.model.vocabulary.OWL; public class Schema { // Statements using these predicates are automatically relevant schema // information. - private static final Set<URI> schemaPredicates = new HashSet<>(); - private static final URI[] schemaPredicateURIs = { + private static final Set<IRI> schemaPredicates = new HashSet<>(); + private static final IRI[] schemaPredicateURIs = { RDFS.SUBCLASSOF, RDFS.SUBPROPERTYOF, RDFS.DOMAIN, @@ -89,7 +89,7 @@ public class Schema { }; static { - for (URI uri : schemaPredicateURIs) { + for (IRI uri : schemaPredicateURIs) { schemaPredicates.add(uri); } for (Resource uri : schemaTypeURIs) { @@ -102,7 +102,7 @@ public class Schema { * information? */ public static boolean isSchemaTriple(Statement triple) { - URI pred = triple.getPredicate(); + IRI pred = triple.getPredicate(); // Triples with certain predicates are schema triples, if (schemaPredicates.contains(pred)) { return true; @@ -119,7 +119,7 @@ public class Schema { /** * Map URIs to schema information about a property */ - protected Map<URI, OwlProperty> properties = new HashMap<>(); + protected Map<IRI, OwlProperty> properties = new HashMap<>(); /** * Map Resources to schema information about a class/restriction @@ -149,7 +149,7 @@ public class Schema { * Get schema information for a property, for reading and writing. * Instantiates OwlProperty if it doesn't yet exist. */ - public OwlProperty getProperty(URI p) { + public OwlProperty getProperty(IRI p) { if (!properties.containsKey(p)) { properties.put(p, new OwlProperty(p)); } @@ -161,13 +161,13 @@ public class Schema { * Assumes this Value refers to a property URI. */ public OwlProperty getProperty(Value p) { - return getProperty((URI) p); + return getProperty((IRI) p); } /** * Return whether this resource corresponds to a property. */ - public boolean hasProperty(URI r) { + public boolean hasProperty(IRI r) { return properties.containsKey(r); } @@ -193,14 +193,14 @@ public class Schema { */ public void processTriple(Statement triple) { Resource s = triple.getSubject(); - URI p = triple.getPredicate(); + IRI p = triple.getPredicate(); Value o = triple.getObject(); if (isSchemaTriple(triple)) { // For a type statement to be schema information, it must yield // some boolean information about a property. if (p.equals(RDF.TYPE)) { if (schemaTypes.contains(o)) { - addPropertyType((URI) s, (Resource) o); + addPropertyType((IRI) s, (Resource) o); } } @@ -288,7 +288,7 @@ public class Schema { /** * Add a particular characteristic to a property. */ - private void addPropertyType(URI p, Resource t) { + private void addPropertyType(IRI p, Resource t) { OwlProperty prop = getProperty(p); if (t.equals(OWL.TRANSITIVEPROPERTY)) { prop.setTransitive(); @@ -367,7 +367,7 @@ public class Schema { // schema-relevant triple at all. if (isSchemaTriple(triple)) { Resource s = triple.getSubject(); - URI p = triple.getPredicate(); + IRI p = triple.getPredicate(); Value o = triple.getObject(); // If this is telling us something about a property: if (properties.containsKey(s)) { @@ -509,7 +509,7 @@ public class Schema { if (classes.containsKey(type)) { OwlClass pr = classes.get(type); sb.append("owl:Restriction"); - for (URI p : pr.getOnProperty()) { + for (IRI p : pr.getOnProperty()) { sb.append(" (owl:onProperty ").append(p.toString()).append(")"); } for (Value v : pr.hasValue()) {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/TypeReasoner.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/TypeReasoner.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/TypeReasoner.java index 35009ab..8ccc774 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/TypeReasoner.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/TypeReasoner.java @@ -19,18 +19,17 @@ package org.apache.rya.reasoning; * under the License. */ +import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; - -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; /** * Keep track of a single node's types and do reasoning about its types. @@ -125,7 +124,7 @@ public class TypeReasoner extends AbstractReasoner { } } // Apply property restriction rules: - for (URI prop : c.getOnProperty()) { + for (IRI prop : c.getOnProperty()) { // RL rule cls-hv1: if type is an owl:hasValue restriction for (Value val : c.hasValue()) { collect(triple(node, prop, val, OwlRule.CLS_HV1, typeFact)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/AbstractReasoningTool.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/AbstractReasoningTool.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/AbstractReasoningTool.java index abb300d..c81c6fe 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/AbstractReasoningTool.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/AbstractReasoningTool.java @@ -21,13 +21,6 @@ package org.apache.rya.reasoning.mr; import java.io.IOException; -import org.apache.rya.accumulo.mr.RyaStatementWritable; -import org.apache.rya.accumulo.mr.RdfFileInputFormat; -import org.apache.rya.accumulo.mr.MRUtils; -import org.apache.rya.reasoning.Derivation; -import org.apache.rya.reasoning.Fact; -import org.apache.rya.reasoning.Schema; - import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; import org.apache.accumulo.core.data.Key; @@ -53,7 +46,13 @@ import org.apache.hadoop.mapreduce.lib.output.MultipleOutputs; import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; import org.apache.hadoop.util.Tool; -import org.openrdf.rio.RDFFormat; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.RdfFileInputFormat; +import org.apache.rya.accumulo.mr.RyaStatementWritable; +import org.apache.rya.reasoning.Derivation; +import org.apache.rya.reasoning.Fact; +import org.apache.rya.reasoning.Schema; +import org.eclipse.rdf4j.rio.RDFFormat; /** * Contains common functionality for MapReduce jobs involved in reasoning. A @@ -62,7 +61,7 @@ import org.openrdf.rio.RDFFormat; */ abstract public class AbstractReasoningTool extends Configured implements Tool { // Keep track of statistics about the input - protected static enum COUNTERS { ABOX, TBOX, USEFUL }; + protected enum COUNTERS { ABOX, TBOX, USEFUL } // MapReduce job, to be configured by subclasses protected Job job; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java index 420683f..34c8c44 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java @@ -1,5 +1,3 @@ -package org.apache.rya.reasoning.mr; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,6 +16,7 @@ package org.apache.rya.reasoning.mr; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.reasoning.mr; import java.io.BufferedReader; import java.io.File; @@ -44,27 +43,28 @@ import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; import org.apache.rya.accumulo.mr.MRUtils; import org.apache.rya.api.path.PathUtils; +import org.apache.rya.rdftriplestore.utils.RdfFormatUtils; import org.apache.rya.reasoning.Fact; import org.apache.rya.reasoning.Schema; -import org.openrdf.OpenRDFException; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.helpers.RDFHandlerBase; -import org.openrdf.rio.ntriples.NTriplesParser; -import org.openrdf.rio.rdfxml.RDFXMLParser; -import org.openrdf.sail.memory.MemoryStore; +import org.eclipse.rdf4j.RDF4JException; +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.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.helpers.AbstractRDFHandler; +import org.eclipse.rdf4j.rio.ntriples.NTriplesParser; +import org.eclipse.rdf4j.rio.rdfxml.RDFXMLParser; +import org.eclipse.rdf4j.sail.memory.MemoryStore; /** * Test the reasoner against Owl conformance tests in the database. @@ -86,7 +86,7 @@ public class ConformanceTest extends Configured implements Tool { static String TEST_SEMANTICS = TEST + "semantics"; static String TEST_RDFBASED = TEST + "RDF-BASED"; - private static class OwlTest extends RDFHandlerBase { + private static class OwlTest extends AbstractRDFHandler { Value uri; String name; String description; @@ -125,7 +125,7 @@ public class ConformanceTest extends Configured implements Tool { } } - private static class OutputCollector extends RDFHandlerBase { + private static class OutputCollector extends AbstractRDFHandler { Set<Statement> triples = new HashSet<>(); @Override public void handleStatement(final Statement st) { @@ -170,7 +170,7 @@ public class ConformanceTest extends Configured implements Tool { RDFFormat inputFormat= RDFFormat.RDFXML; final String formatString = conf.get(MRUtils.FORMAT_PROP); if (formatString != null) { - inputFormat = RDFFormat.valueOf(formatString); + inputFormat = RdfFormatUtils.getRdfFormatFromName(formatString); } repo = new SailRepository(new MemoryStore()); repo.initialize(); @@ -250,7 +250,7 @@ public class ConformanceTest extends Configured implements Tool { /** * Verify that we can infer the correct triples or detect an inconsistency. * @param conf Specifies working directory, etc. - * @param OwlTest Contains premise/conclusion graphs, will store result + * @param test Contains premise/conclusion graphs, will store result * @return Return value of the MapReduce job */ int runTest(final Configuration conf, final String[] args, final OwlTest test) @@ -341,7 +341,7 @@ public class ConformanceTest extends Configured implements Tool { * test type. */ Set<Value> getTestURIs(final RepositoryConnection conn, final String testType) - throws IOException, OpenRDFException { + throws IOException, RDF4JException { final Set<Value> testURIs = new HashSet<>(); final TupleQuery query = conn.prepareTupleQuery(QueryLanguage.SPARQL, "select ?test where { " + @@ -362,7 +362,7 @@ public class ConformanceTest extends Configured implements Tool { * Query a connection for conformance test details. */ Collection<OwlTest> getTests(final RepositoryConnection conn, final Set<Value> testURIs) - throws IOException, OpenRDFException { + throws IOException, RDF4JException { final Map<Value, OwlTest> tests = new HashMap<>(); final TupleQuery query = conn.prepareTupleQuery(QueryLanguage.SPARQL, "select * where { " + @@ -419,7 +419,7 @@ public class ConformanceTest extends Configured implements Tool { */ boolean triviallyTrue(final Statement triple, final Schema schema) { final Resource s = triple.getSubject(); - final URI p = triple.getPredicate(); + final IRI p = triple.getPredicate(); final Value o = triple.getObject(); if (p.equals(RDF.TYPE)) { if (o.equals(OWL.ONTOLOGY)) { @@ -430,9 +430,9 @@ public class ConformanceTest extends Configured implements Tool { } else if ((o.equals(OWL.OBJECTPROPERTY) || o.equals(OWL.DATATYPEPROPERTY)) - && s instanceof URI) { + && s instanceof IRI) { // Distinction not maintained, irrelevant to RL rules - return schema.hasProperty((URI) s); + return schema.hasProperty((IRI) s); } } return false; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ForwardChain.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ForwardChain.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ForwardChain.java index 7c58638..9e1be47 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ForwardChain.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ForwardChain.java @@ -21,13 +21,6 @@ package org.apache.rya.reasoning.mr; import java.io.IOException; -import org.apache.rya.accumulo.mr.RyaStatementWritable; -import org.apache.rya.reasoning.Derivation; -import org.apache.rya.reasoning.LocalReasoner; -import org.apache.rya.reasoning.LocalReasoner.Relevance; -import org.apache.rya.reasoning.Fact; -import org.apache.rya.reasoning.Schema; - import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.hadoop.conf.Configuration; @@ -39,7 +32,13 @@ import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.lib.output.MultipleOutputs; import org.apache.hadoop.util.ToolRunner; import org.apache.log4j.Logger; -import org.openrdf.model.Resource; +import org.apache.rya.accumulo.mr.RyaStatementWritable; +import org.apache.rya.reasoning.Derivation; +import org.apache.rya.reasoning.Fact; +import org.apache.rya.reasoning.LocalReasoner; +import org.apache.rya.reasoning.LocalReasoner.Relevance; +import org.apache.rya.reasoning.Schema; +import org.eclipse.rdf4j.model.Resource; public class ForwardChain extends AbstractReasoningTool { @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ResourceWritable.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ResourceWritable.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ResourceWritable.java index 158fe32..06f0d20 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ResourceWritable.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ResourceWritable.java @@ -25,8 +25,8 @@ import java.io.IOException; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.io.WritableComparator; -import org.openrdf.model.Resource; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; /** * Allows us to use a URI or bnode for a key. @@ -68,10 +68,10 @@ public class ResourceWritable implements WritableComparable<ResourceWritable> { String s = in.readUTF(); if (s.length() > 0) { if (s.startsWith("_")) { - val = ValueFactoryImpl.getInstance().createBNode(s.substring(2)); + val = SimpleValueFactory.getInstance().createBNode(s.substring(2)); } else { - val = ValueFactoryImpl.getInstance().createURI(s); + val = SimpleValueFactory.getInstance().createIRI(s); } } key = in.readInt(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/SchemaWritable.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/SchemaWritable.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/SchemaWritable.java index 97e3c78..87b6e4f 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/SchemaWritable.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/SchemaWritable.java @@ -68,8 +68,8 @@ public class SchemaWritable extends Schema implements Writable { org.apache.rya.reasoning.OwlProperty.class, // java.util.HashSet.class, // org.apache.rya.reasoning.OwlClass.class, // - org.openrdf.model.impl.URIImpl.class, // - org.openrdf.model.impl.BNodeImpl.class); + org.eclipse.rdf4j.model.impl.SimpleIRI.class, // + org.eclipse.rdf4j.model.impl.SimpleBNode.class); try { Iterable<?> propList = (Iterable<?>) vois.readObject(); Iterable<?> classList = (Iterable<?>) vois.readObject(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/LocalReasonerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/LocalReasonerTest.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/LocalReasonerTest.java index 8ed850a..9f81cb4 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/LocalReasonerTest.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/LocalReasonerTest.java @@ -19,17 +19,16 @@ package org.apache.rya.reasoning; * under the License. */ +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.SKOS; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.SKOS; - public class LocalReasonerTest { private LocalReasoner reasoner; private Schema schema; @@ -479,8 +478,8 @@ public class LocalReasonerTest { */ @Test public void testMaxCardinalityZero() throws Exception { - URI r = TestUtils.uri("restriction"); - URI p = TestUtils.uri("impossiblePredicate1"); + IRI r = TestUtils.uri("restriction"); + IRI p = TestUtils.uri("impossiblePredicate1"); schema.processTriple(TestUtils.statement(r, OWL.MAXCARDINALITY, TestUtils.intLiteral("0"))); schema.processTriple(TestUtils.statement(r, OWL.ONPROPERTY, p)); @@ -497,7 +496,7 @@ public class LocalReasonerTest { @Test public void testMaxQCardinalityZeroThings() throws Exception { Resource r = TestUtils.bnode("restriction"); - URI p = TestUtils.uri("impossiblePredicate2"); + IRI p = TestUtils.uri("impossiblePredicate2"); schema.processTriple(TestUtils.statement(r, OWL2.MAXQUALIFIEDCARDINALITY, TestUtils.intLiteral("0"))); schema.processTriple(TestUtils.statement(r, OWL.ONPROPERTY, p)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/ReasonerFactTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/ReasonerFactTest.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/ReasonerFactTest.java index 8b105c5..3c4636b 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/ReasonerFactTest.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/ReasonerFactTest.java @@ -25,20 +25,19 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.util.ArrayList; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDFS; - public class ReasonerFactTest { static final String wordnet = "http://www.w3.org/2006/03/wn/wn20/instances/";; static final String wnSchema = "http://www.w3.org/2006/03/wn/wn20/schema/";; - static final URI[] nodes = { + static final IRI[] nodes = { TestUtils.uri(wordnet, "synset-entity-noun-1"), TestUtils.uri(wordnet, "synset-physical_entity-noun-1"), TestUtils.uri(wordnet, "synset-object-noun-1"), @@ -49,7 +48,7 @@ public class ReasonerFactTest { TestUtils.uri(wordnet, "synset-engineer-noun-1"), TestUtils.uri(wordnet, "synset-programmer-noun-1") }; - static final URI hyper = TestUtils.uri(wnSchema, "hypernymOf"); + static final IRI hyper = TestUtils.uri(wnSchema, "hypernymOf"); static final Schema schema = new Schema(); static final ArrayList<ArrayList<Fact>> hierarchy = new ArrayList<>(); static final int MAX_LEVEL = 3; @@ -140,7 +139,7 @@ public class ReasonerFactTest { public void testTripleInequality() { Fact a = hierarchy.get(2).get(0); Fact b = a.clone(); - Statement stmt = new StatementImpl(TestUtils.uri(a.getSubject().stringValue()), + Statement stmt = SimpleValueFactory.getInstance().createStatement(TestUtils.uri(a.getSubject().stringValue()), a.getPredicate(), a.getObject()); // subject will have extra prefix b.setTriple(stmt); Assert.assertFalse("Triple equality should be based on (s, p, o)", a.equals(b)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaReasoningTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaReasoningTest.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaReasoningTest.java index b936f5d..97b2343 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaReasoningTest.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaReasoningTest.java @@ -19,15 +19,14 @@ package org.apache.rya.reasoning; * under the License. */ +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.vocabulary.FOAF; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.vocabulary.FOAF; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDFS; - /** * Test the application of the OWL RL/RDF schema ("scm-") rules. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaTest.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaTest.java index 95500a3..00162a7 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaTest.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/SchemaTest.java @@ -1,15 +1,3 @@ -package org.apache.rya.reasoning; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutput; -import java.io.DataOutputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; - -import org.apache.rya.reasoning.mr.SchemaWritable; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -28,20 +16,31 @@ import org.apache.rya.reasoning.mr.SchemaWritable; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.reasoning; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutput; +import java.io.DataOutputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + +import org.apache.rya.reasoning.mr.SchemaWritable; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.SKOS; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.model.vocabulary.SKOS; public class SchemaTest implements Serializable { private static final long serialVersionUID = -3616030386119902719L; - URI lubm(String s) { + IRI lubm(String s) { return TestUtils.uri("http://swat.cse.lehigh.edu/onto/univ-bench.owl";, s); } @@ -320,8 +319,8 @@ public class SchemaTest implements Serializable { @Test public void testInputMaxCardinality() throws Exception { Schema schema = new Schema(); - URI s = TestUtils.uri("x"); - URI p = OWL.MAXCARDINALITY; + IRI s = TestUtils.uri("x"); + IRI p = OWL.MAXCARDINALITY; schema.processTriple(TestUtils.statement(s, p, TestUtils.stringLiteral("7"))); schema.processTriple(TestUtils.statement(s, p, TestUtils.stringLiteral("4"))); schema.processTriple(TestUtils.statement(s, p, TestUtils.stringLiteral("-1"))); @@ -334,8 +333,8 @@ public class SchemaTest implements Serializable { @Test public void testInputMaxQualifiedCardinality() throws Exception { Schema schema = new Schema(); - URI s = TestUtils.uri("x"); - URI p = OWL2.MAXQUALIFIEDCARDINALITY; + IRI s = TestUtils.uri("x"); + IRI p = OWL2.MAXQUALIFIEDCARDINALITY; schema.processTriple(TestUtils.statement(s, p, TestUtils.stringLiteral("-20"))); schema.processTriple(TestUtils.statement(s, p, TestUtils.stringLiteral("100"))); schema.processTriple(TestUtils.statement(s, p, TestUtils.stringLiteral("0"))); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java index 86fe9a7..bec124b 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java @@ -21,38 +21,37 @@ package org.apache.rya.reasoning; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaURI; - -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -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.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +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.model.vocabulary.XMLSchema; public class TestUtils { - private static final ValueFactory VALUE_FACTORY = new ValueFactoryImpl(); + private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); public static final String TEST_PREFIX = "http://test.test";; - public static final URI NODE = uri("http://thisnode.test";, "x"); + public static final IRI NODE = uri("http://thisnode.test";, "x"); - public static URI uri(String prefix, String u) { + public static IRI uri(String prefix, String u) { if (prefix.length() > 0) { u = prefix + "#" + u; } - return VALUE_FACTORY.createURI(u); + return VALUE_FACTORY.createIRI(u); } - public static URI uri(String u) { + public static IRI uri(String u) { return uri(TEST_PREFIX, u); } - public static Fact fact(Resource s, URI p, Value o) { + public static Fact fact(Resource s, IRI p, Value o) { return new Fact(s, p, o); } - public static Statement statement(Resource s, URI p, Value o) { + public static Statement statement(Resource s, IRI p, Value o) { return VALUE_FACTORY.createStatement(s, p, o); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/DuplicateEliminationTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/DuplicateEliminationTest.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/DuplicateEliminationTest.java index 11c1d6c..30ced20 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/DuplicateEliminationTest.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/DuplicateEliminationTest.java @@ -23,6 +23,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Value; +import org.apache.hadoop.io.LongWritable; +import org.apache.hadoop.io.NullWritable; +import org.apache.hadoop.mrunit.mapreduce.MapDriver; +import org.apache.hadoop.mrunit.mapreduce.ReduceDriver; import org.apache.rya.accumulo.mr.RyaStatementWritable; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; @@ -30,22 +36,15 @@ import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.api.resolver.triple.TripleRowResolver; import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver; import org.apache.rya.reasoning.Derivation; -import org.apache.rya.reasoning.OwlRule; import org.apache.rya.reasoning.Fact; +import org.apache.rya.reasoning.OwlRule; import org.apache.rya.reasoning.TestUtils; - -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.Value; -import org.apache.hadoop.io.LongWritable; -import org.apache.hadoop.io.NullWritable; -import org.apache.hadoop.mrunit.mapreduce.MapDriver; -import org.apache.hadoop.mrunit.mapreduce.ReduceDriver; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/ForwardChainTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/ForwardChainTest.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/ForwardChainTest.java index 9bcee1b..759ede9 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/ForwardChainTest.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/mr/ForwardChainTest.java @@ -24,17 +24,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.rya.accumulo.mr.RyaStatementWritable; -import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.resolver.triple.TripleRow; -import org.apache.rya.api.resolver.triple.TripleRowResolver; -import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver; -import org.apache.rya.reasoning.OwlRule; -import org.apache.rya.reasoning.Fact; -import org.apache.rya.reasoning.Schema; -import org.apache.rya.reasoning.TestUtils; - import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.hadoop.io.LongWritable; @@ -44,13 +33,23 @@ import org.apache.hadoop.mrunit.mapreduce.ReduceDriver; import org.apache.hadoop.mrunit.mapreduce.ReduceFeeder; import org.apache.hadoop.mrunit.types.KeyValueReuseList; import org.apache.hadoop.mrunit.types.Pair; +import org.apache.rya.accumulo.mr.RyaStatementWritable; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolver; +import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver; +import org.apache.rya.reasoning.Fact; +import org.apache.rya.reasoning.OwlRule; +import org.apache.rya.reasoning.Schema; +import org.apache.rya.reasoning.TestUtils; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -187,7 +186,7 @@ public class ForwardChainTest { public void testTransitiveChain() throws Exception { int max = 8; int n = 4; - URI prop = TestUtils.uri("subOrganizationOf"); + IRI prop = TestUtils.uri("subOrganizationOf"); Map<Integer, Map<Integer, Pair<Fact, NullWritable>>> connections = new HashMap<>(); for (int i = 0; i <= max; i++) { @@ -195,8 +194,8 @@ public class ForwardChainTest { } // Initial input: make a chain from org0 to org8 for (int i = 0; i < max; i++) { - URI orgI = TestUtils.uri("org" + i); - URI orgJ = TestUtils.uri("org" + (i + 1)); + IRI orgI = TestUtils.uri("org" + i); + IRI orgJ = TestUtils.uri("org" + (i + 1)); Fact triple = new Fact(orgI, prop, orgJ); connections.get(i).put(i+1, new Pair<>(triple, NullWritable.get())); } @@ -232,8 +231,8 @@ public class ForwardChainTest { // This includes any path of length k for appropriate k: for (int k = minSpan; k <= maxSpan && j+k <= max; k++) { int middle = j + minSpan - 1; - URI left = TestUtils.uri("org" + j); - URI right = TestUtils.uri("org" + (j + k)); + IRI left = TestUtils.uri("org" + j); + IRI right = TestUtils.uri("org" + (j + k)); Fact triple = new Fact(left, prop, right, i, OwlRule.PRP_TRP, TestUtils.uri("org" + middle)); triple.addSource(connections.get(j).get(middle).getFirst()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/api/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.streams/api/pom.xml b/extras/rya.streams/api/pom.xml index 9253d01..22f9b21 100644 --- a/extras/rya.streams/api/pom.xml +++ b/extras/rya.streams/api/pom.xml @@ -41,8 +41,8 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryparser-sparql</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryparser-sparql</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/interactor/defaults/DefaultAddQuery.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/interactor/defaults/DefaultAddQuery.java b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/interactor/defaults/DefaultAddQuery.java index 67edec0..c06a61c 100644 --- a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/interactor/defaults/DefaultAddQuery.java +++ b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/interactor/defaults/DefaultAddQuery.java @@ -24,8 +24,8 @@ import org.apache.rya.streams.api.entity.StreamsQuery; import org.apache.rya.streams.api.exception.RyaStreamsException; import org.apache.rya.streams.api.interactor.AddQuery; import org.apache.rya.streams.api.queries.QueryRepository; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; 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/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryChangeLog.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryChangeLog.java b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryChangeLog.java index f0f628e..1563e2f 100644 --- a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryChangeLog.java +++ b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryChangeLog.java @@ -25,11 +25,12 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.locks.ReentrantLock; +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; /** * An in memory implementation of {@link QueryChangeLog}. Anything that is stored in this change log will be http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryRepository.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryRepository.java b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryRepository.java index c71f0f8..4544fbb 100644 --- a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryRepository.java +++ b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/InMemoryQueryRepository.java @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import org.apache.rya.streams.api.entity.StreamsQuery; import org.apache.rya.streams.api.queries.QueryChangeLog.QueryChangeLogException; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +40,6 @@ import com.google.common.util.concurrent.AbstractScheduledService; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; -import info.aduna.iteration.CloseableIteration; /** * An in memory implementation of {@link QueryRepository}. It is lazily @@ -262,7 +262,7 @@ public class InMemoryQueryRepository extends AbstractScheduledService implements listeners.forEach(listener -> listener.notify(entry, newQueryState)); cachePosition = Optional.of( entry.getPosition() ); - log.debug("New chache position: " + cachePosition); + log.debug("New cache position: " + cachePosition); } } catch (final QueryChangeLogException e) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/QueryChangeLog.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/QueryChangeLog.java b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/QueryChangeLog.java index 5765366..6accdf6 100644 --- a/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/QueryChangeLog.java +++ b/extras/rya.streams/api/src/main/java/org/apache/rya/streams/api/queries/QueryChangeLog.java @@ -18,9 +18,10 @@ */ package org.apache.rya.streams.api.queries; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; + import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; -import info.aduna.iteration.CloseableIteration; /** * An ordered log of all of the changes that have been applied to the SPARQL Queries that are managed by Rya Streams. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/client/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/pom.xml b/extras/rya.streams/client/pom.xml index dc5009b..f93f6ac 100644 --- a/extras/rya.streams/client/pom.xml +++ b/extras/rya.streams/client/pom.xml @@ -50,28 +50,28 @@ under the License. <!-- Statement formats we support for loading. --> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-nquads</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-nquads</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-ntriples</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-ntriples</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-rdfxml</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-rdfxml</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-trig</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-trig</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-turtle</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-turtle</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryresultio-sparqljson</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryresultio-sparqljson</artifactId> </dependency> <!-- Third Party dependencies --> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/AddQueryCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/AddQueryCommand.java b/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/AddQueryCommand.java index 3886a95..f80b85a 100644 --- a/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/AddQueryCommand.java +++ b/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/AddQueryCommand.java @@ -33,7 +33,7 @@ import org.apache.rya.streams.api.queries.QueryRepository; import org.apache.rya.streams.client.RyaStreamsCommand; import org.apache.rya.streams.kafka.KafkaTopics; import org.apache.rya.streams.kafka.queries.KafkaQueryChangeLogFactory; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/StreamResultsCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/StreamResultsCommand.java b/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/StreamResultsCommand.java index 783aedc..dcc2ce8 100644 --- a/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/StreamResultsCommand.java +++ b/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/command/StreamResultsCommand.java @@ -37,10 +37,10 @@ import org.apache.rya.streams.kafka.interactor.KafkaGetQueryResultStream; import org.apache.rya.streams.kafka.queries.KafkaQueryChangeLogFactory; import org.apache.rya.streams.kafka.serialization.VisibilityBindingSetDeserializer; import org.apache.rya.streams.kafka.serialization.VisibilityStatementDeserializer; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Reduced; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Reduced; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/util/QueryResultsOutputUtil.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/util/QueryResultsOutputUtil.java b/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/util/QueryResultsOutputUtil.java index 114a6fe..a05d596 100644 --- a/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/util/QueryResultsOutputUtil.java +++ b/extras/rya.streams/client/src/main/java/org/apache/rya/streams/client/util/QueryResultsOutputUtil.java @@ -27,15 +27,15 @@ import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.model.VisibilityStatement; import org.apache.rya.streams.api.entity.QueryResultStream; import org.apache.rya.streams.api.exception.RyaStreamsException; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.resultio.sparqljson.SPARQLResultsJSONWriter; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.Rio; -import org.openrdf.rio.WriterConfig; -import org.openrdf.rio.helpers.BasicWriterSettings; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.resultio.sparqljson.SPARQLResultsJSONWriter; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.Rio; +import org.eclipse.rdf4j.rio.WriterConfig; +import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/LoadStatementsCommandIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/LoadStatementsCommandIT.java b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/LoadStatementsCommandIT.java index 03c31b4..7e79fe4 100644 --- a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/LoadStatementsCommandIT.java +++ b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/LoadStatementsCommandIT.java @@ -36,15 +36,16 @@ import org.apache.rya.streams.kafka.KafkaTopics; import org.apache.rya.streams.kafka.serialization.VisibilityStatementDeserializer; 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.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; /** * Integration tests the methods of {@link LoadStatementsCommand}. */ public class LoadStatementsCommandIT { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private static final Path TURTLE_FILE = Paths.get("src/test/resources/statements.ttl"); @@ -83,16 +84,15 @@ public class LoadStatementsCommandIT { } } - final ValueFactory VF = ValueFactoryImpl.getInstance(); final List<VisibilityStatement> expected = new ArrayList<>(); expected.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)); expected.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)); expected.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 statements matches the read ones. @@ -129,16 +129,15 @@ public class LoadStatementsCommandIT { } } - final ValueFactory VF = ValueFactoryImpl.getInstance(); final List<VisibilityStatement> expected = new ArrayList<>(); expected.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)); expected.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)); expected.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 statements matches the read ones. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java index 6df7a3d..9fbc2c6 100644 --- a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java +++ b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java @@ -52,13 +52,13 @@ import org.apache.rya.streams.kafka.serialization.queries.QueryChangeDeserialize import org.apache.rya.streams.kafka.serialization.queries.QueryChangeSerializer; 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; @@ -148,34 +148,34 @@ public class RunQueryCommandIT { }; // 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/client/src/test/java/org/apache/rya/streams/client/util/QueryResultsOutputUtilTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/util/QueryResultsOutputUtilTest.java b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/util/QueryResultsOutputUtilTest.java index b82e671..be0db23 100644 --- a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/util/QueryResultsOutputUtilTest.java +++ b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/util/QueryResultsOutputUtilTest.java @@ -31,13 +31,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.model.VisibilityStatement; import org.apache.rya.streams.api.entity.QueryResultStream; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.base.Charsets; @@ -46,7 +46,7 @@ import com.google.common.base.Charsets; */ public class QueryResultsOutputUtilTest { - private static final ValueFactory VF = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void toNtriplesFile() throws Exception { @@ -58,10 +58,10 @@ public class QueryResultsOutputUtilTest { final List<VisibilityStatement> results = new ArrayList<>(); - Statement stmt = VF.createStatement(VF.createURI("urn:alice"), VF.createURI("urn:age"), VF.createLiteral(23)); + Statement stmt = VF.createStatement(VF.createIRI("urn:alice"), VF.createIRI("urn:age"), VF.createLiteral(23)); results.add( new VisibilityStatement(stmt) ); - stmt = VF.createStatement(VF.createURI("urn:bob"), VF.createURI("urn:worksAt"), VF.createLiteral("Taco Shop")); + stmt = VF.createStatement(VF.createIRI("urn:bob"), VF.createIRI("urn:worksAt"), VF.createLiteral("Taco Shop")); results.add( new VisibilityStatement(stmt) ); return results; }); @@ -103,7 +103,7 @@ public class QueryResultsOutputUtilTest { MapBindingSet bs = new MapBindingSet(); bs.addBinding("name", VF.createLiteral("alice")); bs.addBinding("company", VF.createLiteral("Taco Shop")); - bs.addBinding("ssn", VF.createURI("urn:111-11-1111")); + bs.addBinding("ssn", VF.createIRI("urn:111-11-1111")); results.add(new VisibilityBindingSet(bs, "")); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.streams/geo/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/geo/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java b/extras/rya.streams/geo/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java index 17a290a..82aa4b8 100644 --- a/extras/rya.streams/geo/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java +++ b/extras/rya.streams/geo/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java @@ -38,18 +38,17 @@ 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; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Geometry; @@ -104,7 +103,7 @@ public class GeoFilterIT { 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 = getStatements(); // Make the expected results. @@ -127,11 +126,11 @@ public class GeoFilterIT { } private static Statement statement(final Geometry geo) { - final ValueFactory vf = new ValueFactoryImpl(); - final Resource subject = vf.createURI("urn:event1"); - final URI predicate = GeoConstants.GEO_AS_WKT; + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Resource subject = vf.createIRI("urn:event1"); + final IRI predicate = GeoConstants.GEO_AS_WKT; final WKTWriter w = new WKTWriter(); final Value object = vf.createLiteral(w.write(geo), GeoConstants.XMLSCHEMA_OGC_WKT); - return new StatementImpl(subject, predicate, object); + return vf.createStatement(subject, predicate, object); } } \ No newline at end of file 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/aggregation/AggregationProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java index 2a1e760..ab0c2ab 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java @@ -34,12 +34,12 @@ import org.apache.rya.streams.kafka.processors.aggregation.AggregationProcessorS 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.model.vocabulary.XMLSchema; +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.model.vocabulary.XMLSchema; -import org.openrdf.query.impl.MapBindingSet; /** * Integration tests {@link AggregationProcessor}. @@ -59,29 +59,29 @@ public class AggregationProcessorIT { "} GROUP BY ?person"; // 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:Alice"), vf.createURI("urn:hasBook"), vf.createLiteral("Book 1")), "a")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasBook"), vf.createLiteral("Book 1")), "a")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:hasBook"), vf.createLiteral("Book 1")), "")); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:hasBook"), vf.createLiteral("Book 1")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasBook"), vf.createLiteral("Book 2")), "b")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasBook"), vf.createLiteral("Book 2")), "b")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("bookCount", vf.createLiteral("1", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "a")); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Bob")); + bs.addBinding("person", vf.createIRI("urn:Bob")); bs.addBinding("bookCount", vf.createLiteral("1", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "")); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("bookCount", vf.createLiteral("2", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "a&b")); @@ -109,26 +109,26 @@ public class AggregationProcessorIT { "} GROUP BY ?person"; // 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:Alice"), vf.createURI("urn:hasFoodType"), vf.createURI("urn:corn")), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasFoodType"), vf.createIRI("urn:corn")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasFoodType"), vf.createURI("urn:apple")), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasFoodType"), vf.createIRI("urn:apple")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:corn"), vf.createURI("urn:count"), vf.createLiteral(4)), "")); + vf.createStatement(vf.createIRI("urn:corn"), vf.createIRI("urn:count"), vf.createLiteral(4)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:apple"), vf.createURI("urn:count"), vf.createLiteral(3)), "")); + vf.createStatement(vf.createIRI("urn:apple"), vf.createIRI("urn:count"), vf.createLiteral(3)), "")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("totalFood", vf.createLiteral("4", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "")); bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("totalFood", vf.createLiteral("7", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "")); @@ -155,14 +155,14 @@ public class AggregationProcessorIT { "}"; // 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:Alice"), vf.createURI("urn:age"), vf.createLiteral(3)), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:age"), vf.createLiteral(3)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:age"), vf.createLiteral(7)), "")); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:age"), vf.createLiteral(7)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:age"), vf.createLiteral(2)), "")); + vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:age"), vf.createLiteral(2)), "")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); @@ -201,18 +201,18 @@ public class AggregationProcessorIT { "}"; // 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:Alice"), vf.createURI("urn:age"), vf.createLiteral(13)), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:age"), vf.createLiteral(13)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:age"), vf.createLiteral(14)), "")); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:age"), vf.createLiteral(14)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:age"), vf.createLiteral(7)), "")); + vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:age"), vf.createLiteral(7)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:David"), vf.createURI("urn:age"), vf.createLiteral(5)), "")); + vf.createStatement(vf.createIRI("urn:David"), vf.createIRI("urn:age"), vf.createLiteral(5)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:age"), vf.createLiteral(25)), "")); + vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:age"), vf.createLiteral(25)), "")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); @@ -251,18 +251,18 @@ public class AggregationProcessorIT { "}"; // 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:Alice"), vf.createURI("urn:age"), vf.createLiteral(13)), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:age"), vf.createLiteral(13)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:age"), vf.createLiteral(14)), "")); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:age"), vf.createLiteral(14)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:age"), vf.createLiteral(7)), "")); + vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:age"), vf.createLiteral(7)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:David"), vf.createURI("urn:age"), vf.createLiteral(5)), "")); + vf.createStatement(vf.createIRI("urn:David"), vf.createIRI("urn:age"), vf.createLiteral(5)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:age"), vf.createLiteral(25)), "")); + vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:age"), vf.createLiteral(25)), "")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); @@ -304,65 +304,65 @@ public class AggregationProcessorIT { "} GROUP BY ?business ?employee"; // 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:Alice"), vf.createURI("urn:worksAt"), vf.createURI("urn:TacoJoint")), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:TacoJoint")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:TacoJoint"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard1")), "")); + vf.createStatement(vf.createIRI("urn:TacoJoint"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard1")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard1")), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard1")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:timecard1"), vf.createURI("urn:hours"), vf.createLiteral(40)), "")); + vf.createStatement(vf.createIRI("urn:timecard1"), vf.createIRI("urn:hours"), vf.createLiteral(40)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:TacoJoint"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard2")), "")); + vf.createStatement(vf.createIRI("urn:TacoJoint"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard2")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard2")), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard2")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:timecard2"), vf.createURI("urn:hours"), vf.createLiteral(25)), "")); + vf.createStatement(vf.createIRI("urn:timecard2"), vf.createIRI("urn:hours"), vf.createLiteral(25)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:worksAt"), vf.createURI("urn:TacoJoint")), "")); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:TacoJoint")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:TacoJoint"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard3")), "")); + vf.createStatement(vf.createIRI("urn:TacoJoint"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard3")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard3")), "")); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard3")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:timecard3"), vf.createURI("urn:hours"), vf.createLiteral(28)), "")); + vf.createStatement(vf.createIRI("urn:timecard3"), vf.createIRI("urn:hours"), vf.createLiteral(28)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:worksAt"), vf.createURI("urn:CoffeeShop")), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:worksAt"), vf.createIRI("urn:CoffeeShop")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:CoffeeShop"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard5")), "")); + vf.createStatement(vf.createIRI("urn:CoffeeShop"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard5")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard5")), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasTimecardId"), vf.createIRI("urn:timecard5")), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:timecard5"), vf.createURI("urn:hours"), vf.createLiteral(12)), "")); + vf.createStatement(vf.createIRI("urn:timecard5"), vf.createIRI("urn:hours"), vf.createLiteral(12)), "")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); - bs.addBinding("employee", vf.createURI("urn:Alice")); + bs.addBinding("business", vf.createIRI("urn:TacoJoint")); + bs.addBinding("employee", vf.createIRI("urn:Alice")); bs.addBinding("totalHours", vf.createLiteral("40", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "")); bs = new MapBindingSet(); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); - bs.addBinding("employee", vf.createURI("urn:Alice")); + bs.addBinding("business", vf.createIRI("urn:TacoJoint")); + bs.addBinding("employee", vf.createIRI("urn:Alice")); bs.addBinding("totalHours", vf.createLiteral("65", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "")); bs = new MapBindingSet(); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); - bs.addBinding("employee", vf.createURI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoJoint")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); bs.addBinding("totalHours", vf.createLiteral("28", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "")); bs = new MapBindingSet(); - bs.addBinding("business", vf.createURI("urn:CoffeeShop")); - bs.addBinding("employee", vf.createURI("urn:Alice")); + bs.addBinding("business", vf.createIRI("urn:CoffeeShop")); + bs.addBinding("employee", vf.createIRI("urn:Alice")); bs.addBinding("totalHours", vf.createLiteral("12", XMLSchema.INTEGER)); expected.add(new VisibilityBindingSet(bs, "")); @@ -389,18 +389,18 @@ public class AggregationProcessorIT { "}"; // 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:Alice"), vf.createURI("urn:age"), vf.createLiteral(13)), "")); + vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:age"), vf.createLiteral(13)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:age"), vf.createLiteral(14)), "")); + vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:age"), vf.createLiteral(14)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:age"), vf.createLiteral(7)), "")); + vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:age"), vf.createLiteral(7)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:David"), vf.createURI("urn:age"), vf.createLiteral(5)), "")); + vf.createStatement(vf.createIRI("urn:David"), vf.createIRI("urn:age"), vf.createLiteral(5)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:age"), vf.createLiteral(25)), "")); + vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:age"), vf.createLiteral(25)), "")); // Make the expected results. final Set<VisibilityBindingSet> expected = new HashSet<>();
