http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolverTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolverTest.java index 9fd5260..a812068 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolverTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolverTest.java @@ -24,7 +24,7 @@ package org.apache.rya.api.resolver.triple.impl; import junit.framework.TestCase; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.api.resolver.triple.TripleRowRegex; @@ -42,10 +42,10 @@ public class WholeRowTripleResolverTest extends TestCase { public void testSerialize() throws Exception { //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); @@ -64,10 +64,10 @@ public class WholeRowTripleResolverTest extends TestCase { public void testSerializePO() throws Exception { RdfCloudTripleStoreConstants.TABLE_LAYOUT po = RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO; //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = tripleResolver.serialize(stmt); @@ -85,10 +85,10 @@ public class WholeRowTripleResolverTest extends TestCase { public void testSerializeOSP() throws Exception { RdfCloudTripleStoreConstants.TABLE_LAYOUT po = RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP; //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = tripleResolver.serialize(stmt); @@ -106,10 +106,10 @@ public class WholeRowTripleResolverTest extends TestCase { public void testSerializeOSPCustomType() throws Exception { RdfCloudTripleStoreConstants.TABLE_LAYOUT po = RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP; //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = tripleResolver.serialize(stmt);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java ---------------------------------------------------------------------- diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java index f3e97a3..9b3752b 100644 --- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java +++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/AccumuloRyaDAO.java @@ -63,7 +63,7 @@ import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.layout.TableLayoutStrategy; import org.apache.rya.api.persist.RyaDAO; import org.apache.rya.api.persist.RyaDAOException; @@ -215,7 +215,7 @@ public class AccumuloRyaDAO implements RyaDAO<AccumuloRdfConfiguration>, RyaName } @Override - public void dropGraph(final AccumuloRdfConfiguration conf, final RyaURI... graphs) throws RyaDAOException { + public void dropGraph(final AccumuloRdfConfiguration conf, final RyaIRI... graphs) throws RyaDAOException { BatchDeleter bd_spo = null; BatchDeleter bd_po = null; BatchDeleter bd_osp = null; @@ -229,7 +229,7 @@ public class AccumuloRyaDAO implements RyaDAO<AccumuloRdfConfiguration>, RyaName bd_po.setRanges(Collections.singleton(new Range())); bd_osp.setRanges(Collections.singleton(new Range())); - for (final RyaURI graph : graphs){ + for (final RyaIRI graph : graphs){ bd_spo.fetchColumnFamily(new Text(graph.getData())); bd_po.fetchColumnFamily(new Text(graph.getData())); bd_osp.fetchColumnFamily(new Text(graph.getData())); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/experimental/AbstractAccumuloIndexer.java ---------------------------------------------------------------------- diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/experimental/AbstractAccumuloIndexer.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/experimental/AbstractAccumuloIndexer.java index 90cae5e..6d6a13b 100644 --- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/experimental/AbstractAccumuloIndexer.java +++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/experimental/AbstractAccumuloIndexer.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.Collection; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.accumulo.core.client.MultiTableBatchWriter; @@ -46,7 +46,7 @@ public abstract class AbstractAccumuloIndexer implements AccumuloIndexer { } @Override - public void dropGraph(RyaURI... graphs) { + public void dropGraph(RyaIRI... graphs) { } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java ---------------------------------------------------------------------- diff --git a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java index 8887739..b39f44f 100644 --- a/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java +++ b/dao/accumulo.rya/src/main/java/org/apache/rya/accumulo/query/AccumuloRyaQueryEngine.java @@ -48,7 +48,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaRange; 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.layout.TableLayoutStrategy; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.BatchRyaQuery; @@ -129,9 +129,9 @@ public class AccumuloRyaQueryEngine implements RyaQueryEngine<AccumuloRdfConfigu Collection<Range> ranges = new HashSet<Range>(); RangeBindingSetEntries rangeMap = new RangeBindingSetEntries(); TABLE_LAYOUT layout = null; - RyaURI context = null; + RyaIRI context = null; TriplePatternStrategy strategy = null; - RyaURI columnFamily = null; + RyaIRI columnFamily = null; boolean columnFamilySet = false; for (Map.Entry<RyaStatement, BindingSet> stmtbs : stmts) { RyaStatement stmt = stmtbs.getKey(); @@ -269,10 +269,10 @@ public class AccumuloRyaQueryEngine implements RyaQueryEngine<AccumuloRdfConfigu TriplePatternStrategy strategy = ryaContext.retrieveStrategy(stmt); TABLE_LAYOUT layout; Range range; - RyaURI subject = stmt.getSubject(); - RyaURI predicate = stmt.getPredicate(); + RyaIRI subject = stmt.getSubject(); + RyaIRI predicate = stmt.getPredicate(); RyaType object = stmt.getObject(); - RyaURI context = stmt.getContext(); + RyaIRI context = stmt.getContext(); String qualifier = stmt.getQualifer(); TripleRowRegex tripleRowRegex = null; if (strategy != null) { @@ -347,7 +347,7 @@ public class AccumuloRyaQueryEngine implements RyaQueryEngine<AccumuloRdfConfigu try { Collection<Range> ranges = new HashSet<Range>(); TABLE_LAYOUT layout = null; - RyaURI context = null; + RyaIRI context = null; TriplePatternStrategy strategy = null; for (RyaStatement stmt : stmts) { context = stmt.getContext(); // TODO: This will be overwritten @@ -382,7 +382,7 @@ public class AccumuloRyaQueryEngine implements RyaQueryEngine<AccumuloRdfConfigu results = FluentCloseableIterable.from(new ScannerBaseCloseableIterable(scanner)) .transform(keyValueToRyaStatementFunctionMap.get(layout)); } else { - final RyaURI fcontext = context; + final RyaIRI fcontext = context; final RdfCloudTripleStoreConfiguration fconf = ryaQuery.getConf(); FluentIterable<RyaStatement> fluent = FluentIterable.from(ranges) .transformAndConcat(new Function<Range, Iterable<Map.Entry<Key, Value>>>() { @@ -410,7 +410,7 @@ public class AccumuloRyaQueryEngine implements RyaQueryEngine<AccumuloRdfConfigu } } - protected void fillScanner(ScannerBase scanner, RyaURI context, String qualifier, Long ttl, Long currentTime, + protected void fillScanner(ScannerBase scanner, RyaIRI context, String qualifier, Long ttl, Long currentTime, TripleRowRegex tripleRowRegex, RdfCloudTripleStoreConfiguration conf) throws IOException { if (context != null && qualifier != null) { scanner.fetchColumn(new Text(context.getData()), new Text(qualifier)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java ---------------------------------------------------------------------- diff --git a/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java index 75e5861..35d18ea 100644 --- a/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java +++ b/dao/accumulo.rya/src/test/java/org/apache/rya/accumulo/AccumuloRyaDAOTest.java @@ -38,7 +38,7 @@ import org.apache.accumulo.core.iterators.FirstEntryInRowIterator; import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine; 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.domain.StatementMetadata; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQuery; @@ -84,9 +84,9 @@ public class AccumuloRyaDAOTest { @Test public void testAdd() throws Exception { - RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu")); - RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc")); - RyaURI uri1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "uri1")); + RyaIRI cpu = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "cpu")); + RyaIRI loadPerc = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "loadPerc")); + RyaIRI uri1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "uri1")); dao.add(new RyaStatement(cpu, loadPerc, uri1)); CloseableIteration<RyaStatement, RyaDAOException> iter = dao.getQueryEngine().query(new RyaStatement(cpu, loadPerc, null), conf); @@ -112,9 +112,9 @@ public class AccumuloRyaDAOTest { @Test public void testDeleteDiffVisibility() throws Exception { - RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu")); - RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc")); - RyaURI uri1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "uri1")); + RyaIRI cpu = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "cpu")); + RyaIRI loadPerc = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "loadPerc")); + RyaIRI uri1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "uri1")); RyaStatement stmt1 = new RyaStatement(cpu, loadPerc, uri1, null, "1", new StatementMetadata(), "vis1".getBytes()); dao.add(stmt1); RyaStatement stmt2 = new RyaStatement(cpu, loadPerc, uri1, null, "2", new StatementMetadata(), "vis2".getBytes()); @@ -146,9 +146,9 @@ public class AccumuloRyaDAOTest { @Test public void testDeleteDiffTimestamp() throws Exception { - RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu")); - RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc")); - RyaURI uri1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "uri1")); + RyaIRI cpu = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "cpu")); + RyaIRI loadPerc = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "loadPerc")); + RyaIRI uri1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "uri1")); RyaStatement stmt1 = new RyaStatement(cpu, loadPerc, uri1, null, "1", null, null, 100l); dao.add(stmt1); RyaStatement stmt2 = new RyaStatement(cpu, loadPerc, uri1, null, "2", null, null, 100l); @@ -170,14 +170,14 @@ public class AccumuloRyaDAOTest { @Test public void testDelete() throws Exception { - RyaURI predicate = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred")); - RyaURI subj = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "subj")); + RyaIRI predicate = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "pred")); + RyaIRI subj = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "subj")); // create a "bulk load" of 10,000 statements int statement_count = 10000; for (int i = 0 ; i < statement_count ; i++){ //make the statement very large so we will get a lot of random flushes - RyaURI obj = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, String.format("object%050d",i))); + RyaIRI obj = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, String.format("object%050d",i))); RyaStatement stmt = new RyaStatement(subj, predicate, obj); dao.add(stmt); } @@ -208,8 +208,8 @@ public class AccumuloRyaDAOTest { @Test public void testAddEmptyString() throws Exception { - RyaURI cpu = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cpu")); - RyaURI loadPerc = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "loadPerc")); + RyaIRI cpu = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "cpu")); + RyaIRI loadPerc = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "loadPerc")); RyaType empty = new RyaType(""); dao.add(new RyaStatement(cpu, loadPerc, empty)); @@ -222,13 +222,13 @@ public class AccumuloRyaDAOTest { @Test public void testMaxResults() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri1"))); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri2"))); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri3"))); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri4"))); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri5"))); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri1"))); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri2"))); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri3"))); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri4"))); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri5"))); AccumuloRyaQueryEngine queryEngine = dao.getQueryEngine(); AccumuloRdfConfiguration queryConf = new AccumuloRdfConfiguration(conf); @@ -247,9 +247,9 @@ public class AccumuloRyaDAOTest { @Test public void testAddValue() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); - RyaURI uri1 = new RyaURI(litdupsNS + "uri1"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); + RyaIRI uri1 = new RyaIRI(litdupsNS + "uri1"); String myval = "myval"; byte[] columnVis = null; dao.add(new RyaStatement(cpu, loadPerc, uri1, null, null, columnVis, myval.getBytes())); @@ -263,11 +263,11 @@ public class AccumuloRyaDAOTest { @Test public void testAddCv() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); - RyaURI uri1 = new RyaURI(litdupsNS + "uri1"); - RyaURI uri2 = new RyaURI(litdupsNS + "uri2"); - RyaURI uri3 = new RyaURI(litdupsNS + "uri3"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); + RyaIRI uri1 = new RyaIRI(litdupsNS + "uri1"); + RyaIRI uri2 = new RyaIRI(litdupsNS + "uri2"); + RyaIRI uri3 = new RyaIRI(litdupsNS + "uri3"); byte[] colVisABC = "A|B|C".getBytes(); byte[] colVisAB = "A|B".getBytes(); byte[] colVisA = "A".getBytes(); @@ -311,14 +311,14 @@ public class AccumuloRyaDAOTest { @Test public void testTTL() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); long current = System.currentTimeMillis(); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri1"), null, null, null, null, current)); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri2"), null, null, null, null, current - 1010l)); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri3"), null, null, null, null, current - 2010l)); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri4"), null, null, null, null, current - 3010l)); - dao.add(new RyaStatement(cpu, loadPerc, new RyaURI(litdupsNS + "uri5"), null, null, null, null, current - 4010l)); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri1"), null, null, null, null, current)); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri2"), null, null, null, null, current - 1010l)); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri3"), null, null, null, null, current - 2010l)); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri4"), null, null, null, null, current - 3010l)); + dao.add(new RyaStatement(cpu, loadPerc, new RyaIRI(litdupsNS + "uri5"), null, null, null, null, current - 4010l)); AccumuloRyaQueryEngine queryEngine = dao.getQueryEngine(); AccumuloRdfConfiguration queryConf = conf.clone(); @@ -355,14 +355,14 @@ public class AccumuloRyaDAOTest { //TOOD: Add test for set of queries @Test public void testQuery() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); - RyaURI uri1 = new RyaURI(litdupsNS + "uri1"); - RyaURI uri2 = new RyaURI(litdupsNS + "uri2"); - RyaURI uri3 = new RyaURI(litdupsNS + "uri3"); - RyaURI uri4 = new RyaURI(litdupsNS + "uri4"); - RyaURI uri5 = new RyaURI(litdupsNS + "uri5"); - RyaURI uri6 = new RyaURI(litdupsNS + "uri6"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); + RyaIRI uri1 = new RyaIRI(litdupsNS + "uri1"); + RyaIRI uri2 = new RyaIRI(litdupsNS + "uri2"); + RyaIRI uri3 = new RyaIRI(litdupsNS + "uri3"); + RyaIRI uri4 = new RyaIRI(litdupsNS + "uri4"); + RyaIRI uri5 = new RyaIRI(litdupsNS + "uri5"); + RyaIRI uri6 = new RyaIRI(litdupsNS + "uri6"); dao.add(new RyaStatement(cpu, loadPerc, uri1)); dao.add(new RyaStatement(cpu, loadPerc, uri2)); dao.add(new RyaStatement(cpu, loadPerc, uri3)); @@ -409,8 +409,8 @@ public class AccumuloRyaDAOTest { @Test public void testQueryDates() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); RyaType uri0 = new RyaType(XMLSchema.DATETIME, "1960-01-01"); // How handles local time RyaType uri1 = new RyaType(XMLSchema.DATETIME, "1992-01-01T+10:00"); // See Magadan Time RyaType uri2 = new RyaType(XMLSchema.DATETIME, "2000-01-01TZ"); // How it handles UTC. @@ -475,14 +475,14 @@ public class AccumuloRyaDAOTest { @Test public void testQueryCollectionRegex() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); - RyaURI uri1 = new RyaURI(litdupsNS + "uri1"); - RyaURI uri2 = new RyaURI(litdupsNS + "uri2"); - RyaURI uri3 = new RyaURI(litdupsNS + "uri3"); - RyaURI uri4 = new RyaURI(litdupsNS + "uri4"); - RyaURI uri5 = new RyaURI(litdupsNS + "uri5"); - RyaURI uri6 = new RyaURI(litdupsNS + "uri6"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); + RyaIRI uri1 = new RyaIRI(litdupsNS + "uri1"); + RyaIRI uri2 = new RyaIRI(litdupsNS + "uri2"); + RyaIRI uri3 = new RyaIRI(litdupsNS + "uri3"); + RyaIRI uri4 = new RyaIRI(litdupsNS + "uri4"); + RyaIRI uri5 = new RyaIRI(litdupsNS + "uri5"); + RyaIRI uri6 = new RyaIRI(litdupsNS + "uri6"); dao.add(new RyaStatement(cpu, loadPerc, uri1)); dao.add(new RyaStatement(cpu, loadPerc, uri2)); dao.add(new RyaStatement(cpu, loadPerc, uri3)); @@ -518,14 +518,14 @@ public class AccumuloRyaDAOTest { @Test public void testQueryCollectionRegexWBatchScanner() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); - RyaURI uri1 = new RyaURI(litdupsNS + "uri1"); - RyaURI uri2 = new RyaURI(litdupsNS + "uri2"); - RyaURI uri3 = new RyaURI(litdupsNS + "uri3"); - RyaURI uri4 = new RyaURI(litdupsNS + "uri4"); - RyaURI uri5 = new RyaURI(litdupsNS + "uri5"); - RyaURI uri6 = new RyaURI(litdupsNS + "uri6"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); + RyaIRI uri1 = new RyaIRI(litdupsNS + "uri1"); + RyaIRI uri2 = new RyaIRI(litdupsNS + "uri2"); + RyaIRI uri3 = new RyaIRI(litdupsNS + "uri3"); + RyaIRI uri4 = new RyaIRI(litdupsNS + "uri4"); + RyaIRI uri5 = new RyaIRI(litdupsNS + "uri5"); + RyaIRI uri6 = new RyaIRI(litdupsNS + "uri6"); dao.add(new RyaStatement(cpu, loadPerc, uri1)); dao.add(new RyaStatement(cpu, loadPerc, uri2)); dao.add(new RyaStatement(cpu, loadPerc, uri3)); @@ -563,8 +563,8 @@ public class AccumuloRyaDAOTest { @Test public void testLiteralTypes() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); RyaType longLit = new RyaType(XMLSchema.LONG, "3"); dao.add(new RyaStatement(cpu, loadPerc, longLit)); @@ -590,8 +590,8 @@ public class AccumuloRyaDAOTest { @Test public void testSameLiteralStringTypes() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); RyaType longLit = new RyaType(XMLSchema.LONG, "10"); RyaType strLit = new RyaType(XMLSchema.STRING, new String(RyaContext.getInstance().serializeType(longLit)[0])); @@ -641,9 +641,9 @@ public class AccumuloRyaDAOTest { @Test public void testQueryWithIterators() throws Exception { - RyaURI cpu = new RyaURI(litdupsNS + "cpu"); - RyaURI loadPerc = new RyaURI(litdupsNS + "loadPerc"); - RyaURI uri1 = new RyaURI(litdupsNS + "uri1"); + RyaIRI cpu = new RyaIRI(litdupsNS + "cpu"); + RyaIRI loadPerc = new RyaIRI(litdupsNS + "loadPerc"); + RyaIRI uri1 = new RyaIRI(litdupsNS + "uri1"); dao.add(new RyaStatement(cpu, loadPerc, uri1, null, "qual1")); dao.add(new RyaStatement(cpu, loadPerc, uri1, null, "qual2")); @@ -699,8 +699,8 @@ public class AccumuloRyaDAOTest { } private RyaStatement newRyaStatement() { - RyaURI subject = new RyaURI(litdupsNS + randomString()); - RyaURI predicate = new RyaURI(litdupsNS + randomString()); + RyaIRI subject = new RyaIRI(litdupsNS + randomString()); + RyaIRI predicate = new RyaIRI(litdupsNS + randomString()); RyaType object = new RyaType(randomString()); return new RyaStatement(subject, predicate, object); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java index d01c2d7..ab153b3 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java @@ -31,7 +31,7 @@ import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAO; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.RyaNamespaceManager; @@ -237,7 +237,7 @@ public final class MongoDBRyaDAO implements RyaDAO<StatefulMongoDBRdfConfigurati } @Override - public void dropGraph(final StatefulMongoDBRdfConfiguration conf, final RyaURI... graphs) + public void dropGraph(final StatefulMongoDBRdfConfiguration conf, final RyaIRI... graphs) throws RyaDAOException { } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java index 769d2de..35525ad 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/AggregationPipelineQueryNode.java @@ -44,7 +44,7 @@ import java.util.function.Function; 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.domain.StatementMetadata; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.mongodb.MongoDbRdfConstants; @@ -256,21 +256,21 @@ public class AggregationPipelineQueryNode extends ExternalSet { final Var predVar = sp.getPredicateVar(); final Var objVar = sp.getObjectVar(); final Var contextVar = sp.getContextVar(); - RyaURI s = null; - RyaURI p = null; + RyaIRI s = null; + RyaIRI p = null; RyaType o = null; - RyaURI c = null; + RyaIRI c = null; if (subjVar != null && subjVar.getValue() instanceof Resource) { s = RdfToRyaConversions.convertResource((Resource) subjVar.getValue()); } if (predVar != null && predVar.getValue() instanceof IRI) { - p = RdfToRyaConversions.convertURI((IRI) predVar.getValue()); + p = RdfToRyaConversions.convertIRI((IRI) predVar.getValue()); } if (objVar != null && objVar.getValue() != null) { o = RdfToRyaConversions.convertValue(objVar.getValue()); } if (contextVar != null && contextVar.getValue() instanceof IRI) { - c = RdfToRyaConversions.convertURI((IRI) contextVar.getValue()); + c = RdfToRyaConversions.convertIRI((IRI) contextVar.getValue()); } RyaStatement rs = new RyaStatement(s, p, o, c); DBObject obj = strategy.getQuery(rs); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java index b2490bc..ec5c7a5 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/dao/SimpleMongoDBStorageStrategy.java @@ -30,7 +30,7 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.log4j.Logger; 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.domain.StatementMetadata; import org.apache.rya.api.persist.query.RyaQuery; import org.apache.rya.mongodb.document.visibility.DocumentVisibility; @@ -94,10 +94,10 @@ public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy<RyaS @Override public DBObject getQuery(final RyaStatement stmt) { - final RyaURI subject = stmt.getSubject(); - final RyaURI predicate = stmt.getPredicate(); + final RyaIRI subject = stmt.getSubject(); + final RyaIRI predicate = stmt.getPredicate(); final RyaType object = stmt.getObject(); - final RyaURI context = stmt.getContext(); + final RyaIRI context = stmt.getContext(); final BasicDBObject query = new BasicDBObject(); if (subject != null){ query.append(SUBJECT_HASH, hash(subject.getData())); @@ -133,7 +133,7 @@ public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy<RyaS final String statementMetadata = (String) result.get(STATEMENT_METADATA); RyaType objectRya = null; if (objectType.equalsIgnoreCase(ANYURI.stringValue())){ - objectRya = new RyaURI(object); + objectRya = new RyaIRI(object); } else { objectRya = new RyaType(factory.createIRI(objectType), object); @@ -141,10 +141,10 @@ public class SimpleMongoDBStorageStrategy implements MongoDBStorageStrategy<RyaS final RyaStatement statement; if (!context.isEmpty()){ - statement = new RyaStatement(new RyaURI(subject), new RyaURI(predicate), objectRya, - new RyaURI(context)); + statement = new RyaStatement(new RyaIRI(subject), new RyaIRI(predicate), objectRya, + new RyaIRI(context)); } else { - statement = new RyaStatement(new RyaURI(subject), new RyaURI(predicate), objectRya); + statement = new RyaStatement(new RyaIRI(subject), new RyaIRI(predicate), objectRya); } statement.setColumnVisibility(documentVisibility.flatten()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java index 4aef8cd..ead87d2 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineIT.java @@ -27,7 +27,7 @@ import java.util.Map.Entry; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.eclipse.rdf4j.model.ValueFactory; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; @@ -46,13 +46,13 @@ public class MongoDBQueryEngineIT extends MongoITBase { private RyaStatement getStatement(final String s, final String p, final String o) { final RyaStatementBuilder builder = new RyaStatementBuilder(); if (s != null) { - builder.setSubject(new RyaURI(s)); + builder.setSubject(new RyaIRI(s)); } if (p != null) { - builder.setPredicate(new RyaURI(p)); + builder.setPredicate(new RyaIRI(p)); } if (o != null) { - builder.setObject(new RyaURI(o)); + builder.setObject(new RyaIRI(o)); } return builder.build(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaBatchWriterIT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaBatchWriterIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaBatchWriterIT.java index d024cc4..4ce1348 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaBatchWriterIT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaBatchWriterIT.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.log4j.BasicConfigurator; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.mongodb.batch.MongoDbBatchWriter; import org.apache.rya.mongodb.batch.MongoDbBatchWriterConfig; import org.apache.rya.mongodb.batch.MongoDbBatchWriterUtils; @@ -156,15 +156,15 @@ public class MongoDBRyaBatchWriterIT extends MongoITBase { return document; } - private static RyaURI ryaURI(final int v) { - return new RyaURI("u:" + v); + private static RyaIRI ryaIRI(final int v) { + return new RyaIRI("u:" + v); } private static RyaStatement statement(final int v) { final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(ryaURI(v)); - builder.setSubject(ryaURI(v)); - builder.setObject(ryaURI(v)); + builder.setPredicate(ryaIRI(v)); + builder.setSubject(ryaIRI(v)); + builder.setObject(ryaIRI(v)); return builder.build(); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java index 67002d7..25bf844 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java @@ -27,7 +27,7 @@ import java.io.IOException; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.mongodb.document.visibility.DocumentVisibility; import org.bson.Document; @@ -50,7 +50,7 @@ public class MongoDBRyaDAO2IT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); dao.delete(builder.build(), conf); } finally { dao.destroy(); @@ -66,9 +66,9 @@ public class MongoDBRyaDAO2IT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); final MongoCollection<Document> coll = db.getCollection(conf.getTriplesCollectionName()); @@ -89,9 +89,9 @@ public class MongoDBRyaDAO2IT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); final RyaStatement statement = builder.build(); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); @@ -115,10 +115,10 @@ public class MongoDBRyaDAO2IT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); - builder.setContext(new RyaURI("http://context.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); + builder.setContext(new RyaIRI("http://context.com";)); final RyaStatement statement = builder.build(); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); @@ -128,9 +128,9 @@ public class MongoDBRyaDAO2IT extends MongoITBase { assertEquals(coll.count(),1); final RyaStatementBuilder builder2 = new RyaStatementBuilder(); - builder2.setPredicate(new RyaURI("http://temp.com";)); - builder2.setObject(new RyaURI("http://object.com";)); - builder2.setContext(new RyaURI("http://context3.com";)); + builder2.setPredicate(new RyaIRI("http://temp.com";)); + builder2.setObject(new RyaIRI("http://object.com";)); + builder2.setContext(new RyaIRI("http://context3.com";)); final RyaStatement query = builder2.build(); dao.delete(query, conf); @@ -148,9 +148,9 @@ public class MongoDBRyaDAO2IT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); @@ -181,9 +181,9 @@ public class MongoDBRyaDAO2IT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java index c5ff223..939eff3 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java @@ -29,7 +29,7 @@ import java.io.IOException; import org.apache.accumulo.core.security.Authorizations; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQuery; import org.apache.rya.mongodb.document.util.AuthorizationsUtil; @@ -57,7 +57,7 @@ public class MongoDBRyaDAOIT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); builder.setColumnVisibility(new DocumentVisibility("A").flatten()); dao.delete(builder.build(), conf); } finally { @@ -73,9 +73,9 @@ public class MongoDBRyaDAOIT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); @@ -101,9 +101,9 @@ public class MongoDBRyaDAOIT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("C").flatten()); final RyaStatement statement = builder.build(); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); @@ -127,10 +127,10 @@ public class MongoDBRyaDAOIT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); - builder.setContext(new RyaURI("http://context.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); + builder.setContext(new RyaIRI("http://context.com";)); builder.setColumnVisibility(new DocumentVisibility("A&B&C").flatten()); final RyaStatement statement = builder.build(); @@ -141,9 +141,9 @@ public class MongoDBRyaDAOIT extends MongoITBase { assertEquals(1, coll.count()); final RyaStatementBuilder builder2 = new RyaStatementBuilder(); - builder2.setPredicate(new RyaURI("http://temp.com";)); - builder2.setObject(new RyaURI("http://object.com";)); - builder2.setContext(new RyaURI("http://context3.com";)); + builder2.setPredicate(new RyaIRI("http://temp.com";)); + builder2.setObject(new RyaIRI("http://object.com";)); + builder2.setContext(new RyaIRI("http://context3.com";)); final RyaStatement query = builder2.build(); dao.delete(query, conf); @@ -161,9 +161,9 @@ public class MongoDBRyaDAOIT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); @@ -194,9 +194,9 @@ public class MongoDBRyaDAOIT extends MongoITBase { dao.init(); final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); @@ -621,10 +621,10 @@ public class MongoDBRyaDAOIT extends MongoITBase { private static RyaStatement buildVisibilityTestRyaStatement(final String documentVisibility) { final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI("http://temp.com";)); - builder.setSubject(new RyaURI("http://subject.com";)); - builder.setObject(new RyaURI("http://object.com";)); - builder.setContext(new RyaURI("http://context.com";)); + builder.setPredicate(new RyaIRI("http://temp.com";)); + builder.setSubject(new RyaIRI("http://subject.com";)); + builder.setObject(new RyaIRI("http://object.com";)); + builder.setContext(new RyaIRI("http://context.com";)); builder.setColumnVisibility(documentVisibility != null ? documentVisibility.getBytes() : null); final RyaStatement statement = builder.build(); return statement; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java index 9f61dfd..576610c 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/SimpleMongoDBStorageStrategyTest.java @@ -26,7 +26,7 @@ import java.io.IOException; import org.apache.commons.codec.digest.DigestUtils; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.mongodb.dao.SimpleMongoDBStorageStrategy; import org.apache.rya.mongodb.document.util.DocumentVisibilityConversionException; @@ -52,10 +52,10 @@ public class SimpleMongoDBStorageStrategyTest { static { final RyaStatementBuilder builder = new RyaStatementBuilder(); - builder.setPredicate(new RyaURI(PREDICATE)); - builder.setSubject(new RyaURI(SUBJECT)); - builder.setObject(new RyaURI(OBJECT)); - builder.setContext(new RyaURI(CONTEXT)); + builder.setPredicate(new RyaIRI(PREDICATE)); + builder.setSubject(new RyaIRI(SUBJECT)); + builder.setObject(new RyaIRI(OBJECT)); + builder.setContext(new RyaIRI(CONTEXT)); builder.setColumnVisibility(DOCUMENT_VISIBILITY.flatten()); builder.setTimestamp(null); testStatement = builder.build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java index 8dbf4b5..cd3c513 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/aggregation/PipelineQueryIT.java @@ -85,7 +85,7 @@ public class PipelineQueryIT extends MongoITBase { private void insert(Resource subject, IRI predicate, Value object, int derivationLevel) throws RyaDAOException { final RyaStatementBuilder builder = new RyaStatementBuilder(); builder.setSubject(RdfToRyaConversions.convertResource(subject)); - builder.setPredicate(RdfToRyaConversions.convertURI(predicate)); + builder.setPredicate(RdfToRyaConversions.convertIRI(predicate)); builder.setObject(RdfToRyaConversions.convertValue(object)); final RyaStatement rstmt = builder.build(); if (derivationLevel > 0) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/README.md ---------------------------------------------------------------------- diff --git a/extras/indexing/README.md b/extras/indexing/README.md index a2f7497..6ee6dd2 100644 --- a/extras/indexing/README.md +++ b/extras/indexing/README.md @@ -46,10 +46,10 @@ flavor is "Chocolate", but has no ingredients or nutritional information, as an Entity by doing the following: ``` 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(); ``` The two types of Entities that may be created are implicit and explicit. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java index e6deab7..4b703eb 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/AccumuloIndexingConfiguration.java @@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.rya.accumulo.AbstractAccumuloRdfConfigurationBuilder; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRdfConfigurationBuilder; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.accumulo.entity.EntityCentricIndex; import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer; import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer; @@ -287,12 +287,12 @@ public class AccumuloIndexingConfiguration extends AccumuloRdfConfiguration { return getStrings(ConfigUtils.TEMPORAL_PREDICATES_LIST); } - private static Set<RyaURI> getPropURIFromStrings(final String... props) { - final Set<RyaURI> properties = new HashSet<>(); + private static Set<RyaIRI> getPropURIFromStrings(final String... props) { + final Set<RyaIRI> properties = new HashSet<>(); if (props != null) { for(final String prop : props) { if (StringUtils.isNotBlank(prop)) { - properties.add(new RyaURI(prop)); + properties.add(new RyaIRI(prop)); } } } @@ -320,7 +320,7 @@ public class AccumuloIndexingConfiguration extends AccumuloRdfConfiguration { private boolean usePcj = false; private boolean useOptimalPcj = false; private String[] pcjs = new String[0]; - private Set<RyaURI> metadataProps = new HashSet<>(); + private Set<RyaIRI> metadataProps = new HashSet<>(); private static final String USE_FREETEXT = "use.freetext"; private static final String USE_TEMPORAL = "use.temporal"; @@ -587,7 +587,7 @@ public class AccumuloIndexingConfiguration extends AccumuloRdfConfiguration { * @param useMetadata * @return AccumuloIndexingConfigBuilder for chaining method invocations */ - public AccumuloIndexingConfigBuilder setStatementMetadataProperties(final Set<RyaURI> metadataProps) { + public AccumuloIndexingConfigBuilder setStatementMetadataProperties(final Set<RyaIRI> metadataProps) { this.metadataProps = metadataProps; return this; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java index 1b20514..8deda36 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/AccumuloDocIdIndexer.java @@ -48,7 +48,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.documentIndex.DocIndexIteratorUtil; import org.apache.rya.accumulo.documentIndex.DocumentIndexIntersectingIterator; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -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.RyaToRdfConversions; import org.apache.rya.api.resolver.RyaTypeResolverException; @@ -341,9 +341,9 @@ public class AccumuloDocIdIndexer implements DocIdIndexer { } if (!commonVarSet && sq.isCommonVarURI()) { - final RyaURI rURI = new RyaURI(row.toString()); + final RyaIRI rIRI = new RyaIRI(row.toString()); currentSolutionBs.addBinding(sq.getCommonVarName(), - RyaToRdfConversions.convertValue(rURI)); + RyaToRdfConversions.convertValue(rIRI)); commonVarSet = true; } @@ -381,8 +381,8 @@ public class AccumuloDocIdIndexer implements DocIdIndexer { currentSolutionBs.addBinding(sq.getCommonVarName(), v); commonVarSet = true; } - final RyaURI rURI = new RyaURI(new String(cqContent, StandardCharsets.UTF_8)); - currentSolutionBs.addBinding(s, RyaToRdfConversions.convertValue(rURI)); + final RyaIRI rIRI = new RyaIRI(new String(cqContent, StandardCharsets.UTF_8)); + currentSolutionBs.addBinding(s, RyaToRdfConversions.convertValue(rIRI)); } else { throw new IllegalArgumentException("Invalid row."); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java index 300d8ba..cad6a6c 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/EntityCentricIndex.java @@ -53,7 +53,7 @@ import org.apache.rya.accumulo.experimental.AbstractAccumuloIndexer; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; 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.apache.rya.api.resolver.triple.TripleRow; @@ -231,10 +231,10 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer { } private static List<TripleRow> serializeStatement(final RyaStatement stmt) throws RyaTypeResolverException { - final RyaURI subject = stmt.getSubject(); - final RyaURI predicate = stmt.getPredicate(); + final RyaIRI subject = stmt.getSubject(); + final RyaIRI predicate = stmt.getPredicate(); final RyaType object = stmt.getObject(); - final RyaURI context = stmt.getContext(); + final RyaIRI context = stmt.getContext(); final Long timestamp = stmt.getTimestamp(); final byte[] columnVisibility = stmt.getColumnVisibility(); final byte[] value = stmt.getValue(); @@ -292,19 +292,19 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer { final byte[] otherNodeData = Arrays.copyOf(otherNodeBytes, split); final byte[] typeBytes = Arrays.copyOfRange(otherNodeBytes, split, otherNodeBytes.length); byte[] objectBytes; - RyaURI subject; - final RyaURI predicate = new RyaURI(new String(predicateBytes, StandardCharsets.UTF_8)); + RyaIRI subject; + final RyaIRI predicate = new RyaIRI(new String(predicateBytes, StandardCharsets.UTF_8)); RyaType object; - RyaURI context = null; + RyaIRI context = null; // Expect either: entity=subject.data, otherNodeVar="object", otherNodeBytes={object.data, object.datatype} // or: entity=object.data, otherNodeVar="subject", otherNodeBytes={subject.data, object.datatype} switch (otherNodeVar) { case SUBJECT: - subject = new RyaURI(new String(otherNodeData, StandardCharsets.UTF_8)); + subject = new RyaIRI(new String(otherNodeData, StandardCharsets.UTF_8)); objectBytes = Bytes.concat(entityBytes, typeBytes); break; case OBJECT: - subject = new RyaURI(new String(entityBytes, StandardCharsets.UTF_8)); + subject = new RyaIRI(new String(entityBytes, StandardCharsets.UTF_8)); objectBytes = Bytes.concat(otherNodeData, typeBytes); break; default: @@ -313,7 +313,7 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer { } object = RyaContext.getInstance().deserialize(objectBytes); if (columnFamily != null && columnFamily.length > 0) { - context = new RyaURI(new String(columnFamily, StandardCharsets.UTF_8)); + context = new RyaIRI(new String(columnFamily, StandardCharsets.UTF_8)); } return new RyaStatement(subject, predicate, object, context, null, columnVisibility, valueBytes, timestamp); @@ -343,7 +343,7 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer { split = Bytes.indexOf(otherNodeBytes, TYPE_DELIM_BYTES); final byte[] typeBytes = Arrays.copyOfRange(otherNodeBytes, split, otherNodeBytes.length); byte[] objectBytes; - RyaURI subject; + RyaIRI subject; RyaType object; RyaType type = null; switch (otherNodeVar) { @@ -353,7 +353,7 @@ public class EntityCentricIndex extends AbstractAccumuloIndexer { type = object; break; case OBJECT: - subject = new RyaURI(new String(entityBytes, StandardCharsets.UTF_8)); + subject = new RyaIRI(new String(entityBytes, StandardCharsets.UTF_8)); type = subject; break; default: http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java index fc1b15e..c4b9aeb 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java @@ -28,7 +28,7 @@ import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.hadoop.io.Text; import org.apache.rya.accumulo.documentIndex.TextColumn; 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.domain.VarNameUtils; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaContext; @@ -336,7 +336,7 @@ public class StarQuery { final String[] cqArray = cq.split("\u0000"); if (cqArray[0].equals("subject")) { - // RyaURI subjURI = (RyaURI) RdfToRyaConversions.convertValue(v); + // RyaIRI subjIRI = (RyaIRI) RdfToRyaConversions.convertValue(v); tc.setColumnQualifier(new Text("subject" + "\u0000" + v.stringValue())); tc.setIsPrefix(false); } else if (cqArray[0].equals("object")) { @@ -366,7 +366,7 @@ public class StarQuery { final Var predVar = node.getPredicateVar(); final Var objVar = node.getObjectVar(); - final RyaURI predURI = (RyaURI) RdfToRyaConversions.convertValue(node.getPredicateVar().getValue()); + final RyaIRI predURI = (RyaIRI) RdfToRyaConversions.convertValue(node.getPredicateVar().getValue()); //assumes StatementPattern contains at least on variable @@ -436,7 +436,7 @@ public class StarQuery { } if(hasContext()) { - final RyaURI ctxtURI = (RyaURI) RdfToRyaConversions.convertValue(context.getValue()); + final RyaIRI ctxtURI = (RyaIRI) RdfToRyaConversions.convertValue(context.getValue()); contextURI = ctxtURI.getData(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java index e98cccb..b46c9b0 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java @@ -125,7 +125,7 @@ public class FreeTextTupleSet extends ExternalTupleSet { throws QueryEvaluationException { - IRI funcURI = filterInfo.getFunction(); + IRI funcIRI = filterInfo.getFunction(); SearchFunction searchFunction = new SearchFunction() { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java index e52b92b..d6f1771 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/EntityIndexSetProvider.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -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.Type; import org.apache.rya.indexing.entity.query.EntityQueryNode; @@ -72,9 +72,9 @@ public class EntityIndexSetProvider implements ExternalSetProvider<EntityQueryNo return pattern.getSubjectVar(); } - private RyaURI getPredURI(final StatementPattern pattern) { + private RyaIRI getPredIRI(final StatementPattern pattern) { final Var pred = pattern.getPredicateVar(); - return new RyaURI(pred.getValue().stringValue()); + return new RyaIRI(pred.getValue().stringValue()); } @Override @@ -102,11 +102,11 @@ public class EntityIndexSetProvider implements ExternalSetProvider<EntityQueryNo private void discoverEntities(final StatementPattern pattern, final List<StatementPattern> unmatched) { final Var subj = pattern.getSubjectVar(); final String subjStr = subj.getName(); - final RyaURI predURI = getPredURI(pattern); + final RyaIRI predIRI = getPredIRI(pattern); //check to see if current node is type - if(VF.createIRI(predURI.getData()).equals(RDF.TYPE)) { + if(VF.createIRI(predIRI.getData()).equals(RDF.TYPE)) { final Var obj = pattern.getObjectVar(); - final RyaURI objURI = new RyaURI(obj.getValue().stringValue()); + final RyaIRI objURI = new RyaIRI(obj.getValue().stringValue()); try { final Optional<Type> optType = typeStorage.get(objURI); //if is type, fetch type add to subject -> type map @@ -117,7 +117,7 @@ public class EntityIndexSetProvider implements ExternalSetProvider<EntityQueryNo //check unmatched properties, add matches for(final StatementPattern propertyPattern : unmatched) { //store sps into the type -> property map - final RyaURI property = getPredURI(propertyPattern); + final RyaIRI property = getPredIRI(propertyPattern); final Var typeSubVar = getTypeSubject(type); final Var patternSubVar = propertyPattern.getSubjectVar(); if (type.getPropertyNames().contains(property) && typeSubVar.equals(patternSubVar)) { @@ -133,7 +133,7 @@ public class EntityIndexSetProvider implements ExternalSetProvider<EntityQueryNo if(subjectTypeMap.containsKey(subjStr)) { //if is, check to see if pred is a property of type final Type type = subjectTypeMap.get(subjStr); - if(type.getPropertyNames().contains(predURI)) { + if(type.getPropertyNames().contains(predIRI)) { //if is, add sp to type -> sp map if(!typeMap.containsKey(type)) { //each variable can only contain 1 type for now @see:Rya-235? http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java index fb64ccf..6874a16 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Entity.java @@ -30,7 +30,7 @@ import java.util.Optional; import org.apache.http.annotation.Immutable; import org.apache.log4j.Logger; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.entity.storage.EntityStorage; import org.apache.rya.indexing.smarturi.SmartUriAdapter; import org.apache.rya.indexing.smarturi.SmartUriException; @@ -63,10 +63,10 @@ import edu.umd.cs.findbugs.annotations.Nullable; * an Entity by doing the following: * <pre> * 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(); * </pre> * The two types of Entities that may be created are implicit and explicit. @@ -79,13 +79,13 @@ import edu.umd.cs.findbugs.annotations.Nullable; public class Entity { private static final Logger log = Logger.getLogger(Entity.class); - private final RyaURI subject; - private final ImmutableList<RyaURI> explicitTypeIds; + private final RyaIRI subject; + private final ImmutableList<RyaIRI> explicitTypeIds; // First key is Type ID. // Second key is Property Name. // Value is the Property value for a specific type. - private final ImmutableMap<RyaURI, ImmutableMap<RyaURI, Property>> properties; + private final ImmutableMap<RyaIRI, ImmutableMap<RyaIRI, Property>> properties; private final int version; @@ -105,9 +105,9 @@ public class Entity { * {@link Entity}. */ private Entity( - final RyaURI subject, - final ImmutableList<RyaURI> explicitTypeIds, - final ImmutableMap<RyaURI, ImmutableMap<RyaURI, Property>> typeProperties, + final RyaIRI subject, + final ImmutableList<RyaIRI> explicitTypeIds, + final ImmutableMap<RyaIRI, ImmutableMap<RyaIRI, Property>> typeProperties, final int version, final IRI smartUri) { this.subject = requireNonNull(subject); @@ -138,9 +138,9 @@ public class Entity { * {@link EntityStorage} to prevent stale updates. */ private Entity( - final RyaURI subject, - final ImmutableList<RyaURI> explicitTypeIds, - final ImmutableMap<RyaURI, ImmutableMap<RyaURI, Property>> typeProperties, + final RyaIRI subject, + final ImmutableList<RyaIRI> explicitTypeIds, + final ImmutableMap<RyaIRI, ImmutableMap<RyaIRI, Property>> typeProperties, final int version) { this(subject, explicitTypeIds, typeProperties, version, null); } @@ -148,21 +148,21 @@ public class Entity { /** * @return Identifies the thing that is being represented as an Entity. */ - public RyaURI getSubject() { + public RyaIRI getSubject() { return subject; } /** * @return {@link Type}s that have been explicitly applied to the {@link Entity}. */ - public ImmutableList<RyaURI> getExplicitTypeIds() { + public ImmutableList<RyaIRI> getExplicitTypeIds() { return explicitTypeIds; } /** * @return All {@link Property}s that have been set for the Entity, grouped by Type ID. */ - public ImmutableMap<RyaURI, ImmutableMap<RyaURI, Property>> getProperties() { + public ImmutableMap<RyaIRI, ImmutableMap<RyaIRI, Property>> getProperties() { return properties; } @@ -184,31 +184,31 @@ public class Entity { /** * Does a lookup to see if the {@link Entity} contains the specified * property for the specified type. - * @param typeRyaUri the type {@link RyaURI}. (not {@code null}) - * @param propertyRyaUri the property {@link RyaURI}. (not {@code null}) + * @param type the {@link Type}. (not {@code null}) + * @param propertyRyaIri the property {@link RyaIRI}. (not {@code null}) * @return the {@link Property} or an empty {@link Optional} if it could not * be found in the {@link Entity}. */ - public Optional<Property> lookupTypeProperty(final Type type, final RyaURI propertyRyaUri) { + public Optional<Property> lookupTypeProperty(final Type type, final RyaIRI propertyRyaIri) { requireNonNull(type); - return lookupTypeProperty(type.getId(), propertyRyaUri); + return lookupTypeProperty(type.getId(), propertyRyaIri); } /** * Does a lookup to see if the {@link Entity} contains the specified * property for the specified type. - * @param typeRyaUri the type {@link RyaURI}. (not {@code null}) - * @param propertyRyaUri the property {@link RyaURI}. (not {@code null}) + * @param typeRyaIri the type {@link RyaIRI}. (not {@code null}) + * @param propertyRyaIri the property {@link RyaIRI}. (not {@code null}) * @return the {@link Property} or an empty {@link Optional} if it could not * be found in the {@link Entity}. */ - public Optional<Property> lookupTypeProperty(final RyaURI typeRyaUri, final RyaURI propertyRyaUri) { - requireNonNull(typeRyaUri); - requireNonNull(propertyRyaUri); - final ImmutableMap<RyaURI, Property> typePropertyMap = properties.get(typeRyaUri); + public Optional<Property> lookupTypeProperty(final RyaIRI typeRyaIri, final RyaIRI propertyRyaIri) { + requireNonNull(typeRyaIri); + requireNonNull(propertyRyaIri); + final ImmutableMap<RyaIRI, Property> typePropertyMap = properties.get(typeRyaIri); Optional<Property> property = Optional.empty(); if (typePropertyMap != null) { - property = Optional.ofNullable(typePropertyMap.get(propertyRyaUri)); + property = Optional.ofNullable(typePropertyMap.get(propertyRyaIri)); } return property; } @@ -240,7 +240,7 @@ public class Entity { * @return A TypedEntity using this object's values if any properties for the Type * are present or if the Type was explicitly set. Otherwise an empty {@link Optional}. */ - public Optional<TypedEntity> makeTypedEntity(final RyaURI typeId) { + public Optional<TypedEntity> makeTypedEntity(final RyaIRI typeId) { requireNonNull(typeId); final boolean explicitlyHasType = explicitTypeIds.contains(typeId); @@ -289,9 +289,9 @@ public class Entity { @DefaultAnnotation(NonNull.class) public static class Builder { - private RyaURI subject = null; - private final List<RyaURI> explicitTypes = new ArrayList<>(); - private final Map<RyaURI, Map<RyaURI, Property>> properties = new HashMap<>(); + private RyaIRI subject = null; + private final List<RyaIRI> explicitTypes = new ArrayList<>(); + private final Map<RyaIRI, Map<RyaIRI, Property>> properties = new HashMap<>(); private IRI smartUri = null; private int version = 0; @@ -312,7 +312,7 @@ public class Entity { subject = entity.getSubject(); explicitTypes.addAll( entity.getExplicitTypeIds() ); - for(final Entry<RyaURI, ImmutableMap<RyaURI, Property>> entry : entity.getProperties().entrySet()) { + for(final Entry<RyaIRI, ImmutableMap<RyaIRI, Property>> entry : entity.getProperties().entrySet()) { properties.put(entry.getKey(), Maps.newHashMap(entry.getValue())); } @@ -325,7 +325,7 @@ public class Entity { * @param subject - Identifies the {@link TypedEntity}. * @return This {@link Builder} so that method invocations may be chained. */ - public Builder setSubject(@Nullable final RyaURI subject) { + public Builder setSubject(@Nullable final RyaIRI subject) { this.subject = subject; return this; } @@ -334,7 +334,7 @@ public class Entity { * @param typeId - A {@link Type} that has been explicity set for the {@link TypedEntity}. * @return This {@link Builder} so that method invocations may be chained. */ - public Builder setExplicitType(@Nullable final RyaURI typeId) { + public Builder setExplicitType(@Nullable final RyaIRI typeId) { if(typeId != null) { explicitTypes.add(typeId); } @@ -347,7 +347,7 @@ public class Entity { * @param typeId - The Type ID to remove from the set of explicit types. * @return This {@link Builder} so that method invocations may be chained. */ - public Builder unsetExplicitType(@Nullable final RyaURI typeId) { + public Builder unsetExplicitType(@Nullable final RyaIRI typeId) { if(typeId != null) { explicitTypes.remove(typeId); } @@ -361,7 +361,7 @@ public class Entity { * @param property - The Property values to add. * @return This {@link Builder} so that method invocations may be chained. */ - public Builder setProperty(@Nullable final RyaURI typeId, @Nullable final Property property) { + public Builder setProperty(@Nullable final RyaIRI typeId, @Nullable final Property property) { if(typeId != null && property != null) { if(!properties.containsKey(typeId)) { properties.put(typeId, new HashMap<>()); @@ -379,10 +379,10 @@ public class Entity { * @param propertyName - The name of the Property to remove. * @return This {@link Builder} so that method invocations may be chained. */ - public Builder unsetProperty(@Nullable final RyaURI typeId, @Nullable final RyaURI propertyName) { + public Builder unsetProperty(@Nullable final RyaIRI typeId, @Nullable final RyaIRI propertyName) { if(typeId != null && propertyName != null) { if(properties.containsKey(typeId)) { - final Map<RyaURI, Property> typedProperties = properties.get(typeId); + final Map<RyaIRI, Property> typedProperties = properties.get(typeId); if(typedProperties.containsKey(propertyName)) { typedProperties.remove(propertyName); } @@ -426,8 +426,8 @@ public class Entity { * @return Builds an instance of {@link Entity} using this builder's values. */ public Entity build() { - final ImmutableMap.Builder<RyaURI, ImmutableMap<RyaURI, Property>> propertiesBuilder = ImmutableMap.builder(); - for(final Entry<RyaURI, Map<RyaURI, Property>> entry : properties.entrySet()) { + final ImmutableMap.Builder<RyaIRI, ImmutableMap<RyaIRI, Property>> propertiesBuilder = ImmutableMap.builder(); + for(final Entry<RyaIRI, Map<RyaIRI, Property>> entry : properties.entrySet()) { propertiesBuilder.put(entry.getKey(), ImmutableMap.copyOf( entry.getValue() )); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Property.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Property.java b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Property.java index 53b141e..b44c52c 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Property.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/entity/model/Property.java @@ -24,7 +24,7 @@ import java.util.Objects; import org.apache.http.annotation.Immutable; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; @@ -36,7 +36,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; @DefaultAnnotation(NonNull.class) public class Property { - private final RyaURI name; + private final RyaIRI name; private final RyaType value; /** @@ -45,7 +45,7 @@ public class Property { * @param name - Uniquely identifies the {@link Property}. (not null) * @param value - The value of the {@link Property}. (not null) */ - public Property(final RyaURI name, final RyaType value) { + public Property(final RyaIRI name, final RyaType value) { this.name = requireNonNull(name); this.value = requireNonNull(value); } @@ -53,7 +53,7 @@ public class Property { /** * @return Uniquely identifies the {@link Property}. */ - public RyaURI getName() { + public RyaIRI getName() { return name; }
