http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloAddUserIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloAddUserIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloAddUserIT.java index 10d24d1..ed359f4 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloAddUserIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloAddUserIT.java @@ -32,12 +32,12 @@ import org.apache.rya.api.client.RyaClient; import org.apache.rya.api.instance.RyaDetails; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailConnection; import com.google.common.collect.ImmutableList; @@ -147,7 +147,7 @@ public class AccumuloAddUserIT extends AccumuloITBase { sailConn = sail.getConnection(); final ValueFactory vf = sail.getValueFactory(); - sailConn.addStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")); + sailConn.addStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")); } catch(final RuntimeException e) { final Throwable cause = e.getCause(); @@ -198,7 +198,7 @@ public class AccumuloAddUserIT extends AccumuloITBase { final ValueFactory vf = sail.getValueFactory(); sailConn.begin(); - sailConn.addStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")); + sailConn.addStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")); sailConn.close(); } finally {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJIT.java index 78b4f52..2a6fbd5 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloBatchUpdatePCJIT.java @@ -34,12 +34,12 @@ import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.Precomputed import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailConnection; /** * Integration tests the methods of {@link AccumuloBatchUpdatePCJ}. @@ -82,23 +82,23 @@ public class AccumuloBatchUpdatePCJIT extends AccumuloITBase { final SailConnection sailConn = sail.getConnection(); sailConn.begin(); - sailConn.addStatement(vf.createURI("urn:Alice"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Bob"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:David"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Eve"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Frank"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:George"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Hillary"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - - sailConn.addStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Bob"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:David"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Eve"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Frank"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:George"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:green")); - sailConn.addStatement(vf.createURI("urn:Hillary"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:brown")); + sailConn.addStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:David"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Frank"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:George"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Hillary"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + + sailConn.addStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:David"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Frank"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:George"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:green")); + sailConn.addStatement(vf.createIRI("urn:Hillary"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:brown")); sailConn.commit(); sailConn.close(); @@ -113,27 +113,27 @@ public class AccumuloBatchUpdatePCJIT extends AccumuloITBase { final Set<BindingSet> expectedResults = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Alice")); + bs.addBinding("name", vf.createIRI("urn:Alice")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Bob")); + bs.addBinding("name", vf.createIRI("urn:Bob")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Charlie")); + bs.addBinding("name", vf.createIRI("urn:Charlie")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:David")); + bs.addBinding("name", vf.createIRI("urn:David")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Eve")); + bs.addBinding("name", vf.createIRI("urn:Eve")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Frank")); + bs.addBinding("name", vf.createIRI("urn:Frank")); expectedResults.add(bs); final Set<BindingSet> results = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJIT.java index 3463a02..3f5f5be 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloCreatePCJIT.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -34,14 +34,13 @@ import org.apache.rya.api.instance.RyaDetails; import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails; import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpdateStrategy; import org.apache.rya.indexing.pcj.fluo.api.ListQueryIds; -import org.apache.rya.indexing.pcj.fluo.app.IncUpdateDAO; import org.apache.rya.indexing.pcj.storage.PcjMetadata; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.base.Optional; import com.google.common.collect.Sets; @@ -88,16 +87,16 @@ public class AccumuloCreatePCJIT extends FluoITBase { // Insert some statements into Rya. final ValueFactory vf = ryaRepo.getValueFactory(); - ryaConn.add(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); - ryaConn.add(vf.createURI("http://Bob";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); - ryaConn.add(vf.createURI("http://Charlie";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Bob";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Charlie";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); - ryaConn.add(vf.createURI("http://Eve";), vf.createURI("http://helps";), vf.createURI("http://Kevin";)); + ryaConn.add(vf.createIRI("http://Eve";), vf.createIRI("http://helps";), vf.createIRI("http://Kevin";)); - ryaConn.add(vf.createURI("http://Bob";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://Charlie";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://Eve";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://David";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Bob";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Charlie";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Eve";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://David";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); // Verify the correct results were exported. fluo.waitForObservers(); @@ -105,12 +104,12 @@ public class AccumuloCreatePCJIT extends FluoITBase { final Set<BindingSet> results = Sets.newHashSet( pcjStorage.listResults(pcjId) ); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("x", vf.createURI("http://Bob";)); + bob.addBinding("x", vf.createIRI("http://Bob";)); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("x", vf.createURI("http://Charlie";)); + charlie.addBinding("x", vf.createIRI("http://Charlie";)); - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(bob, charlie); + final Set<BindingSet> expected = Sets.newHashSet(bob, charlie); assertEquals(expected, results); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJIT.java index 59ee546..ae64abb 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloDeletePCJIT.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -37,11 +37,11 @@ import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageException; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.repository.RepositoryException; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.repository.RepositoryException; import com.google.common.collect.Sets; @@ -70,16 +70,16 @@ public class AccumuloDeletePCJIT extends FluoITBase { // Insert some statements into Rya. final ValueFactory vf = ryaRepo.getValueFactory(); - ryaConn.add(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); - ryaConn.add(vf.createURI("http://Bob";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); - ryaConn.add(vf.createURI("http://Charlie";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Bob";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Charlie";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); - ryaConn.add(vf.createURI("http://Eve";), vf.createURI("http://helps";), vf.createURI("http://Kevin";)); + ryaConn.add(vf.createIRI("http://Eve";), vf.createIRI("http://helps";), vf.createIRI("http://Kevin";)); - ryaConn.add(vf.createURI("http://Bob";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://Charlie";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://Eve";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://David";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Bob";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Charlie";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Eve";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://David";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); // Verify the correct results were exported. fluo.waitForObservers(); @@ -89,12 +89,12 @@ public class AccumuloDeletePCJIT extends FluoITBase { final Set<BindingSet> results = Sets.newHashSet( pcjStorage.listResults(pcjId) ); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("x", vf.createURI("http://Bob";)); + bob.addBinding("x", vf.createIRI("http://Bob";)); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("x", vf.createURI("http://Charlie";)); + charlie.addBinding("x", vf.createIRI("http://Charlie";)); - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(bob, charlie); + final Set<BindingSet> expected = Sets.newHashSet(bob, charlie); assertEquals(expected, results); @@ -155,16 +155,16 @@ public class AccumuloDeletePCJIT extends FluoITBase { // Insert some statements into Rya. final ValueFactory vf = ryaRepo.getValueFactory(); - ryaConn.add(vf.createURI("http://Alice";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); - ryaConn.add(vf.createURI("http://Bob";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); - ryaConn.add(vf.createURI("http://Charlie";), vf.createURI("http://talksTo";), vf.createURI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Alice";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Bob";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); + ryaConn.add(vf.createIRI("http://Charlie";), vf.createIRI("http://talksTo";), vf.createIRI("http://Eve";)); - ryaConn.add(vf.createURI("http://Eve";), vf.createURI("http://helps";), vf.createURI("http://Kevin";)); + ryaConn.add(vf.createIRI("http://Eve";), vf.createIRI("http://helps";), vf.createIRI("http://Kevin";)); - ryaConn.add(vf.createURI("http://Bob";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://Charlie";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://Eve";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); - ryaConn.add(vf.createURI("http://David";), vf.createURI("http://worksAt";), vf.createURI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Bob";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Charlie";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://Eve";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); + ryaConn.add(vf.createIRI("http://David";), vf.createIRI("http://worksAt";), vf.createIRI("http://TacoJoint";)); // Verify the correct results were exported. fluo.waitForObservers(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java index f5d1923..9b2926e 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloLoadStatementsFileIT.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -40,11 +40,11 @@ import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.rio.RDFFormat; /** * Integration tests the methods of {@link AccumuloLoadStatementsFile}. @@ -90,12 +90,12 @@ public class AccumuloLoadStatementsFileIT extends AccumuloITBase { ryaClient.getLoadStatementsFile().loadStatements(getRyaInstanceName(), Paths.get("src/test/resources/example.ttl"), RDFFormat.TURTLE); // Verify that the statements were loaded. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final List<Statement> expected = new ArrayList<>(); - expected.add( vf.createStatement(vf.createURI("http://example#alice";), vf.createURI("http://example#talksTo";), vf.createURI("http://example#bob";)) ); - expected.add( vf.createStatement(vf.createURI("http://example#bob";), vf.createURI("http://example#talksTo";), vf.createURI("http://example#charlie";)) ); - expected.add( vf.createStatement(vf.createURI("http://example#charlie";), vf.createURI("http://example#likes";), vf.createURI("http://example#icecream";)) ); + expected.add( vf.createStatement(vf.createIRI("http://example#alice";), vf.createIRI("http://example#talksTo";), vf.createIRI("http://example#bob";)) ); + expected.add( vf.createStatement(vf.createIRI("http://example#bob";), vf.createIRI("http://example#talksTo";), vf.createIRI("http://example#charlie";)) ); + expected.add( vf.createStatement(vf.createIRI("http://example#charlie";), vf.createIRI("http://example#likes";), vf.createIRI("http://example#icecream";)) ); final List<Statement> statements = new ArrayList<>(); @@ -124,7 +124,7 @@ public class AccumuloLoadStatementsFileIT extends AccumuloITBase { } private boolean isRyaMetadataStatement(final ValueFactory vf, final Statement statement) { - return statement.getPredicate().equals( vf.createURI("urn:org.apache.rya/2012/05#version") ) || - statement.getPredicate().equals( vf.createURI("urn:org.apache.rya/2012/05#rts") ); + return statement.getPredicate().equals( vf.createIRI("urn:org.apache.rya/2012/05#version") ) || + statement.getPredicate().equals( vf.createIRI("urn:org.apache.rya/2012/05#rts") ); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUserIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUserIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUserIT.java index 224f70d..35e1210 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUserIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloRemoveUserIT.java @@ -32,10 +32,10 @@ import org.apache.rya.api.client.RyaClient; import org.apache.rya.api.instance.RyaDetails; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailConnection; import com.google.common.collect.ImmutableList; @@ -131,7 +131,7 @@ public class AccumuloRemoveUserIT extends AccumuloITBase { sailConn = sail.getConnection(); final ValueFactory vf = sail.getValueFactory(); - sailConn.addStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")); + sailConn.addStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")); } catch(final RuntimeException e) { final Throwable cause = e.getCause(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/FluoITBase.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/FluoITBase.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/FluoITBase.java index 7277fe0..1ef38aa 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/FluoITBase.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/FluoITBase.java @@ -67,14 +67,14 @@ import org.apache.rya.rdftriplestore.RyaSailRepository; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.sail.config.RyaSailFactory; import org.apache.zookeeper.ClientCnxn; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailException; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailException; /** * Integration tests that ensure the Fluo application processes PCJs results http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoBatchUpdatePCJIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoBatchUpdatePCJIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoBatchUpdatePCJIT.java index 7933374..1d796fe 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoBatchUpdatePCJIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoBatchUpdatePCJIT.java @@ -36,12 +36,12 @@ import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.mongo.MongoPcjStorage; import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; /** * Integration tests the methods of {@link AccumuloBatchUpdatePCJ}. @@ -68,25 +68,25 @@ public class MongoBatchUpdatePCJIT extends MongoITBase { .build()); // Load some statements into the Rya instance. - final ValueFactory vf = ValueFactoryImpl.getInstance(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Collection<Statement> statements = new ArrayList<>(); - statements.add(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - statements.add(vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - statements.add(vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - statements.add(vf.createStatement(vf.createURI("urn:David"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - statements.add(vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - statements.add(vf.createStatement(vf.createURI("urn:Frank"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - statements.add(vf.createStatement(vf.createURI("urn:George"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - statements.add(vf.createStatement(vf.createURI("urn:Hillary"), vf.createURI("urn:likes"), vf.createURI("urn:icecream"))); - - statements.add(vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue"))); - statements.add(vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue"))); - statements.add(vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue"))); - statements.add(vf.createStatement(vf.createURI("urn:David"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue"))); - statements.add(vf.createStatement(vf.createURI("urn:Eve"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue"))); - statements.add(vf.createStatement(vf.createURI("urn:Frank"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue"))); - statements.add(vf.createStatement(vf.createURI("urn:George"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:green"))); - statements.add(vf.createStatement(vf.createURI("urn:Hillary"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:brown"))); + statements.add(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + statements.add(vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + statements.add(vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + statements.add(vf.createStatement(vf.createIRI("urn:David"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + statements.add(vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + statements.add(vf.createStatement(vf.createIRI("urn:Frank"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + statements.add(vf.createStatement(vf.createIRI("urn:George"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + statements.add(vf.createStatement(vf.createIRI("urn:Hillary"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream"))); + + statements.add(vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue"))); + statements.add(vf.createStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue"))); + statements.add(vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue"))); + statements.add(vf.createStatement(vf.createIRI("urn:David"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue"))); + statements.add(vf.createStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue"))); + statements.add(vf.createStatement(vf.createIRI("urn:Frank"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue"))); + statements.add(vf.createStatement(vf.createIRI("urn:George"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:green"))); + statements.add(vf.createStatement(vf.createIRI("urn:Hillary"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:brown"))); ryaClient.getLoadStatements().loadStatements(conf.getRyaInstanceName(), statements); try(final PrecomputedJoinStorage pcjStorage = new MongoPcjStorage(getMongoClient(), conf.getRyaInstanceName())) { @@ -101,27 +101,27 @@ public class MongoBatchUpdatePCJIT extends MongoITBase { final Set<BindingSet> expectedResults = new HashSet<>(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Alice")); + bs.addBinding("name", vf.createIRI("urn:Alice")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Bob")); + bs.addBinding("name", vf.createIRI("urn:Bob")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Charlie")); + bs.addBinding("name", vf.createIRI("urn:Charlie")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:David")); + bs.addBinding("name", vf.createIRI("urn:David")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Eve")); + bs.addBinding("name", vf.createIRI("urn:Eve")); expectedResults.add(bs); bs = new MapBindingSet(); - bs.addBinding("name", vf.createURI("urn:Frank")); + bs.addBinding("name", vf.createIRI("urn:Frank")); expectedResults.add(bs); final Set<BindingSet> results = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoExecuteSparqlQueryIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoExecuteSparqlQueryIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoExecuteSparqlQueryIT.java index a1fee6f..a009b2a 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoExecuteSparqlQueryIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoExecuteSparqlQueryIT.java @@ -27,13 +27,13 @@ import org.apache.rya.api.client.ExecuteSparqlQuery; import org.apache.rya.api.client.Install.InstallConfiguration; import org.apache.rya.api.client.RyaClient; import org.apache.rya.mongodb.MongoITBase; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.MapBindingSet; /** * Integration tests the methods of {@link }. @@ -82,36 +82,36 @@ public class MongoExecuteSparqlQueryIT extends MongoITBase { */ private List<Statement> makeTestStatements() { final List<Statement> loadMe = new ArrayList<>(); - final ValueFactory vf = new ValueFactoryImpl(); - - loadMe.add(vf.createStatement(vf.createURI("http://example#alice";), vf.createURI("http://example#talksTo";), vf - .createURI("http://example#bob";))); - loadMe.add(vf.createStatement(vf.createURI("http://example#bob";), vf.createURI("http://example#talksTo";), vf - .createURI("http://example#charlie";))); - loadMe.add(vf.createStatement(vf.createURI("http://example#charlie";), vf.createURI("http://example#likes";), vf - .createURI("http://example#icecream";))); + final ValueFactory vf = SimpleValueFactory.getInstance(); + + loadMe.add(vf.createStatement(vf.createIRI("http://example#alice";), vf.createIRI("http://example#talksTo";), vf + .createIRI("http://example#bob";))); + loadMe.add(vf.createStatement(vf.createIRI("http://example#bob";), vf.createIRI("http://example#talksTo";), vf + .createIRI("http://example#charlie";))); + loadMe.add(vf.createStatement(vf.createIRI("http://example#charlie";), vf.createIRI("http://example#likes";), vf + .createIRI("http://example#icecream";))); return loadMe; } private List<BindingSet> makeExpectedResults() { final List<BindingSet> expected = new ArrayList<>(); - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("a", vf.createURI("http://example#alice";)); - bs.addBinding("b", vf.createURI("http://example#talksTo";)); - bs.addBinding("c", vf.createURI("http://example#bob";)); + bs.addBinding("a", vf.createIRI("http://example#alice";)); + bs.addBinding("b", vf.createIRI("http://example#talksTo";)); + bs.addBinding("c", vf.createIRI("http://example#bob";)); expected.add(bs); bs = new MapBindingSet(); - bs.addBinding("a", vf.createURI("http://example#bob";)); - bs.addBinding("b", vf.createURI("http://example#talksTo";)); - bs.addBinding("c", vf.createURI("http://example#charlie";)); + bs.addBinding("a", vf.createIRI("http://example#bob";)); + bs.addBinding("b", vf.createIRI("http://example#talksTo";)); + bs.addBinding("c", vf.createIRI("http://example#charlie";)); expected.add(bs); bs = new MapBindingSet(); - bs.addBinding("a", vf.createURI("http://example#charlie";)); - bs.addBinding("b", vf.createURI("http://example#likes";)); - bs.addBinding("c", vf.createURI("http://example#icecream";)); + bs.addBinding("a", vf.createIRI("http://example#charlie";)); + bs.addBinding("b", vf.createIRI("http://example#likes";)); + bs.addBinding("c", vf.createIRI("http://example#icecream";)); expected.add(bs); return expected; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsFileIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsFileIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsFileIT.java index 2ecaec0..1eedc68 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsFileIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsFileIT.java @@ -30,11 +30,11 @@ import org.apache.rya.api.client.InstanceDoesNotExistException; import org.apache.rya.api.client.RyaClient; import org.apache.rya.mongodb.MongoITBase; import org.bson.Document; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.rio.RDFFormat; import com.mongodb.client.MongoCursor; /** @@ -72,12 +72,12 @@ public class MongoLoadStatementsFileIT extends MongoITBase { RDFFormat.TURTLE); // Verify that the statements were loaded. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final Set<Statement> expected = new HashSet<>(); - expected.add(vf.createStatement(vf.createURI("http://example#alice";), vf.createURI("http://example#talksTo";), vf.createURI("http://example#bob";))); - expected.add(vf.createStatement(vf.createURI("http://example#bob";), vf.createURI("http://example#talksTo";), vf.createURI("http://example#charlie";))); - expected.add(vf.createStatement(vf.createURI("http://example#charlie";), vf.createURI("http://example#likes";), vf.createURI("http://example#icecream";))); + expected.add(vf.createStatement(vf.createIRI("http://example#alice";), vf.createIRI("http://example#talksTo";), vf.createIRI("http://example#bob";))); + expected.add(vf.createStatement(vf.createIRI("http://example#bob";), vf.createIRI("http://example#talksTo";), vf.createIRI("http://example#charlie";))); + expected.add(vf.createStatement(vf.createIRI("http://example#charlie";), vf.createIRI("http://example#likes";), vf.createIRI("http://example#icecream";))); final Set<Statement> statements = new HashSet<>(); final MongoCursor<Document> triplesIterator = getMongoClient() @@ -87,9 +87,9 @@ public class MongoLoadStatementsFileIT extends MongoITBase { while (triplesIterator.hasNext()) { final Document triple = triplesIterator.next(); statements.add(vf.createStatement( - vf.createURI(triple.getString("subject")), - vf.createURI(triple.getString("predicate")), - vf.createURI(triple.getString("object")))); + vf.createIRI(triple.getString("subject")), + vf.createIRI(triple.getString("predicate")), + vf.createIRI(triple.getString("object")))); } assertEquals(expected, statements); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsIT.java index 57e4b76..a491feb 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoLoadStatementsIT.java @@ -28,10 +28,10 @@ import org.apache.rya.api.client.InstanceDoesNotExistException; import org.apache.rya.api.client.RyaClient; import org.apache.rya.mongodb.MongoITBase; import org.bson.Document; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; import com.mongodb.client.MongoCursor; @@ -40,7 +40,7 @@ import com.mongodb.client.MongoCursor; */ public class MongoLoadStatementsIT extends MongoITBase { - private static final ValueFactory VF = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test(expected = InstanceDoesNotExistException.class) public void instanceDoesNotExist() throws Exception { @@ -84,9 +84,9 @@ public class MongoLoadStatementsIT extends MongoITBase { while (triplesIterator.hasNext()) { final Document triple = triplesIterator.next(); stmtResults.add(VF.createStatement( - VF.createURI(triple.getString("subject")), - VF.createURI(triple.getString("predicate")), - VF.createURI(triple.getString("object")))); + VF.createIRI(triple.getString("subject")), + VF.createIRI(triple.getString("predicate")), + VF.createIRI(triple.getString("object")))); } // Show the discovered statements match the original statements. @@ -96,19 +96,19 @@ public class MongoLoadStatementsIT extends MongoITBase { public Set<Statement> makeTestStatements() { final Set<Statement> statements = new HashSet<>(); statements.add(VF.createStatement( - VF.createURI("http://example#alice";), - VF.createURI("http://example#talksTo";), - VF.createURI("http://example#bob";))); + VF.createIRI("http://example#alice";), + VF.createIRI("http://example#talksTo";), + VF.createIRI("http://example#bob";))); statements.add( VF.createStatement( - VF.createURI("http://example#bob";), - VF.createURI("http://example#talksTo";), - VF.createURI("http://example#charlie";))); + VF.createIRI("http://example#bob";), + VF.createIRI("http://example#talksTo";), + VF.createIRI("http://example#charlie";))); statements.add( VF.createStatement( - VF.createURI("http://example#charlie";), - VF.createURI("http://example#likes";), - VF.createURI("http://example#icecream";))); + VF.createIRI("http://example#charlie";), + VF.createIRI("http://example#likes";), + VF.createIRI("http://example#icecream";))); return statements; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/GeneralizedExternalProcessorTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/GeneralizedExternalProcessorTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/GeneralizedExternalProcessorTest.java index 659e9a8..82e32e6 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/GeneralizedExternalProcessorTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/GeneralizedExternalProcessorTest.java @@ -25,13 +25,12 @@ import java.util.Set; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; - +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexPlanValidatorTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexPlanValidatorTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexPlanValidatorTest.java index d54523c..92edfef 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexPlanValidatorTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexPlanValidatorTest.java @@ -32,14 +32,14 @@ import org.apache.rya.indexing.pcj.matching.provider.AbstractPcjIndexSetProvider import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; import org.apache.rya.mongodb.EmbeddedMongoSingleton; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexedExecutionPlanGeneratorTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexedExecutionPlanGeneratorTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexedExecutionPlanGeneratorTest.java index 793e6ab..71e9962 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexedExecutionPlanGeneratorTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/IndexedExecutionPlanGeneratorTest.java @@ -26,13 +26,12 @@ import java.util.NoSuchElementException; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; - +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class IndexedExecutionPlanGeneratorTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ThreshholdPlanSelectorTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ThreshholdPlanSelectorTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ThreshholdPlanSelectorTest.java index 106288e..485fea5 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ThreshholdPlanSelectorTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ThreshholdPlanSelectorTest.java @@ -28,16 +28,16 @@ import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; import org.apache.rya.indexing.pcj.matching.PCJOptimizer; import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; @@ -691,7 +691,7 @@ public class ThreshholdPlanSelectorTest { } public static class NodeCollector extends - QueryModelVisitorBase<RuntimeException> { + AbstractQueryModelVisitor<RuntimeException> { List<QueryModelNode> qNodes = Lists.newArrayList(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleExecutionPlanGeneratorTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleExecutionPlanGeneratorTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleExecutionPlanGeneratorTest.java index 3c11531..11cbea7 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleExecutionPlanGeneratorTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleExecutionPlanGeneratorTest.java @@ -19,18 +19,16 @@ package org.apache.rya.indexing.IndexPlanValidator; * under the License. */ - - import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -228,8 +226,8 @@ public class TupleExecutionPlanGeneratorTest { Assert.assertEquals(2, size); - Assert.assertTrue(processedTupList.get(0).equals(pq2.getTupleExpr())); - Assert.assertTrue(processedTupList.get(1).equals(pq1.getTupleExpr())); + Assert.assertEquals(pq1.getTupleExpr(), processedTupList.get(0)); + Assert.assertEquals(pq2.getTupleExpr(), processedTupList.get(1)); } @@ -280,12 +278,12 @@ public class TupleExecutionPlanGeneratorTest { Assert.assertTrue(!processedTups.hasNext()); Assert.assertEquals(6, size); - Assert.assertTrue(processedTupList.get(5).equals(pq1.getTupleExpr())); - Assert.assertTrue(processedTupList.get(0).equals(pq2.getTupleExpr())); - Assert.assertTrue(processedTupList.get(2).equals(pq3.getTupleExpr())); - Assert.assertTrue(processedTupList.get(4).equals(pq4.getTupleExpr())); - Assert.assertTrue(processedTupList.get(1).equals(pq5.getTupleExpr())); - Assert.assertTrue(processedTupList.get(3).equals(pq6.getTupleExpr())); + Assert.assertEquals(pq1.getTupleExpr(), processedTupList.get(1)); + Assert.assertEquals(pq2.getTupleExpr(), processedTupList.get(2)); + Assert.assertEquals(pq3.getTupleExpr(), processedTupList.get(4)); + Assert.assertEquals(pq4.getTupleExpr(), processedTupList.get(0)); + Assert.assertEquals(pq5.getTupleExpr(), processedTupList.get(3)); + Assert.assertEquals(pq6.getTupleExpr(), processedTupList.get(5)); } @@ -341,12 +339,12 @@ public class TupleExecutionPlanGeneratorTest { Assert.assertTrue(!processedTups.hasNext()); Assert.assertEquals(6, size); - Assert.assertTrue(processedTupList.get(5).equals(pq1.getTupleExpr())); - Assert.assertTrue(processedTupList.get(0).equals(pq2.getTupleExpr())); - Assert.assertTrue(processedTupList.get(2).equals(pq3.getTupleExpr())); - Assert.assertTrue(processedTupList.get(4).equals(pq4.getTupleExpr())); - Assert.assertTrue(processedTupList.get(1).equals(pq5.getTupleExpr())); - Assert.assertTrue(processedTupList.get(3).equals(pq6.getTupleExpr())); + Assert.assertEquals(pq1.getTupleExpr(), processedTupList.get(1)); + Assert.assertEquals(pq2.getTupleExpr(), processedTupList.get(2)); + Assert.assertEquals(pq3.getTupleExpr(), processedTupList.get(4)); + Assert.assertEquals(pq4.getTupleExpr(), processedTupList.get(0)); + Assert.assertEquals(pq5.getTupleExpr(), processedTupList.get(3)); + Assert.assertEquals(pq6.getTupleExpr(), processedTupList.get(5)); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleReArrangerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleReArrangerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleReArrangerTest.java index 2d07246..fde4b61 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleReArrangerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/TupleReArrangerTest.java @@ -19,16 +19,15 @@ package org.apache.rya.indexing.IndexPlanValidator; * under the License. */ - import java.util.List; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.FilterOptimizer; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.impl.FilterOptimizer; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class TupleReArrangerTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ValidIndexCombinationGeneratorTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ValidIndexCombinationGeneratorTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ValidIndexCombinationGeneratorTest.java index 2bb2147..64f5e52 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ValidIndexCombinationGeneratorTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/ValidIndexCombinationGeneratorTest.java @@ -25,13 +25,12 @@ import java.util.List; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; - +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPrunerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPrunerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPrunerTest.java index 7b173da..3452d0f 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPrunerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/IndexPlanValidator/VarConstantIndexListPrunerTest.java @@ -25,12 +25,11 @@ import java.util.Set; import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; - +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Sets; @@ -207,8 +206,8 @@ public class VarConstantIndexListPrunerTest { indexSet.add(extTup2); indexSet.add(extTup4); - Assert.assertTrue(Sets.intersection(indexSet, Sets.<ExternalTupleSet> newHashSet(processedIndexSet)) - .equals(Sets.<ExternalTupleSet> newHashSet(processedIndexSet))); + Assert.assertTrue(Sets.intersection(indexSet, Sets.newHashSet(processedIndexSet)) + .equals(Sets.newHashSet(processedIndexSet))); } @@ -245,8 +244,8 @@ public class VarConstantIndexListPrunerTest { indexSet.add(extTup2); Assert.assertTrue(Sets.intersection(indexSet, - Sets.<ExternalTupleSet> newHashSet(processedIndexSet)).equals( - Sets.<ExternalTupleSet> newHashSet(processedIndexSet))); + Sets.newHashSet(processedIndexSet)).equals( + Sets.newHashSet(processedIndexSet))); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/StatementSerializerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/StatementSerializerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/StatementSerializerTest.java index b622d40..8689253 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/StatementSerializerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/StatementSerializerTest.java @@ -19,68 +19,63 @@ package org.apache.rya.indexing.accumulo; * under the License. */ - - -import junit.framework.Assert; import org.apache.rya.indexing.StatementSerializer; - +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.ValueFactoryImpl; public class StatementSerializerTest { @Test public void testSimpleStatementObjectUri() throws Exception { - ValueFactory vf = new ValueFactoryImpl(); + ValueFactory vf = SimpleValueFactory.getInstance(); Statement s; - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createURI("foo:object")); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createIRI("foo:object")); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); - s = new ContextStatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createURI("foo:object"), - vf.createURI("foo:context")); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createIRI("foo:object"), + vf.createIRI("foo:context")); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); } @Test public void testSimpleObjectLiteral() throws Exception { - ValueFactory vf = new ValueFactoryImpl(); + ValueFactory vf = SimpleValueFactory.getInstance(); Statement s; String str; - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createURI("foo:object")); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createIRI("foo:object")); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); str = "Alice Palace"; - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str)); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str)); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str, "en")); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str, "en")); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str, vf.createURI("xsd:string"))); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str, vf.createIRI("xsd:string"))); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); } @Test public void testObjectLiteralWithDataTypeGarbage() throws Exception { // test with some garbage in the literal that may throw off the parser - ValueFactory vf = new ValueFactoryImpl(); + ValueFactory vf = SimpleValueFactory.getInstance(); Statement s; String str; str = "Alice ^^<Palace>\""; - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str)); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str)); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str, "en")); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str, "en")); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str, vf.createURI("xsd:string"))); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str, vf.createIRI("xsd:string"))); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); } @@ -88,18 +83,18 @@ public class StatementSerializerTest { @Test public void testObjectLiteralWithAtSignGarbage() throws Exception { // test with some garbage in the literal that may throw off the parser - ValueFactory vf = new ValueFactoryImpl(); + ValueFactory vf = SimpleValueFactory.getInstance(); Statement s; String str; str = "Alice @en"; - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str)); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str)); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str, "en")); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str, "en")); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); - s = new StatementImpl(vf.createURI("foo:subject"), vf.createURI("foo:predicate"), vf.createLiteral(str, vf.createURI("xsd:string"))); + s = vf.createStatement(vf.createIRI("foo:subject"), vf.createIRI("foo:predicate"), vf.createLiteral(str, vf.createIRI("xsd:string"))); Assert.assertEquals(s, StatementSerializer.readStatement(StatementSerializer.writeStatement(s))); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIndexerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIndexerTest.java index 6a3a18a..a6487df 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIndexerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIndexerTest.java @@ -19,13 +19,16 @@ package org.apache.rya.indexing.accumulo.entity; * under the License. */ - -import info.aduna.iteration.CloseableIteration; - import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.mock.MockInstance; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.data.Mutation; +import org.apache.hadoop.conf.Configuration; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.RyaTableMutationsFactory; import org.apache.rya.api.RdfCloudTripleStoreConstants; @@ -35,31 +38,23 @@ import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.indexing.accumulo.ConfigUtils; - -import org.apache.accumulo.core.client.BatchWriter; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.admin.TableOperations; -import org.apache.accumulo.core.client.mock.MockInstance; -import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.core.data.Mutation; -import org.apache.hadoop.conf.Configuration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +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; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; @@ -68,7 +63,7 @@ public class AccumuloDocIndexerTest { private MockInstance mockInstance; private Connector accCon; AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); - ValueFactory vf = new ValueFactoryImpl(); + ValueFactory vf = SimpleValueFactory.getInstance(); private String tableName; @@ -321,11 +316,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); // QueryBindingSet b1 = (new QueryBindingSet()); -// b1.addBinding("X", vf.createURI("uri:5")); +// b1.addBinding("X", vf.createIRI("uri:5")); // QueryBindingSet b2 = (new QueryBindingSet()); -// b2.addBinding("X", vf.createURI("uri:15")); +// b2.addBinding("X", vf.createIRI("uri:15")); // QueryBindingSet b3 = (new QueryBindingSet()); -// b3.addBinding("X", vf.createURI("uri:25")); +// b3.addBinding("X", vf.createIRI("uri:25")); // bsList.add(b1); // bsList.add(b2); // bsList.add(b3); @@ -445,11 +440,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); QueryBindingSet b1 = (new QueryBindingSet()); - b1.addBinding("X", vf.createURI("uri:5")); + b1.addBinding("X", vf.createIRI("uri:5")); QueryBindingSet b2 = (new QueryBindingSet()); - b2.addBinding("X", vf.createURI("uri:15")); + b2.addBinding("X", vf.createIRI("uri:15")); QueryBindingSet b3 = (new QueryBindingSet()); - b3.addBinding("X", vf.createURI("uri:25")); + b3.addBinding("X", vf.createIRI("uri:25")); bsList.add(b1); bsList.add(b2); bsList.add(b3); @@ -671,11 +666,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); QueryBindingSet b1 = (new QueryBindingSet()); - b1.addBinding("X", vf.createURI("uri:5")); + b1.addBinding("X", vf.createIRI("uri:5")); QueryBindingSet b2 = (new QueryBindingSet()); - b2.addBinding("X", vf.createURI("uri:15")); + b2.addBinding("X", vf.createIRI("uri:15")); QueryBindingSet b3 = (new QueryBindingSet()); - b3.addBinding("X", vf.createURI("uri:25")); + b3.addBinding("X", vf.createIRI("uri:25")); bsList.add(b1); bsList.add(b2); bsList.add(b3); @@ -784,11 +779,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); QueryBindingSet b1 = (new QueryBindingSet()); - b1.addBinding("X", vf.createURI("uri:5")); + b1.addBinding("X", vf.createIRI("uri:5")); QueryBindingSet b2 = (new QueryBindingSet()); - b2.addBinding("X", vf.createURI("uri:15")); + b2.addBinding("X", vf.createIRI("uri:15")); QueryBindingSet b3 = (new QueryBindingSet()); - b3.addBinding("X", vf.createURI("uri:25")); + b3.addBinding("X", vf.createIRI("uri:25")); bsList.add(b1); bsList.add(b2); bsList.add(b3); @@ -939,11 +934,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); // QueryBindingSet b1 = (new QueryBindingSet()); -// b1.addBinding("X", vf.createURI("uri:5")); +// b1.addBinding("X", vf.createIRI("uri:5")); // QueryBindingSet b2 = (new QueryBindingSet()); -// b2.addBinding("X", vf.createURI("uri:15")); +// b2.addBinding("X", vf.createIRI("uri:15")); // QueryBindingSet b3 = (new QueryBindingSet()); -// b3.addBinding("X", vf.createURI("uri:25")); +// b3.addBinding("X", vf.createIRI("uri:25")); // bsList.add(b1); // bsList.add(b2); // bsList.add(b3); @@ -1116,11 +1111,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); QueryBindingSet b1 = (new QueryBindingSet()); - b1.addBinding("X", vf.createURI("uri:5")); + b1.addBinding("X", vf.createIRI("uri:5")); QueryBindingSet b2 = (new QueryBindingSet()); - b2.addBinding("X", vf.createURI("uri:15")); + b2.addBinding("X", vf.createIRI("uri:15")); QueryBindingSet b3 = (new QueryBindingSet()); - b3.addBinding("X", vf.createURI("uri:25")); + b3.addBinding("X", vf.createIRI("uri:25")); bsList.add(b1); bsList.add(b2); bsList.add(b3); @@ -1653,11 +1648,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); QueryBindingSet b1 = (new QueryBindingSet()); - b1.addBinding("X", vf.createURI("uri:5")); + b1.addBinding("X", vf.createIRI("uri:5")); QueryBindingSet b2 = (new QueryBindingSet()); - b2.addBinding("X", vf.createURI("uri:15")); + b2.addBinding("X", vf.createIRI("uri:15")); QueryBindingSet b3 = (new QueryBindingSet()); - b3.addBinding("X", vf.createURI("uri:25")); + b3.addBinding("X", vf.createIRI("uri:25")); bsList.add(b1); bsList.add(b2); bsList.add(b3); @@ -1855,10 +1850,10 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); QueryBindingSet b1 = new QueryBindingSet(); - b1.addBinding("X", vf.createURI("uri:5")); + b1.addBinding("X", vf.createIRI("uri:5")); b1.addBinding("Y3", v1); QueryBindingSet b2 = new QueryBindingSet(); - b2.addBinding("X", vf.createURI("uri:25")); + b2.addBinding("X", vf.createIRI("uri:25")); b2.addBinding("Y3", v2); bsList.add(b1); bsList.add(b2); @@ -2040,11 +2035,11 @@ public class AccumuloDocIndexerTest { List<BindingSet> bsList = Lists.newArrayList(); // QueryBindingSet b1 = (new QueryBindingSet()); -// b1.addBinding("X", vf.createURI("uri:5")); +// b1.addBinding("X", vf.createIRI("uri:5")); // QueryBindingSet b2 = (new QueryBindingSet()); -// b2.addBinding("X", vf.createURI("uri:15")); +// b2.addBinding("X", vf.createIRI("uri:15")); // QueryBindingSet b3 = (new QueryBindingSet()); -// b3.addBinding("X", vf.createURI("uri:25")); +// b3.addBinding("X", vf.createIRI("uri:25")); // bsList.add(b1); // bsList.add(b2); // bsList.add(b3); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndexTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndexTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndexTest.java index f738ad1..79fd2c2 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndexTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndexTest.java @@ -21,25 +21,24 @@ package org.apache.rya.indexing.accumulo.entity; import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES; +import java.io.IOException; +import java.util.Collection; + import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.ColumnVisibility; -import org.junit.Assert; -import org.junit.BeforeClass; - -import java.io.IOException; -import java.util.Collection; -import org.junit.Test; -import org.openrdf.model.vocabulary.XMLSchema; - -import com.google.common.primitives.Bytes; - import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.google.common.primitives.Bytes; public class EntityCentricIndexTest { private static RyaStatement ryaStatement; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizerTest.java index 211e822..70394b6 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/entity/EntityOptimizerTest.java @@ -19,23 +19,12 @@ package org.apache.rya.indexing.accumulo.entity; * under the License. */ - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.layout.TablePrefixLayoutStrategy; -import org.apache.rya.api.persist.RdfEvalStatsDAO; -import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.apache.rya.indexing.accumulo.entity.EntityOptimizer; -import org.apache.rya.indexing.accumulo.entity.EntityTupleSet; -import org.apache.rya.joinselect.AccumuloSelectivityEvalDAO; -import org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO; - import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.BatchWriter; @@ -48,19 +37,26 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.layout.TablePrefixLayoutStrategy; +import org.apache.rya.api.persist.RdfEvalStatsDAO; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.joinselect.AccumuloSelectivityEvalDAO; +import org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.FilterOptimizer; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.repository.RepositoryException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.impl.FilterOptimizer; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.repository.RepositoryException; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -1017,11 +1013,11 @@ public class EntityOptimizerTest { Assert.assertEquals(2, nodes.size()); for (QueryModelNode q : nodes) { - - if (((EntityTupleSet) q).getStarQuery().getNodes().size() == 2) { - Assert.assertEquals("m", ((EntityTupleSet) q).getStarQuery().getCommonVarName()); - } else if (((EntityTupleSet) q).getStarQuery().getNodes().size() == 3) { - Assert.assertEquals("uri:chickens", ((EntityTupleSet) q).getStarQuery().getCommonVarName()); + final StarQuery starQuery = ((EntityTupleSet) q).getStarQuery(); + if (starQuery.getNodes().size() == 2) { + Assert.assertEquals("m", starQuery.getCommonVarName()); + } else if (starQuery.getNodes().size() == 3) { + Assert.assertEquals("uri:chickens", starQuery.getCommonVarValue()); } else { Assert.assertTrue(false); } @@ -1121,11 +1117,11 @@ public class EntityOptimizerTest { Assert.assertEquals(2, nodes.size()); for (QueryModelNode q : nodes) { - - if (((EntityTupleSet) q).getStarQuery().getNodes().size() == 2) { - Assert.assertEquals("m", ((EntityTupleSet) q).getStarQuery().getCommonVarName()); - } else if (((EntityTupleSet) q).getStarQuery().getNodes().size() == 3) { - Assert.assertEquals("uri:chickens", ((EntityTupleSet) q).getStarQuery().getCommonVarName()); + final StarQuery starQuery = ((EntityTupleSet) q).getStarQuery(); + if (starQuery.getNodes().size() == 2) { + Assert.assertEquals("m", starQuery.getCommonVarName()); + } else if (starQuery.getNodes().size() == 3) { + Assert.assertEquals("uri:chickens", starQuery.getCommonVarValue()); } else { Assert.assertTrue(false); } @@ -1323,7 +1319,7 @@ public class EntityOptimizerTest { - private class EntityCentricVisitor extends QueryModelVisitorBase<RuntimeException> { + private class EntityCentricVisitor extends AbstractQueryModelVisitor<RuntimeException> { private Set<QueryModelNode> ccNodes = Sets.newHashSet();
