http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/IterativeJoinTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/IterativeJoinTest.java b/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/IterativeJoinTest.java index 5d357c3..91997a3 100644 --- a/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/IterativeJoinTest.java +++ b/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/IterativeJoinTest.java @@ -18,22 +18,25 @@ */ package org.apache.rya.api.function.join; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import org.apache.rya.api.model.VisibilityBindingSet; +import org.apache.rya.api.function.join.IterativeJoin; +import org.apache.rya.api.function.join.LeftOuterJoin; +import org.apache.rya.api.function.join.NaturalJoin; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; + +import static org.junit.Assert.assertEquals; /** * Tests the methods of {@link IterativeJoin}. @@ -59,7 +62,7 @@ public class IterativeJoinTest { @Test public void naturalJoin_sideDoesNotMatter() { // Create the binding sets that will be joined. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs1 = new MapBindingSet(); bs1.addBinding("id", vf.createLiteral("some_uid"));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/LeftOuterJoinTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/LeftOuterJoinTest.java b/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/LeftOuterJoinTest.java index 7d17e22..bcbaa11 100644 --- a/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/LeftOuterJoinTest.java +++ b/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/LeftOuterJoinTest.java @@ -21,17 +21,20 @@ package org.apache.rya.api.function.join; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import java.math.BigInteger; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.Set; import org.apache.rya.api.model.VisibilityBindingSet; +import org.apache.rya.api.function.join.IterativeJoin; +import org.apache.rya.api.function.join.LeftOuterJoin; +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.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -41,7 +44,7 @@ import com.google.common.collect.Sets; */ public class LeftOuterJoinTest { - private final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void newLeftResult_noRightMatches() { @@ -49,7 +52,7 @@ public class LeftOuterJoinTest { // There is a new left result. final MapBindingSet mapLeftResult = new MapBindingSet(); - mapLeftResult.addBinding("name", vf.createLiteral("Bob")); + mapLeftResult.addBinding("name", VF.createLiteral("Bob")); final VisibilityBindingSet newLeftResult = new VisibilityBindingSet(mapLeftResult); // There are no right results that join with the left result. @@ -74,22 +77,22 @@ public class LeftOuterJoinTest { // There is a new left result. final MapBindingSet mapLeftResult = new MapBindingSet(); - mapLeftResult.addBinding("name", vf.createLiteral("Bob")); - mapLeftResult.addBinding("height", vf.createLiteral("5'9\"")); + mapLeftResult.addBinding("name", VF.createLiteral("Bob")); + mapLeftResult.addBinding("height", VF.createLiteral("5'9\"")); final VisibilityBindingSet newLeftResult = new VisibilityBindingSet(mapLeftResult); // There are a few right results that join with the left result. final MapBindingSet nameAge = new MapBindingSet(); - nameAge.addBinding("name", vf.createLiteral("Bob")); - nameAge.addBinding("age", vf.createLiteral(56)); + nameAge.addBinding("name", VF.createLiteral("Bob")); + nameAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); final VisibilityBindingSet visiAge = new VisibilityBindingSet(nameAge); final MapBindingSet nameHair = new MapBindingSet(); - nameHair.addBinding("name", vf.createLiteral("Bob")); - nameHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHair.addBinding("name", VF.createLiteral("Bob")); + nameHair.addBinding("hairColor", VF.createLiteral("Brown")); final VisibilityBindingSet visiHair = new VisibilityBindingSet(nameHair); - final Iterator<VisibilityBindingSet> rightResults = Lists.<VisibilityBindingSet>newArrayList(visiAge, visiHair).iterator(); + final Iterator<VisibilityBindingSet> rightResults = Lists.newArrayList(visiAge, visiHair).iterator(); // Therefore, there are a few new join results that mix the two together. final Iterator<VisibilityBindingSet> newJoinResultsIt = leftOuterJoin.newLeftResult(newLeftResult, rightResults); @@ -99,17 +102,17 @@ public class LeftOuterJoinTest { newJoinResults.add( newJoinResultsIt.next() ); } - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(); + final Set<BindingSet> expected = Sets.newHashSet(); final MapBindingSet nameHeightAge = new MapBindingSet(); - nameHeightAge.addBinding("name", vf.createLiteral("Bob")); - nameHeightAge.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightAge.addBinding("age", vf.createLiteral(56)); + nameHeightAge.addBinding("name", VF.createLiteral("Bob")); + nameHeightAge.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); expected.add(new VisibilityBindingSet(nameHeightAge)); final MapBindingSet nameHeightHair = new MapBindingSet(); - nameHeightHair.addBinding("name", vf.createLiteral("Bob")); - nameHeightHair.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHeightHair.addBinding("name", VF.createLiteral("Bob")); + nameHeightHair.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightHair.addBinding("hairColor", VF.createLiteral("Brown")); expected.add(new VisibilityBindingSet(nameHeightHair)); assertEquals(expected, newJoinResults); @@ -124,7 +127,7 @@ public class LeftOuterJoinTest { // There is a new right result. final MapBindingSet newRightResult = new MapBindingSet(); - newRightResult.addBinding("name", vf.createLiteral("Bob")); + newRightResult.addBinding("name", VF.createLiteral("Bob")); // Therefore, there are no new join results. final Iterator<VisibilityBindingSet> newJoinResultsIt = leftOuterJoin.newRightResult(leftResults, new VisibilityBindingSet(newRightResult)); @@ -137,21 +140,21 @@ public class LeftOuterJoinTest { // There are a few left results that join with the new right result. final MapBindingSet nameAge = new MapBindingSet(); - nameAge.addBinding("name", vf.createLiteral("Bob")); - nameAge.addBinding("age", vf.createLiteral(56)); + nameAge.addBinding("name", VF.createLiteral("Bob")); + nameAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); final MapBindingSet nameHair = new MapBindingSet(); - nameHair.addBinding("name", vf.createLiteral("Bob")); - nameHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHair.addBinding("name", VF.createLiteral("Bob")); + nameHair.addBinding("hairColor", VF.createLiteral("Brown")); - final Iterator<VisibilityBindingSet> leftResults = Lists.<VisibilityBindingSet>newArrayList( + final Iterator<VisibilityBindingSet> leftResults = Lists.newArrayList( new VisibilityBindingSet(nameAge), new VisibilityBindingSet(nameHair)).iterator(); // There is a new right result. final MapBindingSet newRightResult = new MapBindingSet(); - newRightResult.addBinding("name", vf.createLiteral("Bob")); - newRightResult.addBinding("height", vf.createLiteral("5'9\"")); + newRightResult.addBinding("name", VF.createLiteral("Bob")); + newRightResult.addBinding("height", VF.createLiteral("5'9\"")); // Therefore, there are a few new join results that mix the two together. final Iterator<VisibilityBindingSet> newJoinResultsIt = leftOuterJoin.newRightResult(leftResults, new VisibilityBindingSet(newRightResult)); @@ -161,17 +164,17 @@ public class LeftOuterJoinTest { newJoinResults.add( newJoinResultsIt.next() ); } - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(); + final Set<BindingSet> expected = Sets.newHashSet(); final MapBindingSet nameHeightAge = new MapBindingSet(); - nameHeightAge.addBinding("name", vf.createLiteral("Bob")); - nameHeightAge.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightAge.addBinding("age", vf.createLiteral(56)); + nameHeightAge.addBinding("name", VF.createLiteral("Bob")); + nameHeightAge.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); expected.add(new VisibilityBindingSet(nameHeightAge)); final MapBindingSet nameHeightHair = new MapBindingSet(); - nameHeightHair.addBinding("name", vf.createLiteral("Bob")); - nameHeightHair.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHeightHair.addBinding("name", VF.createLiteral("Bob")); + nameHeightHair.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightHair.addBinding("hairColor", VF.createLiteral("Brown")); expected.add(new VisibilityBindingSet(nameHeightHair)); assertEquals(expected, newJoinResults); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/NaturalJoinTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/NaturalJoinTest.java b/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/NaturalJoinTest.java index dd3b7e6..f6818ba 100644 --- a/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/NaturalJoinTest.java +++ b/common/rya.api.function/src/main/test/org/apache/rya/api/function/join/NaturalJoinTest.java @@ -21,17 +21,20 @@ package org.apache.rya.api.function.join; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import java.math.BigInteger; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.Set; import org.apache.rya.api.model.VisibilityBindingSet; +import org.apache.rya.api.function.join.IterativeJoin; +import org.apache.rya.api.function.join.NaturalJoin; +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.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -41,7 +44,7 @@ import com.google.common.collect.Sets; */ public class NaturalJoinTest { - private final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void newLeftResult_noRightMatches() { @@ -49,7 +52,7 @@ public class NaturalJoinTest { // There is a new left result. final MapBindingSet newLeftResult = new MapBindingSet(); - newLeftResult.addBinding("name", vf.createLiteral("Bob")); + newLeftResult.addBinding("name", VF.createLiteral("Bob")); // There are no right results that join with the left result. final Iterator<VisibilityBindingSet> rightResults= new ArrayList<VisibilityBindingSet>().iterator(); @@ -65,19 +68,19 @@ public class NaturalJoinTest { // There is a new left result. final MapBindingSet newLeftResult = new MapBindingSet(); - newLeftResult.addBinding("name", vf.createLiteral("Bob")); - newLeftResult.addBinding("height", vf.createLiteral("5'9\"")); + newLeftResult.addBinding("name", VF.createLiteral("Bob")); + newLeftResult.addBinding("height", VF.createLiteral("5'9\"")); // There are a few right results that join with the left result. final MapBindingSet nameAge = new MapBindingSet(); - nameAge.addBinding("name", vf.createLiteral("Bob")); - nameAge.addBinding("age", vf.createLiteral(56)); + nameAge.addBinding("name", VF.createLiteral("Bob")); + nameAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); final MapBindingSet nameHair = new MapBindingSet(); - nameHair.addBinding("name", vf.createLiteral("Bob")); - nameHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHair.addBinding("name", VF.createLiteral("Bob")); + nameHair.addBinding("hairColor", VF.createLiteral("Brown")); - final Iterator<VisibilityBindingSet> rightResults = Lists.<VisibilityBindingSet>newArrayList( + final Iterator<VisibilityBindingSet> rightResults = Lists.newArrayList( new VisibilityBindingSet(nameAge), new VisibilityBindingSet(nameHair)).iterator(); @@ -89,17 +92,17 @@ public class NaturalJoinTest { newJoinResults.add( newJoinResultsIt.next() ); } - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(); + final Set<BindingSet> expected = Sets.newHashSet(); final MapBindingSet nameHeightAge = new MapBindingSet(); - nameHeightAge.addBinding("name", vf.createLiteral("Bob")); - nameHeightAge.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightAge.addBinding("age", vf.createLiteral(56)); + nameHeightAge.addBinding("name", VF.createLiteral("Bob")); + nameHeightAge.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); expected.add(new VisibilityBindingSet(nameHeightAge)); final MapBindingSet nameHeightHair = new MapBindingSet(); - nameHeightHair.addBinding("name", vf.createLiteral("Bob")); - nameHeightHair.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHeightHair.addBinding("name", VF.createLiteral("Bob")); + nameHeightHair.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightHair.addBinding("hairColor", VF.createLiteral("Brown")); expected.add(new VisibilityBindingSet(nameHeightHair)); assertEquals(expected, newJoinResults); @@ -114,7 +117,7 @@ public class NaturalJoinTest { // There is a new right result. final MapBindingSet newRightResult = new MapBindingSet(); - newRightResult.addBinding("name", vf.createLiteral("Bob")); + newRightResult.addBinding("name", VF.createLiteral("Bob")); // Therefore, there are no new join results. final Iterator<VisibilityBindingSet> newJoinResultsIt = naturalJoin.newRightResult(leftResults, new VisibilityBindingSet(newRightResult)); @@ -127,21 +130,21 @@ public class NaturalJoinTest { // There are a few left results that join with the new right result. final MapBindingSet nameAge = new MapBindingSet(); - nameAge.addBinding("name", vf.createLiteral("Bob")); - nameAge.addBinding("age", vf.createLiteral(56)); + nameAge.addBinding("name", VF.createLiteral("Bob")); + nameAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); final MapBindingSet nameHair = new MapBindingSet(); - nameHair.addBinding("name", vf.createLiteral("Bob")); - nameHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHair.addBinding("name", VF.createLiteral("Bob")); + nameHair.addBinding("hairColor", VF.createLiteral("Brown")); - final Iterator<VisibilityBindingSet> leftResults = Lists.<VisibilityBindingSet>newArrayList( + final Iterator<VisibilityBindingSet> leftResults = Lists.newArrayList( new VisibilityBindingSet(nameAge), new VisibilityBindingSet(nameHair)).iterator(); // There is a new right result. final MapBindingSet newRightResult = new MapBindingSet(); - newRightResult.addBinding("name", vf.createLiteral("Bob")); - newRightResult.addBinding("height", vf.createLiteral("5'9\"")); + newRightResult.addBinding("name", VF.createLiteral("Bob")); + newRightResult.addBinding("height", VF.createLiteral("5'9\"")); // Therefore, there are a few new join results that mix the two together. final Iterator<VisibilityBindingSet> newJoinResultsIt = naturalJoin.newRightResult(leftResults, new VisibilityBindingSet(newRightResult)); @@ -151,17 +154,17 @@ public class NaturalJoinTest { newJoinResults.add( newJoinResultsIt.next() ); } - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(); + final Set<BindingSet> expected = Sets.newHashSet(); final MapBindingSet nameHeightAge = new MapBindingSet(); - nameHeightAge.addBinding("name", vf.createLiteral("Bob")); - nameHeightAge.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightAge.addBinding("age", vf.createLiteral(56)); + nameHeightAge.addBinding("name", VF.createLiteral("Bob")); + nameHeightAge.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightAge.addBinding("age", VF.createLiteral(BigInteger.valueOf(56))); expected.add(new VisibilityBindingSet(nameHeightAge)); final MapBindingSet nameHeightHair = new MapBindingSet(); - nameHeightHair.addBinding("name", vf.createLiteral("Bob")); - nameHeightHair.addBinding("height", vf.createLiteral("5'9\"")); - nameHeightHair.addBinding("hairColor", vf.createLiteral("Brown")); + nameHeightHair.addBinding("name", VF.createLiteral("Bob")); + nameHeightHair.addBinding("height", VF.createLiteral("5'9\"")); + nameHeightHair.addBinding("hairColor", VF.createLiteral("Brown")); expected.add(new VisibilityBindingSet(nameHeightHair)); assertEquals(expected, newJoinResults); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/AfterTemporalFunctionsTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/AfterTemporalFunctionsTest.java b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/AfterTemporalFunctionsTest.java index f5f18f7..48bbefa 100644 --- a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/AfterTemporalFunctionsTest.java +++ b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/AfterTemporalFunctionsTest.java @@ -22,17 +22,17 @@ import static org.junit.Assert.assertEquals; import java.time.ZonedDateTime; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Test; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; public class AfterTemporalFunctionsTest { private static final ZonedDateTime TIME = ZonedDateTime.parse("2015-12-30T12:00:00Z"); private static final ZonedDateTime TIME_10 = ZonedDateTime.parse("2015-12-30T12:00:10Z"); private static final ZonedDateTime TIME_20 = ZonedDateTime.parse("2015-12-30T12:00:20Z"); - final ValueFactory VF = ValueFactoryImpl.getInstance(); + final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void testAfter_same() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/BeforeTemporalFunctionsTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/BeforeTemporalFunctionsTest.java b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/BeforeTemporalFunctionsTest.java index 1b15035..7fb5680 100644 --- a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/BeforeTemporalFunctionsTest.java +++ b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/BeforeTemporalFunctionsTest.java @@ -22,17 +22,17 @@ import static org.junit.Assert.assertEquals; import java.time.ZonedDateTime; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Test; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; public class BeforeTemporalFunctionsTest { private static final ZonedDateTime TIME = ZonedDateTime.parse("2015-12-30T12:00:00Z"); private static final ZonedDateTime TIME_10 = ZonedDateTime.parse("2015-12-30T12:00:10Z"); private static final ZonedDateTime TIME_20 = ZonedDateTime.parse("2015-12-30T12:00:20Z"); - final ValueFactory VF = ValueFactoryImpl.getInstance(); + final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void testBefore_same() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/EqualsTemporalFunctionsTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/EqualsTemporalFunctionsTest.java b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/EqualsTemporalFunctionsTest.java index 0d14d48..bffade6 100644 --- a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/EqualsTemporalFunctionsTest.java +++ b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/EqualsTemporalFunctionsTest.java @@ -22,17 +22,17 @@ import static org.junit.Assert.assertEquals; import java.time.ZonedDateTime; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.junit.Test; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; public class EqualsTemporalFunctionsTest { private static final ZonedDateTime TIME = ZonedDateTime.parse("2015-12-30T12:00:00Z"); private static final ZonedDateTime TIME_10 = ZonedDateTime.parse("2015-12-30T12:00:10Z"); private static final ZonedDateTime TIME_20 = ZonedDateTime.parse("2015-12-30T12:00:20Z"); - final ValueFactory VF = ValueFactoryImpl.getInstance(); + final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void testEquals_equal() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/WithinTemporalFunctionsTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/WithinTemporalFunctionsTest.java b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/WithinTemporalFunctionsTest.java index 6dee711..2761287 100644 --- a/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/WithinTemporalFunctionsTest.java +++ b/common/rya.api.function/src/main/test/org/apache/rya/api/function/temporal/WithinTemporalFunctionsTest.java @@ -22,18 +22,18 @@ import static org.junit.Assert.assertEquals; import java.time.ZonedDateTime; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; import org.junit.Test; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; public class WithinTemporalFunctionsTest { private static final ZonedDateTime TIME = ZonedDateTime.parse("2015-12-30T12:00:00Z"); private static final ZonedDateTime TIME_10 = ZonedDateTime.parse("2015-12-30T12:00:10Z"); private static final ZonedDateTime TIME_20 = ZonedDateTime.parse("2015-12-30T12:00:20Z"); - final ValueFactory VF = ValueFactoryImpl.getInstance(); + final ValueFactory VF = SimpleValueFactory.getInstance(); @Test(expected = ValueExprEvaluationException.class) public void within_NotInterval() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/test/java/org/apache/rya/api/function/filter/FilterEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/test/java/org/apache/rya/api/function/filter/FilterEvaluatorTest.java b/common/rya.api.function/src/test/java/org/apache/rya/api/function/filter/FilterEvaluatorTest.java index 5e5cbe6..a47ae4d 100644 --- a/common/rya.api.function/src/test/java/org/apache/rya/api/function/filter/FilterEvaluatorTest.java +++ b/common/rya.api.function/src/test/java/org/apache/rya/api/function/filter/FilterEvaluatorTest.java @@ -24,16 +24,15 @@ import static org.junit.Assert.assertTrue; import java.util.concurrent.atomic.AtomicReference; -import org.apache.rya.api.function.filter.FilterEvaluator; import org.apache.rya.api.model.VisibilityBindingSet; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import edu.umd.cs.findbugs.annotations.Nullable; @@ -53,9 +52,9 @@ public class FilterEvaluatorTest { "}"); // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("age", vf.createLiteral(9)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bs); @@ -74,9 +73,9 @@ public class FilterEvaluatorTest { "}"); // Create the input binding set. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); bs.addBinding("age", vf.createLiteral(11)); final VisibilityBindingSet visBs = new VisibilityBindingSet(bs); @@ -96,7 +95,7 @@ public class FilterEvaluatorTest { 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/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/MultiProjectionEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/MultiProjectionEvaluatorTest.java b/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/MultiProjectionEvaluatorTest.java index c02e87b..8f4094b 100644 --- a/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/MultiProjectionEvaluatorTest.java +++ b/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/MultiProjectionEvaluatorTest.java @@ -27,18 +27,18 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; import org.apache.rya.api.model.VisibilityBindingSet; +import org.eclipse.rdf4j.model.BNode; +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.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.algebra.MultiProjection; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.model.BNode; -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.model.vocabulary.XMLSchema; -import org.openrdf.query.algebra.MultiProjection; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import edu.umd.cs.findbugs.annotations.Nullable; @@ -62,7 +62,7 @@ public class MultiProjectionEvaluatorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); bs.addBinding("location", vf.createLiteral("South St and 5th St")); bs.addBinding("direction", vf.createLiteral("NW")); @@ -76,18 +76,18 @@ public class MultiProjectionEvaluatorTest { bs = new MapBindingSet(); bs.addBinding("subject", blankNode); bs.addBinding("predicate", RDF.TYPE); - bs.addBinding("object", vf.createURI("urn:movementObservation")); + bs.addBinding("object", vf.createIRI("urn:movementObservation")); expected.add( new VisibilityBindingSet(bs, "a|b") ); bs = new MapBindingSet(); bs.addBinding("subject", blankNode); - bs.addBinding("predicate", vf.createURI("urn:location")); + bs.addBinding("predicate", vf.createIRI("urn:location")); bs.addBinding("object", vf.createLiteral("South St and 5th St")); expected.add( new VisibilityBindingSet(bs, "a|b") ); bs = new MapBindingSet(); bs.addBinding("subject", blankNode); - bs.addBinding("predicate", vf.createURI("urn:direction")); + bs.addBinding("predicate", vf.createIRI("urn:direction")); bs.addBinding("object", vf.createLiteral("NW")); expected.add( new VisibilityBindingSet(bs, "a|b") ); @@ -116,12 +116,12 @@ public class MultiProjectionEvaluatorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); bs.addBinding("vehicle", vf.createLiteral("Alice's car")); - bs.addBinding("owner", vf.createURI("urn:Alice")); + bs.addBinding("owner", vf.createIRI("urn:Alice")); bs.addBinding("plates", vf.createLiteral("XXXXXXX")); - bs.addBinding("pet", vf.createURI("urn:Kitty")); + bs.addBinding("pet", vf.createIRI("urn:Kitty")); final VisibilityBindingSet original = new VisibilityBindingSet(bs, "a|b"); // Run the projection evaluator. @@ -132,9 +132,9 @@ public class MultiProjectionEvaluatorTest { Value petBNode = null; for(final VisibilityBindingSet result : results) { final Value object = result.getValue("object"); - if(object.equals(vf.createURI("urn:vehicle"))) { + if(object.equals(vf.createIRI("urn:vehicle"))) { vehicalBNode = result.getValue("subject"); - } else if(object.equals(vf.createURI("urn:pet"))) { + } else if(object.equals(vf.createIRI("urn:pet"))) { petBNode = result.getValue("subject"); } } @@ -145,24 +145,24 @@ public class MultiProjectionEvaluatorTest { bs = new MapBindingSet(); bs.addBinding("subject", vehicalBNode); bs.addBinding("predicate", RDF.TYPE); - bs.addBinding("object", vf.createURI("urn:vehicle")); + bs.addBinding("object", vf.createIRI("urn:vehicle")); expected.add( new VisibilityBindingSet(bs, "a|b") ); bs = new MapBindingSet(); bs.addBinding("subject", vehicalBNode); - bs.addBinding("predicate", vf.createURI("urn:tiresCount")); + bs.addBinding("predicate", vf.createIRI("urn:tiresCount")); bs.addBinding("object", vf.createLiteral("4", XMLSchema.INTEGER)); expected.add( new VisibilityBindingSet(bs, "a|b") ); bs = new MapBindingSet(); bs.addBinding("subject", petBNode); bs.addBinding("predicate", RDF.TYPE); - bs.addBinding("object", vf.createURI("urn:pet")); + bs.addBinding("object", vf.createIRI("urn:pet")); expected.add( new VisibilityBindingSet(bs, "a|b") ); bs = new MapBindingSet(); bs.addBinding("subject", petBNode); - bs.addBinding("predicate", vf.createURI("urn:isDead")); + bs.addBinding("predicate", vf.createIRI("urn:isDead")); bs.addBinding("object", vf.createLiteral(false)); expected.add( new VisibilityBindingSet(bs, "a|b") ); @@ -181,7 +181,7 @@ public class MultiProjectionEvaluatorTest { 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); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/ProjectionEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/ProjectionEvaluatorTest.java b/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/ProjectionEvaluatorTest.java index e4a26a0..c2e6367 100644 --- a/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/ProjectionEvaluatorTest.java +++ b/common/rya.api.function/src/test/java/org/apache/rya/api/function/projection/ProjectionEvaluatorTest.java @@ -24,14 +24,14 @@ import static org.junit.Assert.assertEquals; import java.util.concurrent.atomic.AtomicReference; import org.apache.rya.api.model.VisibilityBindingSet; +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.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import edu.umd.cs.findbugs.annotations.Nullable; @@ -55,11 +55,11 @@ public class ProjectionEvaluatorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoJoint")); final VisibilityBindingSet original = new VisibilityBindingSet(bs, "a|b"); // Execute the projection. @@ -81,18 +81,18 @@ public class ProjectionEvaluatorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoJoint")); final VisibilityBindingSet original = new VisibilityBindingSet(bs, "a|b"); // The expected binding set changes the "person" binding name to "p" and "employee" to "e". bs = new MapBindingSet(); - bs.addBinding("p", vf.createURI("urn:Alice")); - bs.addBinding("e", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); + bs.addBinding("p", vf.createIRI("urn:Alice")); + bs.addBinding("e", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoJoint")); final VisibilityBindingSet expected = new VisibilityBindingSet(bs, "a|b"); // Execute the projection. @@ -114,16 +114,16 @@ public class ProjectionEvaluatorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("employee", vf.createIRI("urn:Bob")); + bs.addBinding("business", vf.createIRI("urn:TacoJoint")); final VisibilityBindingSet original = new VisibilityBindingSet(bs, "a|b"); // The expected binding set only has the "person" binding. bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); + bs.addBinding("person", vf.createIRI("urn:Alice")); final VisibilityBindingSet expected = new VisibilityBindingSet(bs, "a|b"); // Execute the projection. @@ -145,18 +145,18 @@ public class ProjectionEvaluatorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("child", vf.createURI("urn:Bob")); - bs.addBinding("grandchild", vf.createURI("urn:Charlie")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("child", vf.createIRI("urn:Bob")); + bs.addBinding("grandchild", vf.createIRI("urn:Charlie")); final VisibilityBindingSet original = new VisibilityBindingSet(bs, "a|b"); // The expected binding set represents a statement. bs = new MapBindingSet(); - bs.addBinding("subject", vf.createURI("urn:Alice")); - bs.addBinding("predicate", vf.createURI("urn:hasGrandchild")); - bs.addBinding("object", vf.createURI("urn:Charlie")); + bs.addBinding("subject", vf.createIRI("urn:Alice")); + bs.addBinding("predicate", vf.createIRI("urn:hasGrandchild")); + bs.addBinding("object", vf.createIRI("urn:Charlie")); final VisibilityBindingSet expected = new VisibilityBindingSet(bs, "a|b"); // Execute the projection. @@ -177,10 +177,10 @@ public class ProjectionEvaluatorTest { "}"); // Create a Binding Set that contains the result of the WHERE clause. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); MapBindingSet bs = new MapBindingSet(); - bs.addBinding("person", vf.createURI("urn:Alice")); - bs.addBinding("hasGrandchild", vf.createURI("urn:Bob")); + bs.addBinding("person", vf.createIRI("urn:Alice")); + bs.addBinding("hasGrandchild", vf.createIRI("urn:Bob")); final VisibilityBindingSet original = new VisibilityBindingSet(bs, "a|b"); // Execute the projection. @@ -189,8 +189,8 @@ public class ProjectionEvaluatorTest { // The expected binding set represents a statement. We need to get the blank node's id from the // result since that is different every time. bs = new MapBindingSet(); - bs.addBinding("subject", vf.createURI("urn:Alice")); - bs.addBinding("predicate", vf.createURI("urn:hasChild")); + bs.addBinding("subject", vf.createIRI("urn:Alice")); + bs.addBinding("predicate", vf.createIRI("urn:hasChild")); bs.addBinding("object", result.getValue("object")); final VisibilityBindingSet expected = new VisibilityBindingSet(bs, "a|b"); @@ -209,7 +209,7 @@ public class ProjectionEvaluatorTest { 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); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.function/src/test/java/org/apache/rya/api/function/sp/StatementPatternMatcherTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.function/src/test/java/org/apache/rya/api/function/sp/StatementPatternMatcherTest.java b/common/rya.api.function/src/test/java/org/apache/rya/api/function/sp/StatementPatternMatcherTest.java index 78a5418..27d3a3a 100644 --- a/common/rya.api.function/src/test/java/org/apache/rya/api/function/sp/StatementPatternMatcherTest.java +++ b/common/rya.api.function/src/test/java/org/apache/rya/api/function/sp/StatementPatternMatcherTest.java @@ -25,16 +25,16 @@ import static org.junit.Assert.assertFalse; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; +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.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +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.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.algebra.StatementPattern; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import edu.umd.cs.findbugs.annotations.Nullable; @@ -52,13 +52,13 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that matches the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob"), vf.createIRI("urn:testGraph")); // Create the expected resulting Binding Set. final QueryBindingSet expected = new QueryBindingSet(); - expected.addBinding("p", vf.createURI("urn:talksTo")); - expected.addBinding("o", vf.createURI("urn:Bob")); + expected.addBinding("p", vf.createIRI("urn:talksTo")); + expected.addBinding("o", vf.createIRI("urn:Bob")); // Show the expected Binding Set matches the resulting Binding Set. final Optional<BindingSet> bs = matcher.match(statement); @@ -74,8 +74,8 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that does not match the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob"), vf.createIRI("urn:testGraph")); // Show the statement did not match. final Optional<BindingSet> bs = matcher.match(statement); @@ -91,13 +91,13 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that matches the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob"), vf.createIRI("urn:testGraph")); // Create the expected resulting Binding Set. final QueryBindingSet expected = new QueryBindingSet(); - expected.addBinding("s", vf.createURI("urn:Alice")); - expected.addBinding("o", vf.createURI("urn:Bob")); + expected.addBinding("s", vf.createIRI("urn:Alice")); + expected.addBinding("o", vf.createIRI("urn:Bob")); // Show the expected Binding Set matches the resulting Binding Set. final Optional<BindingSet> bs = matcher.match(statement); @@ -113,8 +113,8 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that does not match the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:knows"), vf.createURI("urn:Bob"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:knows"), vf.createIRI("urn:Bob"), vf.createIRI("urn:testGraph")); // Show the statement did not match. final Optional<BindingSet> bs = matcher.match(statement); @@ -130,13 +130,13 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that matches the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob"), vf.createIRI("urn:testGraph")); // Create the expected resulting Binding Set. final QueryBindingSet expected = new QueryBindingSet(); - expected.addBinding("s", vf.createURI("urn:Alice")); - expected.addBinding("p", vf.createURI("urn:talksTo")); + expected.addBinding("s", vf.createIRI("urn:Alice")); + expected.addBinding("p", vf.createIRI("urn:talksTo")); // Show the expected Binding Set matches the resulting Binding Set. final Optional<BindingSet> bs = matcher.match(statement); @@ -152,8 +152,8 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that does not match the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:knows"), vf.createURI("urn:Alice"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:knows"), vf.createIRI("urn:Alice"), vf.createIRI("urn:testGraph")); // Show the statement did not match. final Optional<BindingSet> bs = matcher.match(statement); @@ -171,14 +171,14 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that matches the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob"), vf.createIRI("urn:testGraph")); // Create the expected resulting Binding Set. final QueryBindingSet expected = new QueryBindingSet(); - expected.addBinding("s", vf.createURI("urn:Alice")); - expected.addBinding("p", vf.createURI("urn:talksTo")); - expected.addBinding("o", vf.createURI("urn:Bob")); + expected.addBinding("s", vf.createIRI("urn:Alice")); + expected.addBinding("p", vf.createIRI("urn:talksTo")); + expected.addBinding("o", vf.createIRI("urn:Bob")); // Show the expected Binding Set matches the resulting Binding Set. final Optional<BindingSet> bs = matcher.match(statement); @@ -196,8 +196,8 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that does not match the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob"), vf.createURI("urn:wrong")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob"), vf.createIRI("urn:wrong")); // Show the statement did not match. final Optional<BindingSet> bs = matcher.match(statement); @@ -215,15 +215,15 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that matches the pattern. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob"), vf.createURI("urn:testGraph")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob"), vf.createIRI("urn:testGraph")); // Create the expected resulting Binding Set. final QueryBindingSet expected = new QueryBindingSet(); - expected.addBinding("s", vf.createURI("urn:Alice")); - expected.addBinding("p", vf.createURI("urn:talksTo")); - expected.addBinding("o", vf.createURI("urn:Bob")); - expected.addBinding("c", vf.createURI("urn:testGraph")); + expected.addBinding("s", vf.createIRI("urn:Alice")); + expected.addBinding("p", vf.createIRI("urn:talksTo")); + expected.addBinding("o", vf.createIRI("urn:Bob")); + expected.addBinding("c", vf.createIRI("urn:testGraph")); // Show the expected Binding Set matches the resulting Binding Set. final Optional<BindingSet> bs = matcher.match(statement); @@ -241,8 +241,8 @@ public class StatementPatternMatcherTest { "}")); // Create a statement that does not have a context value. - final ValueFactory vf = new ValueFactoryImpl(); - final Statement statement = vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:talksTo"), vf.createURI("urn:Bob")); + final ValueFactory vf = SimpleValueFactory.getInstance(); + final Statement statement = vf.createStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:talksTo"), vf.createIRI("urn:Bob")); // Show the statement did not match. final Optional<BindingSet> bs = matcher.match(statement); @@ -261,7 +261,7 @@ public class StatementPatternMatcherTest { 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); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.model/pom.xml ---------------------------------------------------------------------- diff --git a/common/rya.api.model/pom.xml b/common/rya.api.model/pom.xml index 6af6801..b03c389 100644 --- a/common/rya.api.model/pom.xml +++ b/common/rya.api.model/pom.xml @@ -32,12 +32,12 @@ under the License. <dependencies> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-model</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-model</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-query</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-query</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.model/src/main/java/org/apache/rya/api/model/BindingSetDecorator.java ---------------------------------------------------------------------- diff --git a/common/rya.api.model/src/main/java/org/apache/rya/api/model/BindingSetDecorator.java b/common/rya.api.model/src/main/java/org/apache/rya/api/model/BindingSetDecorator.java index e4126fd..cc2d0aa 100644 --- a/common/rya.api.model/src/main/java/org/apache/rya/api/model/BindingSetDecorator.java +++ b/common/rya.api.model/src/main/java/org/apache/rya/api/model/BindingSetDecorator.java @@ -23,9 +23,9 @@ import static java.util.Objects.requireNonNull; import java.util.Iterator; import java.util.Set; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; /** * Abstracts out the decoration of a {@link BindingSet}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.model/src/main/java/org/apache/rya/api/model/StatementDecorator.java ---------------------------------------------------------------------- diff --git a/common/rya.api.model/src/main/java/org/apache/rya/api/model/StatementDecorator.java b/common/rya.api.model/src/main/java/org/apache/rya/api/model/StatementDecorator.java index ed4b511..e261253 100644 --- a/common/rya.api.model/src/main/java/org/apache/rya/api/model/StatementDecorator.java +++ b/common/rya.api.model/src/main/java/org/apache/rya/api/model/StatementDecorator.java @@ -22,10 +22,10 @@ import static java.util.Objects.requireNonNull; import java.util.Objects; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -61,7 +61,7 @@ public abstract class StatementDecorator implements Statement { } @Override - public URI getPredicate() { + public IRI getPredicate() { return statement.getPredicate(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityBindingSet.java ---------------------------------------------------------------------- diff --git a/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityBindingSet.java b/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityBindingSet.java index b741539..a80af3c 100644 --- a/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityBindingSet.java +++ b/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityBindingSet.java @@ -22,7 +22,7 @@ import static java.util.Objects.requireNonNull; import java.util.Objects; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityStatement.java ---------------------------------------------------------------------- diff --git a/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityStatement.java b/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityStatement.java index ffe95d7..6008fb3 100644 --- a/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityStatement.java +++ b/common/rya.api.model/src/main/java/org/apache/rya/api/model/VisibilityStatement.java @@ -22,7 +22,7 @@ import static java.util.Objects.requireNonNull; import java.util.Objects; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api.model/src/test/java/org/apache/rya/api/model/VisibilityBindingSetTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api.model/src/test/java/org/apache/rya/api/model/VisibilityBindingSetTest.java b/common/rya.api.model/src/test/java/org/apache/rya/api/model/VisibilityBindingSetTest.java index 04f0c17..516027f 100644 --- a/common/rya.api.model/src/test/java/org/apache/rya/api/model/VisibilityBindingSetTest.java +++ b/common/rya.api.model/src/test/java/org/apache/rya/api/model/VisibilityBindingSetTest.java @@ -20,10 +20,10 @@ package org.apache.rya.api.model; import static org.junit.Assert.assertNotEquals; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Unit tests the methods of {@link VisibilityBindingSet}. @@ -33,7 +33,7 @@ public class VisibilityBindingSetTest { @Test public void hashcode() { // Create a BindingSet, decorate it, and grab its hash code. - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bSet = new MapBindingSet(); bSet.addBinding("name", vf.createLiteral("alice")); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/pom.xml ---------------------------------------------------------------------- diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml index 2529f2f..70bc691 100644 --- a/common/rya.api/pom.xml +++ b/common/rya.api/pom.xml @@ -41,32 +41,32 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-model</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-model</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-query</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-query</artifactId> </dependency> <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-queryalgebra-evaluation</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryalgebra-evaluation</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-ntriples</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-ntriples</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-trig</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-trig</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-turtle</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-turtle</artifactId> </dependency> <dependency> @@ -108,6 +108,11 @@ under the License. <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-sail-base</artifactId> + <version>${org.eclipse.rdf4j.version}</version> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java index a837b4e..c5d3e5f 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java @@ -1,7 +1,3 @@ -package org.apache.rya.api; - -import java.util.HashSet; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,9 +16,9 @@ import java.util.HashSet; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.api; - - +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -31,7 +27,7 @@ import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.layout.TableLayoutStrategy; import org.apache.rya.api.layout.TablePrefixLayoutStrategy; import org.apache.rya.api.persist.RdfEvalStatsDAO; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -369,7 +365,7 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { /** * Sets whether rdfs:domain and rdfs:range inferencing is enabled or disabled. - * @param value {@code true} if rdfs:domain/range inferencing is enabled. + * @param val {@code true} if rdfs:domain/range inferencing is enabled. * {@code false} otherwise. */ public void setInferDomainRange(final Boolean val) { @@ -388,7 +384,7 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { /** * Sets whether owl:hasSelf inferencing is enabled or disabled. - * @param value {@code true} if owl:hasSelf inferencing is enabled. + * @param val {@code true} if owl:hasSelf inferencing is enabled. * {@code false} otherwise. */ public void setInferHasSelf(final Boolean val) { @@ -445,7 +441,7 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { /** * Sets whether owl:inverseOf inferencing is enabled or disabled. - * @param value {@code true} if owl:inverseOf inferencing is enabled. + * @param val {@code true} if owl:inverseOf inferencing is enabled. * {@code false} otherwise. */ public void setInferInverseOf(final Boolean val) { @@ -559,7 +555,7 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { /** * Sets whether rdfs:subClassOf inferencing is enabled or disabled. - * @param value {@code true} if rdfs:subClassOf inferencing is enabled. + * @param val {@code true} if rdfs:subClassOf inferencing is enabled. * {@code false} otherwise. */ public void setInferSubClassOf(final Boolean val) { @@ -578,7 +574,7 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { /** * Sets whether rdfs:subPropertyOf inferencing is enabled or disabled. - * @param value {@code true} if rdfs:subPropertyOf inferencing is enabled. + * @param val {@code true} if rdfs:subPropertyOf inferencing is enabled. * {@code false} otherwise. */ public void setInferSubPropertyOf(final Boolean val) { @@ -597,7 +593,7 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { /** * Sets whether owl:SymmetricProperty inferencing is enabled or disabled. - * @param value {@code true} if owl:SymmetricProperty inferencing is enabled. + * @param val {@code true} if owl:SymmetricProperty inferencing is enabled. * {@code false} otherwise. */ public void setInferSymmetricProperty(final Boolean val) { @@ -616,7 +612,7 @@ public abstract class RdfCloudTripleStoreConfiguration extends Configuration { /** * Sets whether owl:TransitiveProperty inferencing is enabled or disabled. - * @param value {@code true} if owl:TransitiveProperty inferencing is enabled. + * @param val {@code true} if owl:TransitiveProperty inferencing is enabled. * {@code false} otherwise. */ public void setInferTransitiveProperty(final Boolean val) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfigurationBuilder.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfigurationBuilder.java index a39464c..519cfe5 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfigurationBuilder.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfigurationBuilder.java @@ -88,8 +88,8 @@ public abstract class RdfCloudTripleStoreConfigurationBuilder<B extends RdfCloud * - visibilities assigned to any triples inserted into Rya * @return B - concrete builder class for chaining method invocations */ - public B setVisibilities(String visibilites) { - this.visibilities = visibilites; + public B setVisibilities(String visibilities) { + this.visibilities = visibilities; return confBuilder(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java index dd7ada0..a0ac20d 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java @@ -24,19 +24,19 @@ import org.apache.hadoop.io.Text; import org.apache.rya.api.domain.RyaSchema; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; public class RdfCloudTripleStoreConstants { public static final String NAMESPACE = RyaSchema.NAMESPACE; public static final String AUTH_NAMESPACE = RyaSchema.AUTH_NAMESPACE; - public static ValueFactory VALUE_FACTORY = ValueFactoryImpl.getInstance(); - public static URI RANGE = VALUE_FACTORY.createURI(NAMESPACE, "range"); - public static URI PARTITION_TIMERANGE = VALUE_FACTORY.createURI("urn:org.apache.mmrts.partition.rdf/08/2011#", "timeRange"); + public static ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); + public static IRI RANGE = VALUE_FACTORY.createIRI(NAMESPACE, "range"); + public static IRI PARTITION_TIMERANGE = VALUE_FACTORY.createIRI("urn:org.apache.mmrts.partition.rdf/08/2011#", "timeRange"); public static Literal EMPTY_LITERAL = VALUE_FACTORY.createLiteral(0); public static final byte EMPTY_BYTES[] = new byte[0]; public static final Text EMPTY_TEXT = new Text(); @@ -135,14 +135,14 @@ public class RdfCloudTripleStoreConstants { // public static final Authorizations ALL_AUTHORIZATIONS = new Authorizations( // "_"); - public static enum TABLE_LAYOUT { + public enum TABLE_LAYOUT { SPO, PO, OSP } //TODO: This should be in a version file somewhere - public static URI RTS_SUBJECT = VALUE_FACTORY.createURI(NAMESPACE, "rts"); + public static IRI RTS_SUBJECT = VALUE_FACTORY.createIRI(NAMESPACE, "rts"); public static RyaURI RTS_SUBJECT_RYA = new RyaURI(RTS_SUBJECT.stringValue()); - public static URI RTS_VERSION_PREDICATE = VALUE_FACTORY.createURI(NAMESPACE, "version"); + public static IRI RTS_VERSION_PREDICATE = VALUE_FACTORY.createIRI(NAMESPACE, "version"); public static RyaURI RTS_VERSION_PREDICATE_RYA = new RyaURI(RTS_VERSION_PREDICATE.stringValue()); public static final Value VERSION = VALUE_FACTORY.createLiteral("3.0.0"); public static RyaType VERSION_RYA = new RyaType(VERSION.stringValue()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java index 00ecb22..662d168 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java @@ -19,27 +19,29 @@ package org.apache.rya.api; * under the License. */ - - -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.StatementImpl; - import java.util.ArrayList; import java.util.Collection; -public class RdfCloudTripleStoreStatement extends StatementImpl { +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleStatement; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; + +public class RdfCloudTripleStoreStatement extends SimpleStatement { + private static final long serialVersionUID = 1L; + + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private Resource[] contexts; //TODO: no blank nodes - public RdfCloudTripleStoreStatement(Resource subject, URI predicate, Value object) { + public RdfCloudTripleStoreStatement(Resource subject, IRI predicate, Value object) { super(subject, predicate, object); } - public RdfCloudTripleStoreStatement(Resource subject, URI predicate, Value object, + public RdfCloudTripleStoreStatement(Resource subject, IRI predicate, Value object, Resource... contexts) { super(subject, predicate, object); this.contexts = contexts; @@ -54,7 +56,7 @@ public class RdfCloudTripleStoreStatement extends StatementImpl { if (getContexts() != null && getContexts().length > 1) { for (Resource contxt : getContexts()) { - statements.add(new ContextStatementImpl(getSubject(), + statements.add(VF.createStatement(getSubject(), getPredicate(), getObject(), contxt)); } } else http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java index 0a366d7..acb0b91 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java @@ -19,28 +19,22 @@ package org.apache.rya.api; * under the License. */ - - -import org.apache.rya.api.layout.TableLayoutStrategy; -import org.apache.rya.api.layout.TablePrefixLayoutStrategy; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.BNodeImpl; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; - import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.layout.TableLayoutStrategy; +import org.apache.rya.api.layout.TablePrefixLayoutStrategy; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; public class RdfCloudTripleStoreUtils { - public static ValueFactory valueFactory = new ValueFactoryImpl(); + public static final ValueFactory VF = SimpleValueFactory.getInstance(); public static final Pattern literalPattern = Pattern.compile("^\"(.*?)\"((\\^\\^<(.+?)>)$|(@(.{2}))$)"); // public static byte[] writeValue(Value value) throws IOException { @@ -93,7 +87,7 @@ public class RdfCloudTripleStoreUtils { //// Value ret = null; //// if (valueTypeMarker == RdfCloudTripleStoreConstants.URI_MARKER) { //// String uriString = readString(dataIn); -//// ret = vf.createURI(uriString); +//// ret = vf.createIRI(uriString); //// } else if (valueTypeMarker == RdfCloudTripleStoreConstants.BNODE_MARKER) { //// String bnodeID = readString(dataIn); //// ret = vf.createBNode(bnodeID); @@ -246,9 +240,7 @@ public class RdfCloudTripleStoreUtils { CustomEntry that = (CustomEntry) o; if (key != null ? !key.equals(that.key) : that.key != null) return false; - if (value != null ? !value.equals(that.value) : that.value != null) return false; - - return true; + return value != null ? value.equals(that.value) : that.value == null; } @Override @@ -266,17 +258,17 @@ public class RdfCloudTripleStoreUtils { * @param value * @return */ - public static URI convertToUri(String namespace, String value) { + public static IRI convertToUri(String namespace, String value) { if (value == null) return null; - URI subjUri; + IRI subjUri; try { - subjUri = valueFactory.createURI(value); + subjUri = VF.createIRI(value); } catch (Exception e) { //not uri if (namespace == null) return null; - subjUri = valueFactory.createURI(namespace, value); + subjUri = VF.createIRI(namespace, value); } return subjUri; } @@ -293,7 +285,7 @@ public class RdfCloudTripleStoreUtils { } String dataType = s.substring(dt_i_start, dt_i_end); - return valueFactory.createLiteral(val, valueFactory.createURI(dataType)); + return VF.createLiteral(val, VF.createIRI(dataType)); } return null; } @@ -305,7 +297,7 @@ public class RdfCloudTripleStoreUtils { public static boolean isUri(String uri) { if (uri == null) return false; try { - valueFactory.createURI(uri); + VF.createIRI(uri); } catch (Exception e) { return false; } @@ -381,12 +373,12 @@ public class RdfCloudTripleStoreUtils { //helper methods to createValue public static Value createValue(String resource) { if (isBNode(resource)) - return new BNodeImpl(resource.substring(2)); + return VF.createBNode(resource.substring(2)); Literal literal; if ((literal = makeLiteral(resource)) != null) return literal; if (resource.contains(":") || resource.contains("/") || resource.contains("#")) { - return new URIImpl(resource); + return VF.createIRI(resource); } else { throw new RuntimeException((new StringBuilder()).append(resource).append(" is not a valid URI, blank node, or literal value").toString()); } @@ -408,11 +400,11 @@ public class RdfCloudTripleStoreUtils { Matcher matcher = literalPattern.matcher(resource); if (matcher.matches()) if (null != matcher.group(4)) - return new LiteralImpl(matcher.group(1), new URIImpl(matcher.group(4))); + return VF.createLiteral(matcher.group(1), VF.createIRI(matcher.group(4))); else - return new LiteralImpl(matcher.group(1), matcher.group(6)); + return VF.createLiteral(matcher.group(1), matcher.group(6)); if (resource.startsWith("\"") && resource.endsWith("\"") && resource.length() > 1) - return new LiteralImpl(resource.substring(1, resource.length() - 1)); + return VF.createLiteral(resource.substring(1, resource.length() - 1)); else return null; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/client/ExecuteSparqlQuery.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/ExecuteSparqlQuery.java b/common/rya.api/src/main/java/org/apache/rya/api/client/ExecuteSparqlQuery.java index 082beb1..212399a 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/client/ExecuteSparqlQuery.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/ExecuteSparqlQuery.java @@ -20,8 +20,8 @@ package org.apache.rya.api.client; import java.io.Closeable; -import org.openrdf.query.BindingSet; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.TupleQueryResult; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatements.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatements.java b/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatements.java index 2fdb77b..9cac606 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatements.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatements.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 @@ -18,7 +18,7 @@ */ package org.apache.rya.api.client; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java b/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java index 0fd987a..85cebb8 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/client/LoadStatementsFile.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 @@ -20,7 +20,7 @@ package org.apache.rya.api.client; import java.nio.file.Path; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFFormat; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java index 5b086d2..62ee8c0 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java @@ -19,14 +19,12 @@ package org.apache.rya.api.date; * under the License. */ - - -import org.openrdf.model.Value; +import java.util.GregorianCalendar; +import java.util.TimeZone; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; -import java.util.GregorianCalendar; -import java.util.TimeZone; +import org.eclipse.rdf4j.model.Value; /** * Class DateTimeTtlValueConverter http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java index 97e4804..a52e0b4 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java @@ -19,9 +19,7 @@ package org.apache.rya.api.date; * under the License. */ - - -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; /** * Class TimestampTtlValueConverter
