http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/rdftriplestore/inference/OneOfVisitorTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/OneOfVisitorTest.java b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/OneOfVisitorTest.java index 9c6cc86..c1c6356 100644 --- a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/OneOfVisitorTest.java +++ b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/OneOfVisitorTest.java @@ -28,22 +28,22 @@ import java.util.Iterator; import java.util.Set; import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.BindingSetAssignment; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.ProjectionElem; +import org.eclipse.rdf4j.query.algebra.ProjectionElemList; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.BindingSetAssignment; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.ProjectionElem; -import org.openrdf.query.algebra.ProjectionElemList; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -53,31 +53,31 @@ import com.google.common.collect.Sets; */ public class OneOfVisitorTest { private final AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); - private static final ValueFactory VF = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); - private static final URI SUITS = VF.createURI("urn:Suits"); - private static final URI RANKS = VF.createURI("urn:Ranks"); + private static final IRI SUITS = VF.createIRI("urn:Suits"); + private static final IRI RANKS = VF.createIRI("urn:Ranks"); // Definition #1: :Suits owl:oneOf(:Clubs, :Diamonds, :Hearts, :Spades) - private static final URI CLUBS = VF.createURI("urn:Clubs"); - private static final URI DIAMONDS = VF.createURI("urn:Diamonds"); - private static final URI HEARTS = VF.createURI("urn:Hearts"); - private static final URI SPADES = VF.createURI("urn:Spades"); + private static final IRI CLUBS = VF.createIRI("urn:Clubs"); + private static final IRI DIAMONDS = VF.createIRI("urn:Diamonds"); + private static final IRI HEARTS = VF.createIRI("urn:Hearts"); + private static final IRI SPADES = VF.createIRI("urn:Spades"); // Definition #2: :Ranks owl:oneOf(:Ace, :2, :3, :4, :5, :6, :7, :8, :9, :10, :Jack, :Queen, :King) - private static final URI ACE = VF.createURI("urn:Ace"); - private static final URI TWO = VF.createURI("urn:2"); - private static final URI THREE = VF.createURI("urn:3"); - private static final URI FOUR = VF.createURI("urn:4"); - private static final URI FIVE = VF.createURI("urn:5"); - private static final URI SIX = VF.createURI("urn:6"); - private static final URI SEVEN = VF.createURI("urn:7"); - private static final URI EIGHT = VF.createURI("urn:8"); - private static final URI NINE = VF.createURI("urn:9"); - private static final URI TEN = VF.createURI("urn:10"); - private static final URI JACK = VF.createURI("urn:Jack"); - private static final URI QUEEN = VF.createURI("urn:Queen"); - private static final URI KING = VF.createURI("urn:King"); + private static final IRI ACE = VF.createIRI("urn:Ace"); + private static final IRI TWO = VF.createIRI("urn:2"); + private static final IRI THREE = VF.createIRI("urn:3"); + private static final IRI FOUR = VF.createIRI("urn:4"); + private static final IRI FIVE = VF.createIRI("urn:5"); + private static final IRI SIX = VF.createIRI("urn:6"); + private static final IRI SEVEN = VF.createIRI("urn:7"); + private static final IRI EIGHT = VF.createIRI("urn:8"); + private static final IRI NINE = VF.createIRI("urn:9"); + private static final IRI TEN = VF.createIRI("urn:10"); + private static final IRI JACK = VF.createIRI("urn:Jack"); + private static final IRI QUEEN = VF.createIRI("urn:Queen"); + private static final IRI KING = VF.createIRI("urn:King"); private static final Set<Resource> CARD_SUIT_ENUMERATION = Sets.newLinkedHashSet(
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java index cf37c43..a3fd6ce 100644 --- a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java +++ b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java @@ -1,4 +1,3 @@ -package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,6 +16,8 @@ package org.apache.rya.rdftriplestore.inference; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.rdftriplestore.inference; + import java.util.List; import org.apache.accumulo.core.Constants; @@ -25,41 +26,22 @@ import org.apache.accumulo.core.client.admin.SecurityOperations; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; -import org.junit.Assert; -import org.junit.Test; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.Update; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; - -import junit.framework.TestCase; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; -import org.apache.rya.rdftriplestore.inference.InferenceEngine; -import org.apache.rya.rdftriplestore.inference.InverseURI; -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.junit.Assert; +import org.junit.Test; + +import junit.framework.TestCase; + public class PropertyChainTest extends TestCase { private String user = "user"; private String pwd = "pwd"; @@ -68,7 +50,7 @@ public class PropertyChainTest extends TestCase { private Authorizations auths = Constants.NO_AUTHS; private Connector connector; private AccumuloRyaDAO ryaDAO; - private ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private String namespace = "urn:test#"; private AccumuloRdfConfiguration conf; @@ -131,10 +113,10 @@ public class PropertyChainTest extends TestCase { Update update = conn.prepareUpdate(QueryLanguage.SPARQL, query); update.execute(); inferenceEngine.refreshGraph(); - List<URI> chain = inferenceEngine.getPropertyChain(vf.createURI("urn:greatMother")); + List<IRI> chain = inferenceEngine.getPropertyChain(VF.createIRI("urn:greatMother")); Assert.assertEquals(chain.size(), 2); - Assert.assertEquals(chain.get(0), new InverseURI(vf.createURI("urn:isChildOf"))); - Assert.assertEquals(chain.get(1), vf.createURI("urn:MotherOf")); + Assert.assertEquals(chain.get(0), new InverseURI(VF.createIRI("urn:isChildOf"))); + Assert.assertEquals(chain.get(1), VF.createIRI("urn:MotherOf")); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/rdftriplestore/inference/ReflexivePropertyVisitorTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/ReflexivePropertyVisitorTest.java b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/ReflexivePropertyVisitorTest.java index f151bd3..bebf143 100644 --- a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/ReflexivePropertyVisitorTest.java +++ b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/ReflexivePropertyVisitorTest.java @@ -23,29 +23,29 @@ import static org.mockito.Mockito.when; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.ProjectionElem; +import org.eclipse.rdf4j.query.algebra.ProjectionElemList; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Union; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.ZeroLengthPath; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.ProjectionElem; -import org.openrdf.query.algebra.ProjectionElemList; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Union; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.ZeroLengthPath; /** * Tests the methods of {@link ReflexivePropertyVisitor}. */ public class ReflexivePropertyVisitorTest { private final AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); - private static final ValueFactory VF = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); - private static final URI ALICE = VF.createURI("urn:Alice"); - private static final URI HAS_FAMILY = VF.createURI("urn:hasFamilyMember"); + private static final IRI ALICE = VF.createIRI("urn:Alice"); + private static final IRI HAS_FAMILY = VF.createIRI("urn:hasFamilyMember"); @Test public void testReflexiveProperty() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SameAsTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SameAsTest.java b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SameAsTest.java index 43184c4..16d2539 100644 --- a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SameAsTest.java +++ b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SameAsTest.java @@ -1,5 +1,3 @@ -package org.apache.rya.rdftriplestore.inference; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,17 +16,7 @@ package org.apache.rya.rdftriplestore.inference; * specific language governing permissions and limitations * under the License. */ - - - -import info.aduna.iteration.Iterations; -import junit.framework.TestCase; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.accumulo.AccumuloRyaDAO; -import org.apache.rya.api.RdfCloudTripleStoreConstants; -import org.apache.rya.api.resolver.RdfToRyaConversions; -import org.apache.rya.rdftriplestore.RdfCloudTripleStore; -import org.apache.rya.rdftriplestore.inference.InferenceEngine; +package org.apache.rya.rdftriplestore.inference; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; @@ -36,13 +24,20 @@ import org.apache.accumulo.core.client.admin.SecurityOperations; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.eclipse.rdf4j.common.iteration.Iterations; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; + +import junit.framework.TestCase; public class SameAsTest extends TestCase { private String user = "user"; @@ -52,7 +47,7 @@ public class SameAsTest extends TestCase { private Authorizations auths = Constants.NO_AUTHS; private Connector connector; private AccumuloRyaDAO ryaDAO; - private ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private String namespace = "urn:test#"; private AccumuloRdfConfiguration conf; @@ -91,13 +86,13 @@ public class SameAsTest extends TestCase { @Test //This isn't a good test. It's simply a cut-and-paste from a test that was failing in a different package in the SameAsVisitor. public void testGraphConfiguration() throws Exception { - URI a = vf.createURI(namespace, "a"); - Statement statement = new StatementImpl(a, vf.createURI(namespace, "p"), vf.createLiteral("l")); - Statement statement2 = new StatementImpl(a, vf.createURI(namespace, "p2"), vf.createLiteral("l")); + IRI a = VF.createIRI(namespace, "a"); + Statement statement = VF.createStatement(a, VF.createIRI(namespace, "p"), VF.createLiteral("l")); + Statement statement2 = VF.createStatement(a, VF.createIRI(namespace, "p2"), VF.createLiteral("l")); ryaDAO.add(RdfToRyaConversions.convertStatement(statement)); ryaDAO.add(RdfToRyaConversions.convertStatement(statement2)); - ryaDAO.add(RdfToRyaConversions.convertStatement(new StatementImpl(vf.createURI(namespace, "b"), vf.createURI(namespace, "p"), vf.createLiteral("l")))); - ryaDAO.add(RdfToRyaConversions.convertStatement(new StatementImpl(vf.createURI(namespace, "c"), vf.createURI(namespace, "n"), vf.createLiteral("l")))); + ryaDAO.add(RdfToRyaConversions.convertStatement(VF.createStatement(VF.createIRI(namespace, "b"), VF.createIRI(namespace, "p"), VF.createLiteral("l")))); + ryaDAO.add(RdfToRyaConversions.convertStatement(VF.createStatement(VF.createIRI(namespace, "c"), VF.createIRI(namespace, "n"), VF.createLiteral("l")))); // build a connection RdfCloudTripleStore store = new RdfCloudTripleStore(); @@ -110,6 +105,6 @@ public class SameAsTest extends TestCase { store.initialize(); - System.out.println(Iterations.asList(store.getConnection().getStatements(a, vf.createURI(namespace, "p"), vf.createLiteral("l"), false, new Resource[0])).size()); + System.out.println(Iterations.asList(store.getConnection().getStatements(a, VF.createIRI(namespace, "p"), VF.createLiteral("l"), false, new Resource[0])).size()); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SomeValuesFromVisitorTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SomeValuesFromVisitorTest.java b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SomeValuesFromVisitorTest.java index 013e535..603144e 100644 --- a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SomeValuesFromVisitorTest.java +++ b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/SomeValuesFromVisitorTest.java @@ -28,46 +28,46 @@ import java.util.Set; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.api.utils.NullableStatementImpl; import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.ProjectionElem; +import org.eclipse.rdf4j.query.algebra.ProjectionElemList; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Union; +import org.eclipse.rdf4j.query.algebra.Var; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.ProjectionElem; -import org.openrdf.query.algebra.ProjectionElemList; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Union; -import org.openrdf.query.algebra.Var; import com.google.common.collect.Sets; public class SomeValuesFromVisitorTest { private static final AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); // Value types - private final URI course = vf.createURI("lubm:Course"); - private final URI gradCourse = vf.createURI("lubm:GraduateCourse"); - private final URI department = vf.createURI("lubm:Department"); - private final URI organization = vf.createURI("lubm:Organization"); + private final IRI course = VF.createIRI("lubm:Course"); + private final IRI gradCourse = VF.createIRI("lubm:GraduateCourse"); + private final IRI department = VF.createIRI("lubm:Department"); + private final IRI organization = VF.createIRI("lubm:Organization"); // Predicates - private final URI takesCourse = vf.createURI("lubm:takesCourse"); - private final URI headOf = vf.createURI("lubm:headOf"); - private final URI worksFor = vf.createURI("lubm:worksFor"); + private final IRI takesCourse = VF.createIRI("lubm:takesCourse"); + private final IRI headOf = VF.createIRI("lubm:headOf"); + private final IRI worksFor = VF.createIRI("lubm:worksFor"); // Supertype of restriction types - private final URI person = vf.createURI("lubm:Person"); + private final IRI person = VF.createIRI("lubm:Person"); @Test public void testSomeValuesFrom() throws Exception { // Configure a mock instance engine with an ontology: final InferenceEngine inferenceEngine = mock(InferenceEngine.class); - Map<Resource, Set<URI>> personSVF = new HashMap<>(); + Map<Resource, Set<IRI>> personSVF = new HashMap<>(); personSVF.put(gradCourse, Sets.newHashSet(takesCourse)); personSVF.put(course, Sets.newHashSet(takesCourse)); personSVF.put(department, Sets.newHashSet(headOf)); @@ -136,7 +136,7 @@ public class SomeValuesFromVisitorTest { disabledConf.setInferSomeValuesFrom(false); // Configure a mock instance engine with an ontology: final InferenceEngine inferenceEngine = mock(InferenceEngine.class); - Map<Resource, Set<URI>> personSVF = new HashMap<>(); + Map<Resource, Set<IRI>> personSVF = new HashMap<>(); personSVF.put(gradCourse, Sets.newHashSet(takesCourse)); personSVF.put(course, Sets.newHashSet(takesCourse)); personSVF.put(department, Sets.newHashSet(headOf)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 92ad4b0..cdf5259 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -69,16 +69,16 @@ under the License. </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-nquads</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-nquads</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-trig</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-trig</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/test/rdf/pom.xml ---------------------------------------------------------------------- diff --git a/test/rdf/pom.xml b/test/rdf/pom.xml index de4a58f..81cd2e7 100644 --- a/test/rdf/pom.xml +++ b/test/rdf/pom.xml @@ -36,12 +36,12 @@ under the License. <dependencies> <!-- Third Party Dependencies --> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryalgebra-model</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryalgebra-model</artifactId> </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/test/rdf/src/main/java/org/apache/rya/streams/kafka/RdfTestUtil.java ---------------------------------------------------------------------- diff --git a/test/rdf/src/main/java/org/apache/rya/streams/kafka/RdfTestUtil.java b/test/rdf/src/main/java/org/apache/rya/streams/kafka/RdfTestUtil.java index b4388c3..4e91dee 100644 --- a/test/rdf/src/main/java/org/apache/rya/streams/kafka/RdfTestUtil.java +++ b/test/rdf/src/main/java/org/apache/rya/streams/kafka/RdfTestUtil.java @@ -22,13 +22,13 @@ import static java.util.Objects.requireNonNull; import java.util.concurrent.atomic.AtomicReference; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.MultiProjection; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.StatementPattern; -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.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.MultiProjection; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -45,7 +45,7 @@ public final class RdfTestUtil { /** * Fetch the {@link StatementPattern} from a SPARQL string. * - * @param sparql - A SPARQL query that contains only a single Statement Patern. (not nul) + * @param sparql - A SPARQL query that contains only a single Statement Pattern. (not null) * @return The {@link StatementPattern} that was in the query, if it could be found. Otherwise {@code null} * @throws Exception The statement pattern could not be found in the parsed SPARQL query. */ @@ -54,7 +54,7 @@ public final class RdfTestUtil { final AtomicReference<StatementPattern> statementPattern = new AtomicReference<>(); final ParsedQuery parsed = new SPARQLParser().parseQuery(sparql, null); - parsed.getTupleExpr().visitChildren(new QueryModelVisitorBase<Exception>() { + parsed.getTupleExpr().visitChildren(new AbstractQueryModelVisitor<Exception>() { @Override public void meet(final StatementPattern node) throws Exception { statementPattern.set(node); @@ -75,7 +75,7 @@ public final class RdfTestUtil { final AtomicReference<Projection> projection = new AtomicReference<>(); final ParsedQuery parsed = new SPARQLParser().parseQuery(sparql, null); - parsed.getTupleExpr().visit(new QueryModelVisitorBase<Exception>() { + parsed.getTupleExpr().visit(new AbstractQueryModelVisitor<Exception>() { @Override public void meet(final Projection node) throws Exception { projection.set(node); @@ -97,7 +97,7 @@ public final class RdfTestUtil { final AtomicReference<MultiProjection> multiProjection = new AtomicReference<>(); final ParsedQuery parsed = new SPARQLParser().parseQuery(sparql, null); - parsed.getTupleExpr().visit(new QueryModelVisitorBase<Exception>() { + parsed.getTupleExpr().visit(new AbstractQueryModelVisitor<Exception>() { @Override public void meet(final MultiProjection node) throws Exception { multiProjection.set(node); @@ -119,7 +119,7 @@ public final class RdfTestUtil { final AtomicReference<Filter> filter = new AtomicReference<>(); final ParsedQuery parsed = new SPARQLParser().parseQuery(sparql, null); - parsed.getTupleExpr().visit(new QueryModelVisitorBase<Exception>() { + parsed.getTupleExpr().visit(new AbstractQueryModelVisitor<Exception>() { @Override public void meet(final Filter node) throws Exception { filter.set(node); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/pom.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/pom.xml b/web/web.rya/pom.xml index 5ac191d..371ca8f 100644 --- a/web/web.rya/pom.xml +++ b/web/web.rya/pom.xml @@ -54,12 +54,12 @@ under the License. </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-queryresultio-sparqljson</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryresultio-sparqljson</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java index b94af1e..0f1b44a 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java @@ -25,9 +25,9 @@ //import org.apache.rya.cloudbase.CloudbaseRdfDAO; //import org.apache.rya.cloudbase.CloudbaseRdfEvalStatsDAO; //import RdfCloudTripleStore; -//import org.openrdf.repository.Repository; -//import org.openrdf.repository.RepositoryException; -//import org.openrdf.repository.sail.SailRepository; +//import org.eclipse.rdf4j.repository.Repository; +//import org.eclipse.rdf4j.repository.RepositoryException; +//import org.eclipse.rdf4j.repository.sail.SailRepository; // //import javax.servlet.ServletConfig; //import javax.servlet.ServletException; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java index 7cff739..fd1081b 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java @@ -20,11 +20,11 @@ //package org.apache.cloud.rdf.web.cloudbase.sail; // -//import org.openrdf.query.QueryLanguage; -//import org.openrdf.query.TupleQuery; -//import org.openrdf.query.resultio.TupleQueryResultWriter; -//import org.openrdf.repository.RepositoryConnection; -//import org.openrdf.repository.RepositoryException; +//import org.eclipse.rdf4j.query.QueryLanguage; +//import org.eclipse.rdf4j.query.TupleQuery; +//import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriter; +//import org.eclipse.rdf4j.repository.RepositoryConnection; +//import org.eclipse.rdf4j.repository.RepositoryException; // //import javax.servlet.ServletException; //import javax.servlet.http.HttpServletRequest; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java index 17e3478..b534ff4 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java @@ -20,11 +20,11 @@ //package org.apache.cloud.rdf.web.cloudbase.sail; // -//import org.openrdf.model.Resource; -//import org.openrdf.repository.RepositoryConnection; -//import org.openrdf.repository.RepositoryException; -//import org.openrdf.rio.RDFFormat; -//import org.openrdf.rio.RDFParseException; +//import org.eclipse.rdf4j.model.Resource; +//import org.eclipse.rdf4j.repository.RepositoryConnection; +//import org.eclipse.rdf4j.repository.RepositoryException; +//import org.eclipse.rdf4j.rio.RDFFormat; +//import org.eclipse.rdf4j.rio.RDFParseException; // //import javax.servlet.ServletException; //import javax.servlet.ServletInputStream; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java index fdc0598..a60440d 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java @@ -22,16 +22,16 @@ // //import RdfCloudTripleStoreConstants; //import RdfCloudTripleStoreConstants; -//import org.openrdf.model.ValueFactory; -//import org.openrdf.model.impl.ValueFactoryImpl; -//import org.openrdf.query.GraphQuery; -//import org.openrdf.query.QueryLanguage; -//import org.openrdf.query.TupleQuery; -//import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter; -//import org.openrdf.repository.Repository; -//import org.openrdf.repository.RepositoryConnection; -//import org.openrdf.repository.RepositoryException; -//import org.openrdf.rio.rdfxml.RDFXMLWriter; +//import org.eclipse.rdf4j.model.ValueFactory; +//import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +//import org.eclipse.rdf4j.query.GraphQuery; +//import org.eclipse.rdf4j.query.QueryLanguage; +//import org.eclipse.rdf4j.query.TupleQuery; +//import org.eclipse.rdf4j.query.resultio.sparqlxml.SPARQLResultsXMLWriter; +//import org.eclipse.rdf4j.repository.Repository; +//import org.eclipse.rdf4j.repository.RepositoryConnection; +//import org.eclipse.rdf4j.repository.RepositoryException; +//import org.eclipse.rdf4j.rio.rdfxml.RDFXMLWriter; // //import javax.servlet.ServletException; //import javax.servlet.ServletOutputStream; @@ -42,7 +42,7 @@ // //public class QueryDataServlet extends AbstractRDFWebServlet { // -// private ValueFactory vf = new ValueFactoryImpl(); +// private static final ValueFactory VF = SimpleValueFactory.getInstance(); // // @Override // protected void doGet(HttpServletRequest req, HttpServletResponse resp) @@ -99,17 +99,17 @@ // GraphQuery graphQuery = conn.prepareGraphQuery( // QueryLanguage.SPARQL, query); // if (ttl != null && ttl.length() > 0) -// graphQuery.setBinding("ttl", vf.createLiteral(Long.parseLong(ttl))); +// graphQuery.setBinding("ttl", VF.createLiteral(Long.parseLong(ttl))); // if (startTime != null && startTime.length() > 0) -// graphQuery.setBinding("startTime", vf.createLiteral(Long.parseLong(startTime))); +// graphQuery.setBinding("startTime", VF.createLiteral(Long.parseLong(startTime))); // if (performant != null && performant.length() > 0) -// graphQuery.setBinding("performant", vf.createLiteral(Boolean.parseBoolean(performant))); +// graphQuery.setBinding("performant", VF.createLiteral(Boolean.parseBoolean(performant))); // if (infer != null && infer.length() > 0) -// graphQuery.setBinding("infer", vf.createLiteral(Boolean.parseBoolean(infer))); +// graphQuery.setBinding("infer", VF.createLiteral(Boolean.parseBoolean(infer))); // if (useStats != null && useStats.length() > 0) -// graphQuery.setBinding("useStats", vf.createLiteral(Boolean.parseBoolean(useStats))); +// graphQuery.setBinding("useStats", VF.createLiteral(Boolean.parseBoolean(useStats))); // if (timeUris != null && timeUris.length() > 0) -// graphQuery.setBinding("timeUris", vf.createURI(timeUris)); +// graphQuery.setBinding("timeUris", VF.createIRI(timeUris)); // if (tablePrefix != null && tablePrefix.length() > 0) // RdfCloudTripleStoreConstants.prefixTables(tablePrefix); // RDFXMLWriter rdfWriter = new RDFXMLWriter(os); @@ -143,17 +143,17 @@ // TupleQuery tupleQuery = conn.prepareTupleQuery( // QueryLanguage.SPARQL, query); // if (ttl != null && ttl.length() > 0) -// tupleQuery.setBinding("ttl", vf.createLiteral(Long.parseLong(ttl))); +// tupleQuery.setBinding("ttl", VF.createLiteral(Long.parseLong(ttl))); // if (startTime != null && startTime.length() > 0) -// tupleQuery.setBinding("startTime", vf.createLiteral(Long.parseLong(startTime))); +// tupleQuery.setBinding("startTime", VF.createLiteral(Long.parseLong(startTime))); // if (performant != null && performant.length() > 0) -// tupleQuery.setBinding("performant", vf.createLiteral(Boolean.parseBoolean(performant))); +// tupleQuery.setBinding("performant", VF.createLiteral(Boolean.parseBoolean(performant))); // if (infer != null && infer.length() > 0) -// tupleQuery.setBinding("infer", vf.createLiteral(Boolean.parseBoolean(infer))); +// tupleQuery.setBinding("infer", VF.createLiteral(Boolean.parseBoolean(infer))); // if (useStats != null && useStats.length() > 0) -// tupleQuery.setBinding("useStats", vf.createLiteral(Boolean.parseBoolean(useStats))); +// tupleQuery.setBinding("useStats", VF.createLiteral(Boolean.parseBoolean(useStats))); // if (timeUris != null && timeUris.length() > 0) -// tupleQuery.setBinding("timeUris", vf.createURI(timeUris)); +// tupleQuery.setBinding("timeUris", VF.createIRI(timeUris)); // if (tablePrefix != null && tablePrefix.length() > 0) // RdfCloudTripleStoreConstants.prefixTables(tablePrefix); // SPARQLResultsXMLWriter sparqlWriter = new SPARQLResultsXMLWriter(os); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java index 89dd84a..2576da2 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java @@ -20,14 +20,14 @@ //package org.apache.cloud.rdf.web.cloudbase.sail; // -//import org.openrdf.query.GraphQuery; -//import org.openrdf.query.QueryLanguage; -//import org.openrdf.query.TupleQuery; -//import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter; -//import org.openrdf.repository.Repository; -//import org.openrdf.repository.RepositoryConnection; -//import org.openrdf.repository.RepositoryException; -//import org.openrdf.rio.rdfxml.RDFXMLWriter; +//import org.eclipse.rdf4j.query.GraphQuery; +//import org.eclipse.rdf4j.query.QueryLanguage; +//import org.eclipse.rdf4j.query.TupleQuery; +//import org.eclipse.rdf4j.query.resultio.sparqlxml.SPARQLResultsXMLWriter; +//import org.eclipse.rdf4j.repository.Repository; +//import org.eclipse.rdf4j.repository.RepositoryConnection; +//import org.eclipse.rdf4j.repository.RepositoryException; +//import org.eclipse.rdf4j.rio.rdfxml.RDFXMLWriter; // //import javax.servlet.ServletException; //import javax.servlet.ServletOutputStream; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java index ab539c4..5044413 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java @@ -19,8 +19,6 @@ package org.apache.cloud.rdf.web.sail; * under the License. */ - - import static org.apache.rya.api.RdfCloudTripleStoreConstants.VALUE_FACTORY; import java.io.IOException; @@ -40,35 +38,36 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.log.LogUtils; import org.apache.rya.api.security.SecurityProvider; import org.apache.rya.rdftriplestore.RdfCloudTripleStoreConnection; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.query.BindingSet; -import org.openrdf.query.GraphQuery; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.Update; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.query.parser.ParsedGraphQuery; -import org.openrdf.query.parser.ParsedOperation; -import org.openrdf.query.parser.ParsedTupleQuery; -import org.openrdf.query.parser.ParsedUpdate; -import org.openrdf.query.parser.QueryParserUtil; -import org.openrdf.query.resultio.sparqljson.SPARQLResultsJSONWriter; -import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.rdfxml.RDFXMLWriter; +import org.apache.rya.rdftriplestore.utils.RdfFormatUtils; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.GraphQuery; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.query.parser.ParsedGraphQuery; +import org.eclipse.rdf4j.query.parser.ParsedOperation; +import org.eclipse.rdf4j.query.parser.ParsedTupleQuery; +import org.eclipse.rdf4j.query.parser.ParsedUpdate; +import org.eclipse.rdf4j.query.parser.QueryParserUtil; +import org.eclipse.rdf4j.query.resultio.sparqljson.SPARQLResultsJSONWriter; +import org.eclipse.rdf4j.query.resultio.sparqlxml.SPARQLResultsXMLWriter; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.rdfxml.RDFXMLWriter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; @@ -332,7 +331,7 @@ public class RdfController { throws RepositoryException, IOException, RDFParseException { RDFFormat format_r = RDFFormat.RDFXML; if (format != null) { - format_r = RDFFormat.valueOf(format); + format_r = RdfFormatUtils.getRdfFormatFromName(format); if (format_r == null) { throw new RuntimeException("RDFFormat[" + format + "] not found"); } @@ -341,7 +340,7 @@ public class RdfController { // add named graph as context (if specified). final List<Resource> contextList = new ArrayList<Resource>(); if (graph != null) { - contextList.add(VALUE_FACTORY.createURI(graph)); + contextList.add(VALUE_FACTORY.createIRI(graph)); } SailRepositoryConnection conn = null; try { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml index 9f96b6f..ba9a945 100644 --- a/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml +++ b/web/web.rya/src/main/webapp/WEB-INF/spring/spring-root-extensions.xml @@ -99,7 +99,7 @@ under the License. <constructor-arg ref="indexerSettings"/> </bean> - <bean id="indexingSailRepo" class="org.openrdf.repository.sail.SailRepository" init-method="initialize" destroy-method="shutDown"> + <bean id="indexingSailRepo" class="org.eclipse.rdf4j.repository.sail.SailRepository" init-method="initialize" destroy-method="shutDown"> <constructor-arg ref="ryaIndexingSail"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerAccumuloTest.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerAccumuloTest.java b/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerAccumuloTest.java index 4d50df0..88c0739 100644 --- a/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerAccumuloTest.java +++ b/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerAccumuloTest.java @@ -19,7 +19,6 @@ package org.apache.cloud.rdf.web.sail; * under the License. */ - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -30,18 +29,18 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standal import java.io.ByteArrayInputStream; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.resultio.QueryResultIO; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.openrdf.query.BindingSet; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.resultio.QueryResultIO; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.rio.RDFFormat; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletResponse; @@ -154,7 +153,7 @@ public class RdfControllerAccumuloTest { private static void validateCount(MockHttpServletResponse response, int count) throws Exception { String rstString = response.getContentAsString(); - TupleQueryResult result = QueryResultIO.parse(new ByteArrayInputStream(rstString.getBytes()), TupleQueryResultFormat.SPARQL); + TupleQueryResult result = QueryResultIO.parseTuple(new ByteArrayInputStream(rstString.getBytes()), TupleQueryResultFormat.SPARQL); assertEquals(1, result.getBindingNames().size()); String binding = result.getBindingNames().get(0); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerTest.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerTest.java b/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerTest.java index f69de61..80227b1 100644 --- a/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerTest.java +++ b/web/web.rya/src/test/java/org/apache/cloud/rdf/web/sail/RdfControllerTest.java @@ -28,17 +28,17 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.rio.RDFFormat; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; @@ -170,8 +170,8 @@ public class RdfControllerTest { ValueFactory vf = repository.getValueFactory(); RepositoryConnection con = repository.getConnection(); - URI s = vf.createURI("http://mynamespace/ProductType1";); - URI p = vf.createURI("http://mynamespace#pred1";); + IRI s = vf.createIRI("http://mynamespace/ProductType1";); + IRI p = vf.createIRI("http://mynamespace#pred1";); Literal o = vf.createLiteral("test"); assertTrue(con.getStatements(s, p, o, false).hasNext()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/web/web.rya/src/test/resources/controllerTest-context.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/resources/controllerTest-context.xml b/web/web.rya/src/test/resources/controllerTest-context.xml index 39c018d..4286fae 100644 --- a/web/web.rya/src/test/resources/controllerTest-context.xml +++ b/web/web.rya/src/test/resources/controllerTest-context.xml @@ -27,11 +27,11 @@ under the License. <bean id="controller" class="org.apache.cloud.rdf.web.sail.RdfController"> </bean> - <bean id="repository" class="org.openrdf.repository.sail.SailRepository" init-method="initialize"> + <bean id="repository" class="org.eclipse.rdf4j.repository.sail.SailRepository" init-method="initialize"> <constructor-arg ref="memoryStore"/> </bean> - <bean id="memoryStore" class="org.openrdf.sail.memory.MemoryStore"> + <bean id="memoryStore" class="org.eclipse.rdf4j.sail.memory.MemoryStore"> <property name="persist" value="false"/> </bean>
