http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/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 b25864e..a9f86b1 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 @@ -34,7 +34,7 @@ import org.apache.rya.accumulo.RyaTableMutationsFactory; import org.apache.rya.api.RdfCloudTripleStoreConstants; 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.domain.RyaIRI; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.indexing.accumulo.ConfigUtils; @@ -111,14 +111,14 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 20; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaType(XMLSchema.STRING, "cq1")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaType(XMLSchema.STRING, "cq1")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); RyaStatement rs3 = null; RyaStatement rs4 = null; if(i == 5 || i == 15) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); - rs4 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.STRING,Integer.toString(i))); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); + rs4 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.STRING,Integer.toString(i))); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -246,13 +246,13 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:cq1"), new RyaURI("uri:cf1"), new RyaURI("uri:" + i )); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:cq1"), new RyaIRI("uri:cf1"), new RyaIRI("uri:" + i )); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); RyaStatement rs3 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -370,13 +370,13 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaType(XMLSchema.STRING, "cq1")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaType(XMLSchema.STRING, "cq1")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); RyaStatement rs3 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -484,13 +484,13 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaType(XMLSchema.STRING, "cq1")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaType(XMLSchema.STRING, "cq1")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); RyaStatement rs3 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -596,13 +596,13 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:cq1"), new RyaURI("uri:cf1"), new RyaURI("uri:" + i )); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:cq1"), new RyaIRI("uri:cf1"), new RyaIRI("uri:" + i )); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); RyaStatement rs3 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -710,13 +710,13 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:cq1"), new RyaURI("uri:cf1"), new RyaURI("uri:" + i )); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:cq1"), new RyaIRI("uri:cf1"), new RyaIRI("uri:" + i )); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2")); RyaStatement rs3 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i))); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -825,18 +825,18 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:cq1"), new RyaURI("uri:cf1"), new RyaURI("uri:" + i ), new RyaURI("uri:joe")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:joe")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:cq1"), new RyaIRI("uri:cf1"), new RyaIRI("uri:" + i ), new RyaIRI("uri:joe")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:joe")); RyaStatement rs3 = null; - RyaStatement rs4 = new RyaStatement(new RyaURI("uri:cq1"), new RyaURI("uri:cf1"), new RyaURI("uri:" + i ), new RyaURI("uri:hank")); - RyaStatement rs5 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:hank")); + RyaStatement rs4 = new RyaStatement(new RyaIRI("uri:cq1"), new RyaIRI("uri:cf1"), new RyaIRI("uri:" + i ), new RyaIRI("uri:hank")); + RyaStatement rs5 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:hank")); RyaStatement rs6 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:joe")); - rs6 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:hank")); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:joe")); + rs6 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:hank")); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -1002,18 +1002,18 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:cq1"), new RyaURI("uri:cf1"), new RyaURI("uri:" + i ), new RyaURI("uri:joe")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:joe")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:cq1"), new RyaIRI("uri:cf1"), new RyaIRI("uri:" + i ), new RyaIRI("uri:joe")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:joe")); RyaStatement rs3 = null; - RyaStatement rs4 = new RyaStatement(new RyaURI("uri:cq1"), new RyaURI("uri:cf1"), new RyaURI("uri:" + i ), new RyaURI("uri:hank")); - RyaStatement rs5 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:hank")); + RyaStatement rs4 = new RyaStatement(new RyaIRI("uri:cq1"), new RyaIRI("uri:cf1"), new RyaIRI("uri:" + i ), new RyaIRI("uri:hank")); + RyaStatement rs5 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:hank")); RyaStatement rs6 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:joe")); - rs6 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:hank")); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:joe")); + rs6 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:hank")); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -1176,18 +1176,18 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:joe")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:joe")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:joe")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:joe")); RyaStatement rs3 = null; - RyaStatement rs4 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:hank")); - RyaStatement rs5 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:hank")); + RyaStatement rs4 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:hank")); + RyaStatement rs5 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:hank")); RyaStatement rs6 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:joe")); - rs6 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:hank")); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:joe")); + rs6 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:hank")); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -1356,18 +1356,18 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:joe")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:joe")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:joe")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:joe")); RyaStatement rs3 = null; - RyaStatement rs4 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:hank")); - RyaStatement rs5 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:hank")); + RyaStatement rs4 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:hank")); + RyaStatement rs5 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:hank")); RyaStatement rs6 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:joe")); - rs6 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:hank")); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:joe")); + rs6 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:hank")); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -1538,18 +1538,18 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:joe")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:joe")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:joe")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:joe")); RyaStatement rs3 = null; - RyaStatement rs4 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:hank")); - RyaStatement rs5 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:hank")); + RyaStatement rs4 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:hank")); + RyaStatement rs5 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:hank")); RyaStatement rs6 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:joe")); - rs6 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:hank")); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:joe")); + rs6 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:hank")); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -1717,12 +1717,12 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:joe")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:joe")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:joe")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:joe")); RyaStatement rs3 = null; - RyaStatement rs4 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:hank")); - RyaStatement rs5 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:hank")); + RyaStatement rs4 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:hank")); + RyaStatement rs5 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:hank")); RyaStatement rs6 = null; RyaStatement rs7 = null; @@ -1730,10 +1730,10 @@ public class AccumuloDocIndexerTest { if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:joe")); - rs6 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:hank")); - rs7 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(100+i)), new RyaURI("uri:joe")); - rs8 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(100+i)), new RyaURI("uri:hank")); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:joe")); + rs6 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:hank")); + rs7 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(100+i)), new RyaIRI("uri:joe")); + rs8 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(100+i)), new RyaIRI("uri:hank")); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1); @@ -1923,18 +1923,18 @@ public class AccumuloDocIndexerTest { for (int i = 0; i < 30; i++) { - RyaStatement rs1 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:joe")); - RyaStatement rs2 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:joe")); + RyaStatement rs1 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:joe")); + RyaStatement rs2 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:joe")); RyaStatement rs3 = null; - RyaStatement rs4 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf1"), new RyaURI("uri:cq1"), new RyaURI("uri:hank")); - RyaStatement rs5 = new RyaStatement(new RyaURI("uri:" + i ), new RyaURI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaURI("uri:hank")); + RyaStatement rs4 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf1"), new RyaIRI("uri:cq1"), new RyaIRI("uri:hank")); + RyaStatement rs5 = new RyaStatement(new RyaIRI("uri:" + i ), new RyaIRI("uri:cf2"), new RyaType(XMLSchema.STRING, "cq2"), new RyaIRI("uri:hank")); RyaStatement rs6 = null; if(i == 5 || i == 10 || i == 15 || i == 20 || i == 25) { - rs3 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:joe")); - rs6 = new RyaStatement(new RyaURI("uri:" +i ), new RyaURI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaURI("uri:hank")); + rs3 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:joe")); + rs6 = new RyaStatement(new RyaIRI("uri:" +i ), new RyaIRI("uri:cf3"), new RyaType(XMLSchema.INTEGER,Integer.toString(i)), new RyaIRI("uri:hank")); } Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Collection<Mutation>> serialize1 = rtm.serialize(rs1);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/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 79fd2c2..3111510 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 @@ -30,7 +30,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.ColumnVisibility; 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.domain.RyaIRI; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; import org.eclipse.rdf4j.model.vocabulary.XMLSchema; @@ -72,10 +72,10 @@ public class EntityCentricIndexTest { DELIM_BYTES, subjectStr.getBytes(), objectBytes[1]), visibilityBytes, timestamp); ryaStatement = new RyaStatement( - new RyaURI(subjectStr), - new RyaURI(predicateStr), + new RyaIRI(subjectStr), + new RyaIRI(predicateStr), new RyaType(XMLSchema.INTEGER, "3"), - new RyaURI(contextStr), + new RyaIRI(contextStr), null, visibilityBytes, valueBytes, timestamp); value = new Value(valueBytes); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexerTest.java index 62396e4..f6c29a4 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexerTest.java @@ -35,7 +35,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.rya.accumulo.AccumuloRdfConfiguration; 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.domain.RyaIRI; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.indexing.StatementConstraints; @@ -191,20 +191,20 @@ public class AccumuloFreeTextIndexerTest { f.init(); // These should not be stored because they are not in the predicate list - f.storeStatement(new RyaStatement(new RyaURI("foo:subj1"), new RyaURI(RDFS.LABEL.toString()), new RyaType("invalid"))); - f.storeStatement(new RyaStatement(new RyaURI("foo:subj2"), new RyaURI(RDFS.COMMENT.toString()), new RyaType("invalid"))); + f.storeStatement(new RyaStatement(new RyaIRI("foo:subj1"), new RyaIRI(RDFS.LABEL.toString()), new RyaType("invalid"))); + f.storeStatement(new RyaStatement(new RyaIRI("foo:subj2"), new RyaIRI(RDFS.COMMENT.toString()), new RyaType("invalid"))); - RyaURI pred1 = new RyaURI("pred:1"); - RyaURI pred2 = new RyaURI("pred:2"); + RyaIRI pred1 = new RyaIRI("pred:1"); + RyaIRI pred2 = new RyaIRI("pred:2"); // These should be stored because they are in the predicate list - RyaStatement s3 = new RyaStatement(new RyaURI("foo:subj3"), pred1, new RyaType("valid")); - RyaStatement s4 = new RyaStatement(new RyaURI("foo:subj4"), pred2, new RyaType("valid")); + RyaStatement s3 = new RyaStatement(new RyaIRI("foo:subj3"), pred1, new RyaType("valid")); + RyaStatement s4 = new RyaStatement(new RyaIRI("foo:subj4"), pred2, new RyaType("valid")); f.storeStatement(s3); f.storeStatement(s4); // This should not be stored because the object is not a literal - f.storeStatement(new RyaStatement(new RyaURI("foo:subj5"), pred1, new RyaURI("in:valid"))); + f.storeStatement(new RyaStatement(new RyaIRI("foo:subj5"), pred1, new RyaIRI("in:valid"))); f.flush(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/entity/query/EntityQueryNodeIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/query/EntityQueryNodeIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/query/EntityQueryNodeIT.java index c5b7fa1..833858a 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/query/EntityQueryNodeIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/query/EntityQueryNodeIT.java @@ -26,7 +26,7 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.indexing.entity.model.Entity; @@ -56,18 +56,18 @@ import com.google.common.collect.ImmutableSet; public class EntityQueryNodeIT extends MongoITBase { private static final Type PERSON_TYPE = - new Type(new RyaURI("urn:person"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:name")) - .add(new RyaURI("urn:age")) - .add(new RyaURI("urn:eye")) + new Type(new RyaIRI("urn:person"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:name")) + .add(new RyaIRI("urn:age")) + .add(new RyaIRI("urn:eye")) .build()); private static final Type EMPLOYEE_TYPE = - new Type(new RyaURI("urn:employee"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:name")) - .add(new RyaURI("urn:hoursPerWeek")) + new Type(new RyaIRI("urn:employee"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:name")) + .add(new RyaIRI("urn:hoursPerWeek")) .build()); @Test(expected = IllegalStateException.class) @@ -154,13 +154,13 @@ public class EntityQueryNodeIT extends MongoITBase { public void evaluate_constantSubject() throws Exception { final EntityStorage storage = new MongoEntityStorage(super.getMongoClient(), "testDB"); final ValueFactory vf = SimpleValueFactory.getInstance(); - final RyaURI subject = new RyaURI("urn:SSN:111-11-1111"); + final RyaIRI subject = new RyaIRI("urn:SSN:111-11-1111"); final Entity entity = Entity.builder() .setSubject(subject) .setExplicitType(PERSON_TYPE.getId()) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(20))))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("blue")))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Bob")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(20))))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("blue")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Bob")))) .build(); storage.create(entity); @@ -189,22 +189,22 @@ public class EntityQueryNodeIT extends MongoITBase { public void evaluate_variableSubject() throws Exception { final EntityStorage storage = new MongoEntityStorage(super.getMongoClient(), "testDB"); final ValueFactory vf = SimpleValueFactory.getInstance(); - RyaURI subject = new RyaURI("urn:SSN:111-11-1111"); + RyaIRI subject = new RyaIRI("urn:SSN:111-11-1111"); final Entity bob = Entity.builder() .setSubject(subject) .setExplicitType(PERSON_TYPE.getId()) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(20))))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("blue")))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Bob")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(20))))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("blue")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Bob")))) .build(); - subject = new RyaURI("urn:SSN:222-22-2222"); + subject = new RyaIRI("urn:SSN:222-22-2222"); final Entity fred = Entity.builder() .setSubject(subject) .setExplicitType(PERSON_TYPE.getId()) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(25))))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("brown")))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Fred")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(25))))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("brown")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Fred")))) .build(); storage.create(bob); @@ -242,13 +242,13 @@ public class EntityQueryNodeIT extends MongoITBase { public void evaluate_constantObject() throws Exception { final EntityStorage storage = new MongoEntityStorage(super.getMongoClient(), "testDB"); final ValueFactory vf = SimpleValueFactory.getInstance(); - final RyaURI subject = new RyaURI("urn:SSN:111-11-1111"); + final RyaIRI subject = new RyaIRI("urn:SSN:111-11-1111"); final Entity entity = Entity.builder() .setSubject(subject) .setExplicitType(PERSON_TYPE.getId()) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(20))))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("blue")))) - .setProperty(PERSON_TYPE.getId(), new Property(new RyaURI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Bob")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:age"), RdfToRyaConversions.convertLiteral(vf.createLiteral(BigInteger.valueOf(20))))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:eye"), RdfToRyaConversions.convertLiteral(vf.createLiteral("blue")))) + .setProperty(PERSON_TYPE.getId(), new Property(new RyaIRI("urn:name"), RdfToRyaConversions.convertLiteral(vf.createLiteral("Bob")))) .build(); storage.create(entity); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverterTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverterTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverterTest.java index b124470..bdc67ae 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverterTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/EntityDocumentConverterTest.java @@ -21,7 +21,7 @@ package org.apache.rya.indexing.entity.storage.mongo; import static org.junit.Assert.assertEquals; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.entity.model.Entity; import org.apache.rya.indexing.entity.model.Property; import org.apache.rya.indexing.entity.storage.mongo.DocumentConverter.DocumentConverterException; @@ -38,14 +38,14 @@ public class EntityDocumentConverterTest { public void to_and_from_document() throws DocumentConverterException { // Convert an Entity into a Document. final Entity entity = Entity.builder() - .setSubject(new RyaURI("urn:alice")) + .setSubject(new RyaIRI("urn:alice")) // Add some explicily typed properties. - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType("blue"))) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType("blue"))) // Add some implicitly typed properties. - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:hours"), new RyaType(XMLSchema.INT, "40"))) - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:employer"), new RyaType("Burger Joint"))) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:hours"), new RyaType(XMLSchema.INT, "40"))) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:employer"), new RyaType("Burger Joint"))) .build(); final Document document = new EntityDocumentConverter().toDocument(entity); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoEntityStorageIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoEntityStorageIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoEntityStorageIT.java index cec989e..67595a9 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoEntityStorageIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoEntityStorageIT.java @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.Set; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.entity.model.Entity; import org.apache.rya.indexing.entity.model.Property; import org.apache.rya.indexing.entity.model.Type; @@ -54,10 +54,10 @@ public class MongoEntityStorageIT extends MongoITBase { public void create_and_get() throws Exception { // An Entity that will be stored. final Entity entity = Entity.builder() - .setSubject(new RyaURI("urn:GTIN-14/00012345600012")) - .setExplicitType(new RyaURI("urn:icecream")) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) + .setSubject(new RyaIRI("urn:GTIN-14/00012345600012")) + .setExplicitType(new RyaIRI("urn:icecream")) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) .build(); // Create it. @@ -65,7 +65,7 @@ public class MongoEntityStorageIT extends MongoITBase { storage.create(entity); // Get it. - final Optional<Entity> storedEntity = storage.get(new RyaURI("urn:GTIN-14/00012345600012")); + final Optional<Entity> storedEntity = storage.get(new RyaIRI("urn:GTIN-14/00012345600012")); // Verify the correct value was returned. assertEquals(entity, storedEntity.get()); @@ -75,10 +75,10 @@ public class MongoEntityStorageIT extends MongoITBase { public void can_not_create_with_same_subject() throws Exception { // A Type that will be stored. final Entity entity = Entity.builder() - .setSubject(new RyaURI("urn:GTIN-14/00012345600012")) - .setExplicitType(new RyaURI("urn:icecream")) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) + .setSubject(new RyaIRI("urn:GTIN-14/00012345600012")) + .setExplicitType(new RyaIRI("urn:icecream")) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) .build(); // Create it. @@ -99,7 +99,7 @@ public class MongoEntityStorageIT extends MongoITBase { public void get_noneExisting() throws Exception { // Get a Type that hasn't been created. final EntityStorage storage = new MongoEntityStorage(super.getMongoClient(), RYA_INSTANCE_NAME); - final Optional<Entity> storedEntity = storage.get(new RyaURI("urn:GTIN-14/00012345600012")); + final Optional<Entity> storedEntity = storage.get(new RyaIRI("urn:GTIN-14/00012345600012")); // Verify nothing was returned. assertFalse(storedEntity.isPresent()); @@ -109,10 +109,10 @@ public class MongoEntityStorageIT extends MongoITBase { public void delete() throws Exception { // An Entity that will be stored. final Entity entity = Entity.builder() - .setSubject(new RyaURI("urn:GTIN-14/00012345600012")) - .setExplicitType(new RyaURI("urn:icecream")) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) + .setSubject(new RyaIRI("urn:GTIN-14/00012345600012")) + .setExplicitType(new RyaIRI("urn:icecream")) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) .build(); // Create it. @@ -120,7 +120,7 @@ public class MongoEntityStorageIT extends MongoITBase { storage.create(entity); // Delete it. - final boolean deleted = storage.delete( new RyaURI("urn:GTIN-14/00012345600012") ); + final boolean deleted = storage.delete( new RyaIRI("urn:GTIN-14/00012345600012") ); // Verify a document was deleted. assertTrue( deleted ); @@ -130,7 +130,7 @@ public class MongoEntityStorageIT extends MongoITBase { public void delete_nonExisting() throws Exception { // Delete an Entity that has not been created. final EntityStorage storage = new MongoEntityStorage(super.getMongoClient(), RYA_INSTANCE_NAME); - final boolean deleted = storage.delete( new RyaURI("urn:GTIN-14/00012345600012") ); + final boolean deleted = storage.delete( new RyaIRI("urn:GTIN-14/00012345600012") ); // Verify no document was deleted. assertFalse( deleted ); @@ -141,50 +141,50 @@ public class MongoEntityStorageIT extends MongoITBase { final EntityStorage storage = new MongoEntityStorage(super.getMongoClient(), RYA_INSTANCE_NAME); // The Type we will search by. - final Type icecreamType = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type icecreamType = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); // Some Person typed entities. final Entity alice = Entity.builder() - .setSubject( new RyaURI("urn:SSN/111-11-1111") ) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/111-11-1111") ) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); final Entity bob = Entity.builder() - .setSubject( new RyaURI("urn:SSN/222-22-2222") ) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "57"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/222-22-2222") ) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "57"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); // Some Icecream typed objects. final Entity chocolateIcecream = Entity.builder() - .setSubject(new RyaURI("urn:GTIN-14/00012345600012")) - .setExplicitType(new RyaURI("urn:icecream")) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) + .setSubject(new RyaIRI("urn:GTIN-14/00012345600012")) + .setExplicitType(new RyaIRI("urn:icecream")) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:flavor"), new RyaType(XMLSchema.STRING, "Chocolate"))) .build(); final Entity vanillaIcecream = Entity.builder() - .setSubject( new RyaURI("urn:GTIN-14/22356325213432") ) - .setExplicitType(new RyaURI("urn:icecream")) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:flavor"), new RyaType(XMLSchema.STRING, "Vanilla"))) + .setSubject( new RyaIRI("urn:GTIN-14/22356325213432") ) + .setExplicitType(new RyaIRI("urn:icecream")) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:flavor"), new RyaType(XMLSchema.STRING, "Vanilla"))) .build(); final Entity strawberryIcecream = Entity.builder() - .setSubject( new RyaURI("urn:GTIN-14/77544325436721") ) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) - .setProperty(new RyaURI("urn:icecream"), new Property(new RyaURI("urn:flavor"), new RyaType(XMLSchema.STRING, "Strawberry"))) + .setSubject( new RyaIRI("urn:GTIN-14/77544325436721") ) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:brand"), new RyaType(XMLSchema.STRING, "Awesome Icecream"))) + .setProperty(new RyaIRI("urn:icecream"), new Property(new RyaIRI("urn:flavor"), new RyaType(XMLSchema.STRING, "Strawberry"))) .build(); // Create the objects in the storage. @@ -204,8 +204,8 @@ public class MongoEntityStorageIT extends MongoITBase { // Verify the expected results were returned. final Set<TypedEntity> expected = Sets.newHashSet( - chocolateIcecream.makeTypedEntity(new RyaURI("urn:icecream")).get(), - vanillaIcecream.makeTypedEntity(new RyaURI("urn:icecream")).get()); + chocolateIcecream.makeTypedEntity(new RyaIRI("urn:icecream")).get(), + vanillaIcecream.makeTypedEntity(new RyaIRI("urn:icecream")).get()); assertEquals(expected, objects); } @@ -214,67 +214,67 @@ public class MongoEntityStorageIT extends MongoITBase { final EntityStorage storage = new MongoEntityStorage(super.getMongoClient(), RYA_INSTANCE_NAME); // A Type that defines a Person. - final Type personType = new Type(new RyaURI("urn:person"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:name")) - .add(new RyaURI("urn:age")) - .add(new RyaURI("urn:eye")) + final Type personType = new Type(new RyaIRI("urn:person"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:name")) + .add(new RyaIRI("urn:age")) + .add(new RyaIRI("urn:eye")) .build()); // Some Person typed objects. final Entity alice = Entity.builder() - .setSubject( new RyaURI("urn:SSN/111-11-1111") ) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/111-11-1111") ) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); final Entity bob = Entity.builder() - .setSubject( new RyaURI("urn:SSN/222-22-2222") ) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "57"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/222-22-2222") ) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "57"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); final Entity charlie = Entity.builder() - .setSubject( new RyaURI("urn:SSN/333-33-3333") ) - .setExplicitType( new RyaURI("urn:person") ) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Charlie"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/333-33-3333") ) + .setExplicitType( new RyaIRI("urn:person") ) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Charlie"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); final Entity david = Entity.builder() - .setSubject( new RyaURI("urn:SSN/444-44-4444") ) - .setExplicitType( new RyaURI("urn:person") ) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "David"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "brown"))) + .setSubject( new RyaIRI("urn:SSN/444-44-4444") ) + .setExplicitType( new RyaIRI("urn:person") ) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "David"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "brown"))) .build(); final Entity eve = Entity.builder() - .setSubject( new RyaURI("urn:SSN/555-55-5555") ) - .setExplicitType( new RyaURI("urn:person") ) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Eve"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setSubject( new RyaIRI("urn:SSN/555-55-5555") ) + .setExplicitType( new RyaIRI("urn:person") ) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Eve"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) .build(); final Entity frank = Entity.builder() - .setSubject( new RyaURI("urn:SSN/666-66-6666") ) - .setExplicitType( new RyaURI("urn:person") ) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Frank"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) - .setProperty(new RyaURI("urn:someOtherType"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setSubject( new RyaIRI("urn:SSN/666-66-6666") ) + .setExplicitType( new RyaIRI("urn:person") ) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Frank"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setProperty(new RyaIRI("urn:someOtherType"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) .build(); final Entity george = Entity.builder() - .setSubject( new RyaURI("urn:SSN/777-77-7777") ) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "George"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/777-77-7777") ) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "George"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); // Create the objects in the storage. @@ -290,8 +290,8 @@ public class MongoEntityStorageIT extends MongoITBase { final Set<TypedEntity> objects = new HashSet<>(); final Set<Property> searchValues = Sets.newHashSet( - new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")), - new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))); + new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")), + new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))); try(final ConvertingCursor<TypedEntity> it = storage.search(Optional.empty(), personType, searchValues)) { while(it.hasNext()) { @@ -301,8 +301,8 @@ public class MongoEntityStorageIT extends MongoITBase { // Verify the expected results were returned. assertEquals(2, objects.size()); - assertTrue(objects.contains(alice.makeTypedEntity(new RyaURI("urn:person")).get())); - assertTrue(objects.contains(charlie.makeTypedEntity(new RyaURI("urn:person")).get())); + assertTrue(objects.contains(alice.makeTypedEntity(new RyaIRI("urn:person")).get())); + assertTrue(objects.contains(charlie.makeTypedEntity(new RyaIRI("urn:person")).get())); } @Test @@ -311,29 +311,29 @@ public class MongoEntityStorageIT extends MongoITBase { // Store Alice in the repository. final Entity alice = Entity.builder() - .setSubject( new RyaURI("urn:SSN/111-11-1111") ) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/111-11-1111") ) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); storage.create(alice); // Show Alice was stored. - Optional<Entity> latest = storage.get(new RyaURI("urn:SSN/111-11-1111")); + Optional<Entity> latest = storage.get(new RyaIRI("urn:SSN/111-11-1111")); assertEquals(alice, latest.get()); // Change Alice's eye color to brown. final Entity updated = Entity.builder(alice) .setVersion(latest.get().getVersion() + 1) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "brown"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "brown"))) .build(); storage.update(alice, updated); // Fetch the Alice object and ensure it has the new value. - latest = storage.get(new RyaURI("urn:SSN/111-11-1111")); + latest = storage.get(new RyaIRI("urn:SSN/111-11-1111")); assertEquals(updated, latest.get()); } @@ -344,17 +344,17 @@ public class MongoEntityStorageIT extends MongoITBase { // Store Alice in the repository. final Entity alice = Entity.builder() - .setSubject( new RyaURI("urn:SSN/111-11-1111") ) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setSubject( new RyaIRI("urn:SSN/111-11-1111") ) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .build(); storage.create(alice); // Show Alice was stored. - final Optional<Entity> latest = storage.get(new RyaURI("urn:SSN/111-11-1111")); + final Optional<Entity> latest = storage.get(new RyaIRI("urn:SSN/111-11-1111")); assertEquals(alice, latest.get()); // Create the wrong old state and try to change Alice's eye color to brown. @@ -364,7 +364,7 @@ public class MongoEntityStorageIT extends MongoITBase { final Entity updated = Entity.builder(alice) .setVersion(501) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "brown"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "brown"))) .build(); storage.update(wrongOld, updated); @@ -374,13 +374,13 @@ public class MongoEntityStorageIT extends MongoITBase { public void update_differentSubjects() throws Exception { // Two objects that do not have the same Subjects. final Entity old = Entity.builder() - .setSubject( new RyaURI("urn:SSN/111-11-1111") ) - .setExplicitType( new RyaURI("urn:person") ) + .setSubject( new RyaIRI("urn:SSN/111-11-1111") ) + .setExplicitType( new RyaIRI("urn:person") ) .build(); final Entity updated = Entity.builder() - .setSubject( new RyaURI("urn:SSN/222-22-2222") ) - .setExplicitType( new RyaURI("urn:person") ) + .setSubject( new RyaIRI("urn:SSN/222-22-2222") ) + .setExplicitType( new RyaIRI("urn:person") ) .build(); // The update will fail. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoTypeStorageIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoTypeStorageIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoTypeStorageIT.java index 8212dbf..d3342c0 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoTypeStorageIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/MongoTypeStorageIT.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.entity.model.Type; import org.apache.rya.indexing.entity.storage.TypeStorage; import org.apache.rya.indexing.entity.storage.TypeStorage.TypeStorageException; @@ -46,11 +46,11 @@ public class MongoTypeStorageIT extends MongoITBase { @Test public void create_and_get() throws TypeStorageException { // A Type that will be stored. - final Type type = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type type = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); // Create it. @@ -58,7 +58,7 @@ public class MongoTypeStorageIT extends MongoITBase { storage.create(type); // Get it. - final Optional<Type> storedType = storage.get(new RyaURI("urn:icecream")); + final Optional<Type> storedType = storage.get(new RyaIRI("urn:icecream")); // Verify the correct value was returned. assertEquals(type, storedType.get()); @@ -67,11 +67,11 @@ public class MongoTypeStorageIT extends MongoITBase { @Test public void can_not_create_with_same_id() throws TypeStorageException { // A Type that will be stored. - final Type type = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type type = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); // Create it. @@ -92,7 +92,7 @@ public class MongoTypeStorageIT extends MongoITBase { public void get_nonexisting() throws TypeStorageException { // Get a Type that hasn't been created. final TypeStorage storage = new MongoTypeStorage(super.getMongoClient(), RYA_INSTANCE_NAME); - final Optional<Type> storedType = storage.get(new RyaURI("urn:icecream")); + final Optional<Type> storedType = storage.get(new RyaIRI("urn:icecream")); // Verify nothing was returned. assertFalse(storedType.isPresent()); @@ -101,11 +101,11 @@ public class MongoTypeStorageIT extends MongoITBase { @Test public void delete() throws TypeStorageException { // An Type that will be stored. - final Type type = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type type = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); // Create it. @@ -113,7 +113,7 @@ public class MongoTypeStorageIT extends MongoITBase { storage.create(type); // Delete it. - final boolean deleted = storage.delete( new RyaURI("urn:icecream") ); + final boolean deleted = storage.delete( new RyaIRI("urn:icecream") ); // Verify a document was deleted. assertTrue( deleted ); @@ -123,7 +123,7 @@ public class MongoTypeStorageIT extends MongoITBase { public void delete_nonexisting() throws TypeStorageException { // Delete an Type that has not been created. final TypeStorage storage = new MongoTypeStorage(super.getMongoClient(), RYA_INSTANCE_NAME); - final boolean deleted = storage.delete( new RyaURI("urn:icecream") ); + final boolean deleted = storage.delete( new RyaIRI("urn:icecream") ); // Verify no document was deleted. assertFalse( deleted ); @@ -132,25 +132,25 @@ public class MongoTypeStorageIT extends MongoITBase { @Test public void search() throws Exception { // Add some Types to the storage. - final Type cat = new Type(new RyaURI("urn:cat"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:numLegs")) - .add(new RyaURI("urn:eye")) - .add(new RyaURI("urn:species")) + final Type cat = new Type(new RyaIRI("urn:cat"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:numLegs")) + .add(new RyaIRI("urn:eye")) + .add(new RyaIRI("urn:species")) .build()); - final Type dog = new Type(new RyaURI("urn:dog"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:numLegs")) - .add(new RyaURI("urn:eye")) - .add(new RyaURI("urn:species")) + final Type dog = new Type(new RyaIRI("urn:dog"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:numLegs")) + .add(new RyaIRI("urn:eye")) + .add(new RyaIRI("urn:species")) .build()); - final Type icecream = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type icecream = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); final TypeStorage storage = new MongoTypeStorage(super.getMongoClient(), RYA_INSTANCE_NAME); @@ -159,7 +159,7 @@ public class MongoTypeStorageIT extends MongoITBase { storage.create(icecream); // Search for all Types that have the 'urn:eye' property. - final ConvertingCursor<Type> typeIt = storage.search(new RyaURI("urn:eye")); + final ConvertingCursor<Type> typeIt = storage.search(new RyaIRI("urn:eye")); final Set<Type> types = new HashSet<>(); while(typeIt.hasNext()) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/TypeDocumentConverterTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/TypeDocumentConverterTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/TypeDocumentConverterTest.java index 4c795c2..6c8c1d4 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/TypeDocumentConverterTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/storage/mongo/TypeDocumentConverterTest.java @@ -20,7 +20,7 @@ package org.apache.rya.indexing.entity.storage.mongo; import static org.junit.Assert.assertEquals; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.entity.model.Type; import org.apache.rya.indexing.entity.storage.mongo.DocumentConverter.DocumentConverterException; import org.bson.Document; @@ -37,11 +37,11 @@ public class TypeDocumentConverterTest { @Test public void toDocument() { // Convert a Type into a Document. - final Type type = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type type = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); final Document document = new TypeDocumentConverter().toDocument(type); @@ -61,11 +61,11 @@ public class TypeDocumentConverterTest { final Type type = new TypeDocumentConverter().fromDocument(document); // Show the converted value has the expected structure. - final Type expected = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type expected = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); assertEquals(expected, type); }
