http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java index 4cf54dc..4647b8b 100644 --- a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java +++ b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java @@ -123,10 +123,10 @@ public class BindingSetStringConverter implements BindingSetConverter<String> { final String typeString = valueAndType[1]; // Convert the String Type into a IRI that describes the type. - final IRI typeURI = VF.createIRI(typeString); + final IRI typeIRI = VF.createIRI(typeString); // Convert the String Value into a Value. - final Value value = typeURI.equals(XMLSchema.ANYURI) ? + final Value value = typeIRI.equals(XMLSchema.ANYURI) ? VF.createIRI(dataString) : VF.createLiteral(dataString, VF.createIRI(typeString));
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java index 8a02672..12e4098 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java @@ -56,7 +56,7 @@ import org.apache.rya.accumulo.mr.MRUtils; 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.persist.RyaDAOException; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.indexing.accumulo.ConfigUtils; @@ -85,10 +85,10 @@ public final class AccumuloRyaUtils { private static final String NAMESPACE = RdfCloudTripleStoreConstants.NAMESPACE; private static final ValueFactory VALUE_FACTORY = RdfCloudTripleStoreConstants.VALUE_FACTORY; - public static RyaURI RTS_SUBJECT_RYA = RdfCloudTripleStoreConstants.RTS_SUBJECT_RYA; - public static RyaURI RTS_COPY_TOOL_RUN_TIME_PREDICATE_RYA = createRyaUri(COPY_TOOL_RUN_TIME_LOCAL_NAME); - public static RyaURI RTS_COPY_TOOL_SPLIT_TIME_PREDICATE_RYA = createRyaUri(COPY_TOOL_SPLIT_TIME_LOCAL_NAME); - public static RyaURI RTS_TIME_OFFSET_PREDICATE_RYA = createRyaUri(COPY_TOOL_TIME_OFFSET_LOCAL_NAME); + public static RyaIRI RTS_SUBJECT_RYA = RdfCloudTripleStoreConstants.RTS_SUBJECT_RYA; + public static RyaIRI RTS_COPY_TOOL_RUN_TIME_PREDICATE_RYA = createRyaIri(COPY_TOOL_RUN_TIME_LOCAL_NAME); + public static RyaIRI RTS_COPY_TOOL_SPLIT_TIME_PREDICATE_RYA = createRyaIri(COPY_TOOL_SPLIT_TIME_LOCAL_NAME); + public static RyaIRI RTS_TIME_OFFSET_PREDICATE_RYA = createRyaIri(COPY_TOOL_TIME_OFFSET_LOCAL_NAME); /** * Ignore the meta statements indicating the Rya version and copy time values. @@ -107,22 +107,22 @@ public final class AccumuloRyaUtils { } /** - * Creates a {@link RyaURI} for the specified local name. - * @param localName the URI's local name. - * @return the {@link RyraURI}. + * Creates a {@link RyaIRI} for the specified local name. + * @param localName the IRI's local name. + * @return the {@link RyaIRI}. */ - public static RyaURI createRyaUri(final String localName) { - return createRyaUri(NAMESPACE, localName); + public static RyaIRI createRyaIri(final String localName) { + return createRyaIri(NAMESPACE, localName); } /** - * Creates a {@link RyaURI} for the specified local name. + * Creates a {@link RyaIRI} for the specified local name. * @param namespace the namespace. - * @param localName the URI's local name. - * @return the {@link RyraURI}. + * @param localName the IRI's local name. + * @return the {@link RyaIRI}. */ - public static RyaURI createRyaUri(final String namespace, final String localName) { - return RdfToRyaConversions.convertURI(VALUE_FACTORY.createIRI(namespace, localName)); + public static RyaIRI createRyaIri(final String namespace, final String localName) { + return RdfToRyaConversions.convertIRI(VALUE_FACTORY.createIRI(namespace, localName)); } /** @@ -207,13 +207,13 @@ public final class AccumuloRyaUtils { /** * Gets the metadata key from the table. - * @param ryaStatement the {@link RyaStatement} for the metadata key to query. + * @param predicateRyaIri the predicate {@link RyaIRI}. * @param dao the {@link AccumuloRyaDAO}. * @return the string value of the object from the metadata key. * @throws RyaDAOException */ - private static String getMetadata(final RyaURI predicateRyaUri, final AccumuloRyaDAO dao) throws RyaDAOException { - final RyaStatement ryaStatement = new RyaStatement(RTS_SUBJECT_RYA, predicateRyaUri, null); + private static String getMetadata(final RyaIRI predicateRyaIri, final AccumuloRyaDAO dao) throws RyaDAOException { + final RyaStatement ryaStatement = new RyaStatement(RTS_SUBJECT_RYA, predicateRyaIri, null); return getMetadata(ryaStatement, dao); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java index a1c731a..24902e0 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java @@ -212,7 +212,7 @@ public class MergeToolTest { // (1 updated row, 1 row left alone because it was unchanged, 1 row outside time range, // 1 row deleted, 1 new row added, 1 modified visibility, 1 deleted by child, 1 added by child). // There should be 5 rows in the child instance (4 which will be scanned over from the start time). - ryaStatementUpdatedByChild.setObject(TestUtils.createRyaUri("football")); + ryaStatementUpdatedByChild.setObject(TestUtils.createRyaIri("football")); ryaStatementUpdatedByChild.setTimestamp(TODAY.getTime()); ryaStatementVisibilityDifferent.setColumnVisibility(CHILD_COLUMN_VISIBILITY.getExpression()); childDao.add(ryaStatementOutOfTimeRange); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java index 6a6a53c..dae21f9 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java @@ -44,7 +44,7 @@ import org.apache.rya.accumulo.mr.merge.util.TestUtils; 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.persist.RyaDAOException; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.indexing.accumulo.ConfigUtils; @@ -121,13 +121,13 @@ public class RulesetCopyIT { QUERY_PREFIXES = sb.toString(); } - private static RyaURI substitute(final String uri) { + private static RyaIRI substitute(final String uri) { for (final String prefix : prefixes.keySet()) { if (uri.startsWith(prefix)) { - return new RyaURI(uri.replace(prefix, prefixes.get(prefix))); + return new RyaIRI(uri.replace(prefix, prefixes.get(prefix))); } } - return new RyaURI(uri); + return new RyaIRI(uri); } private static RyaStatement statement(final String s, final String p, final RyaType o) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java index 6cc59f0..d456335 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java @@ -245,11 +245,11 @@ public class MergeToolDemo { // Change statements that were updated by the parent or child after the start time. final RyaStatement ryaStatementCase7Updated = TestUtils.copyRyaStatement(ryaStatementCase7); - ryaStatementCase7Updated.setSubject(TestUtils.createRyaUri("c7 BOB")); + ryaStatementCase7Updated.setSubject(TestUtils.createRyaIri("c7 BOB")); ryaStatementCase7Updated.setTimestamp(TODAY.getTime()); final RyaStatement ryaStatementCase8Updated = TestUtils.copyRyaStatement(ryaStatementCase8); - ryaStatementCase8Updated.setSubject(TestUtils.createRyaUri("c8 SUSAN")); + ryaStatementCase8Updated.setSubject(TestUtils.createRyaIri("c8 SUSAN")); ryaStatementCase8Updated.setTimestamp(TODAY.getTime()); final RyaStatement ryaStatementVisibilityDifferentUpdated = TestUtils.copyRyaStatement(ryaStatementVisibilityDifferent); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java index a42b561..bd61fc8 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java @@ -111,7 +111,7 @@ public class MiniAccumuloClusterDriver extends AccumuloDualInstanceDriver { // (1 updated row, 1 row left alone because it was unchanged, 1 row outside time range, // 1 row deleted, 1 new row added, 1 modified visibility, 1 deleted by child, 1 added by child). // There should be 5 rows in the child instance (4 which will be scanned over from the start time). - ryaStatementUpdatedByChild.setObject(TestUtils.createRyaUri("football")); + ryaStatementUpdatedByChild.setObject(TestUtils.createRyaIri("football")); ryaStatementUpdatedByChild.setTimestamp(TODAY.getTime()); ryaStatementVisibilityDifferent.setColumnVisibility(CHILD_COLUMN_VISIBILITY.getExpression()); childStatements.add(ryaStatementOutOfTimeRange); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java index 3b4358b..23e35a2 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java @@ -26,7 +26,7 @@ import java.util.Date; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; 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.RyaDAOException; import org.eclipse.rdf4j.common.iteration.CloseableIteration; @@ -210,12 +210,12 @@ public final class TestUtils { } /** - * Creates a {@link RyaURI} for the specified local name. - * @param localName the URI's local name. - * @return the {@link RyraURI}. + * Creates a {@link RyaIRI} for the specified local name. + * @param localName the IRI's local name. + * @return the {@link RyaIRI}. */ - public static RyaURI createRyaUri(final String localName) { - return AccumuloRyaUtils.createRyaUri(NAMESPACE, localName); + public static RyaIRI createRyaIri(final String localName) { + return AccumuloRyaUtils.createRyaIri(NAMESPACE, localName); } /** @@ -227,10 +227,10 @@ public final class TestUtils { * @return the {@link RyaStatement}. */ public static RyaStatement createRyaStatement(final String subject, final String predicate, final String object, final Date date) { - final RyaURI subjectUri = createRyaUri(subject); - final RyaURI predicateUri = createRyaUri(predicate); - final RyaURI objectUri = createRyaUri(object); - final RyaStatement ryaStatement = new RyaStatement(subjectUri, predicateUri, objectUri); + final RyaIRI subjectIri = createRyaIri(subject); + final RyaIRI predicateIri = createRyaIri(predicate); + final RyaIRI objectIri = createRyaIri(object); + final RyaStatement ryaStatement = new RyaStatement(subjectIri, predicateIri, objectIri); if (date != null) { ryaStatement.setTimestamp(date.getTime()); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreateFluoPcj.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreateFluoPcj.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreateFluoPcj.java index 731952a..220b7fa 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreateFluoPcj.java +++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreateFluoPcj.java @@ -41,7 +41,7 @@ import org.apache.rya.api.client.CreatePCJ.ExportStrategy; import org.apache.rya.api.client.CreatePCJ.QueryType; 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.persist.RyaDAOException; import org.apache.rya.api.persist.query.BatchRyaQuery; import org.apache.rya.api.resolver.RdfToRyaConversions; @@ -418,29 +418,29 @@ public class CreateFluoPcj { final Value predVal = sp.getPredicateVar().getValue(); final Value objVal = sp.getObjectVar().getValue(); - RyaURI subjURI = null; - RyaURI predURI = null; + RyaIRI subjIRI = null; + RyaIRI predIRI = null; RyaType objType = null; if(subjVal != null) { if(!(subjVal instanceof Resource)) { throw new AssertionError("Subject must be a Resource."); } - subjURI = RdfToRyaConversions.convertResource((Resource) subjVal); + subjIRI = RdfToRyaConversions.convertResource((Resource) subjVal); } if (predVal != null) { if(!(predVal instanceof IRI)) { - throw new AssertionError("Predicate must be a URI."); + throw new AssertionError("Predicate must be a IRI."); } - predURI = RdfToRyaConversions.convertURI((IRI) predVal); + predIRI = RdfToRyaConversions.convertIRI((IRI) predVal); } if (objVal != null ) { objType = RdfToRyaConversions.convertValue(objVal); } - return new RyaStatement(subjURI, predURI, objType); + return new RyaStatement(subjIRI, predIRI, objType); } private String[] getAuths(final Connector accumulo) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjection.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjection.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjection.java index fbf95fc..8196955 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjection.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjection.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder; 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.VarNameUtils; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.resolver.RdfToRyaConversions; @@ -205,8 +205,8 @@ public class ConstructProjection { Preconditions.checkArgument(subj instanceof Resource); Preconditions.checkArgument(pred instanceof IRI); - RyaURI subjType = RdfToRyaConversions.convertResource((Resource) subj); - RyaURI predType = RdfToRyaConversions.convertURI((IRI) pred); + RyaIRI subjType = RdfToRyaConversions.convertResource((Resource) subj); + RyaIRI predType = RdfToRyaConversions.convertIRI((IRI) pred); RyaType objectType = RdfToRyaConversions.convertValue(obj); RyaStatement statement = new RyaStatement(subjType, predType, objectType); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java index c52a72a..e70993a 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Set; 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.model.VisibilityBindingSet; import org.eclipse.rdf4j.model.ValueFactory; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; @@ -61,8 +61,8 @@ public class ConstructGraphTest { VisibilityBindingSet vBs = new VisibilityBindingSet(bs,"FOUO"); Set<RyaStatement> statements = graph.createGraphFromBindingSet(vBs); - RyaStatement statement1 = new RyaStatement(new RyaURI("uri:Joe"), new RyaURI("uri:talksTo"), new RyaURI("uri:Bob")); - RyaStatement statement2 = new RyaStatement(new RyaURI("uri:Bob"), new RyaURI("uri:worksAt"), new RyaURI("uri:BurgerShack")); + RyaStatement statement1 = new RyaStatement(new RyaIRI("uri:Joe"), new RyaIRI("uri:talksTo"), new RyaIRI("uri:Bob")); + RyaStatement statement2 = new RyaStatement(new RyaIRI("uri:Bob"), new RyaIRI("uri:worksAt"), new RyaIRI("uri:BurgerShack")); Set<RyaStatement> expected = Sets.newHashSet(Arrays.asList(statement1, statement2)); expected.forEach(x-> x.setColumnVisibility("FOUO".getBytes())); ConstructGraphTestUtils.ryaStatementSetsEqualIgnoresTimestamp(expected, statements); @@ -84,18 +84,18 @@ public class ConstructGraphTest { Set<RyaStatement> statements = graph.createGraphFromBindingSet(vBs); Set<RyaStatement> statements2 = graph.createGraphFromBindingSet(vBs); - RyaURI subject = null; + RyaIRI subject = null; for(RyaStatement statement: statements) { - RyaURI subjURI = statement.getSubject(); + RyaIRI subjURI = statement.getSubject(); if(subject == null) { subject = subjURI; } else { assertEquals(subjURI, subject); } } - RyaURI subject2 = null; + RyaIRI subject2 = null; for(RyaStatement statement: statements2) { - RyaURI subjURI = statement.getSubject(); + RyaIRI subjURI = statement.getSubject(); if(subject2 == null) { subject2 = subjURI; } else { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java index d505b33..ac21cdf 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaSubGraph; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.eclipse.rdf4j.model.Statement; import org.junit.Assert; @@ -61,7 +61,7 @@ public class ConstructGraphTestUtils { } public static void ryaStatementsEqualIgnoresBlankNode(Set<RyaStatement> statements1, Set<RyaStatement> statements2) { - Map<String, RyaURI> bNodeMap = new HashMap<>(); + Map<String, RyaIRI> bNodeMap = new HashMap<>(); statements1.forEach(x-> bNodeMap.put(x.getPredicate().getData(), x.getSubject())); statements2.forEach(x -> x.setSubject(bNodeMap.get(x.getPredicate().getData()))); ryaStatementSetsEqualIgnoresTimestamp(statements1, statements2); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java index f884b7b..a541575 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; 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.domain.VarNameUtils; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.resolver.RdfToRyaConversions; @@ -60,7 +60,7 @@ public class ConstructProjectionTest { VisibilityBindingSet vBs = new VisibilityBindingSet(bs, "FOUO"); RyaStatement statement = projection.projectBindingSet(vBs, new HashMap<>()); - RyaStatement expected = new RyaStatement(new RyaURI("uri:Joe"), new RyaURI("uri:talksTo"), new RyaURI("uri:Bob")); + RyaStatement expected = new RyaStatement(new RyaIRI("uri:Joe"), new RyaIRI("uri:talksTo"), new RyaIRI("uri:Bob")); expected.setColumnVisibility("FOUO".getBytes("UTF-8")); expected.setTimestamp(statement.getTimestamp()); @@ -81,7 +81,7 @@ public class ConstructProjectionTest { VisibilityBindingSet vBs = new VisibilityBindingSet(bs); RyaStatement statement = projection.projectBindingSet(vBs, new HashMap<>()); - RyaStatement expected = new RyaStatement(new RyaURI("uri:Joe"), new RyaURI("uri:worksWith"), new RyaURI("uri:Bob")); + RyaStatement expected = new RyaStatement(new RyaIRI("uri:Joe"), new RyaIRI("uri:worksWith"), new RyaIRI("uri:Bob")); expected.setTimestamp(statement.getTimestamp()); expected.setColumnVisibility(new byte[0]); @@ -105,7 +105,7 @@ public class ConstructProjectionTest { bNodeMap.put(VarNameUtils.prependAnonymous("1"), bNode); RyaStatement statement = projection.projectBindingSet(vBs,bNodeMap); - RyaStatement expected = new RyaStatement(RdfToRyaConversions.convertResource(bNode), new RyaURI("uri:talksTo"), new RyaURI("uri:Bob")); + RyaStatement expected = new RyaStatement(RdfToRyaConversions.convertResource(bNode), new RyaIRI("uri:talksTo"), new RyaIRI("uri:Bob")); expected.setTimestamp(statement.getTimestamp()); expected.setColumnVisibility(new byte[0]); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java index 9a9feef..d19883b 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java @@ -25,7 +25,7 @@ import java.util.UUID; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaSubGraph; 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.pcj.fluo.app.export.kafka.RyaSubGraphKafkaSerDe; import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.junit.Test; @@ -37,8 +37,8 @@ public class RyaSubGraphKafkaSerDeTest { @Test public void serializationTestWithURI() { RyaSubGraph bundle = new RyaSubGraph(UUID.randomUUID().toString()); - bundle.addStatement(new RyaStatement(new RyaURI("uri:123"), new RyaURI("uri:234"), new RyaURI("uri:345"))); - bundle.addStatement(new RyaStatement(new RyaURI("uri:345"), new RyaURI("uri:567"), new RyaURI("uri:789"))); + bundle.addStatement(new RyaStatement(new RyaIRI("uri:123"), new RyaIRI("uri:234"), new RyaIRI("uri:345"))); + bundle.addStatement(new RyaStatement(new RyaIRI("uri:345"), new RyaIRI("uri:567"), new RyaIRI("uri:789"))); byte[] bundleBytes = serializer.toBytes(bundle); RyaSubGraph deserializedBundle = serializer.fromBytes(bundleBytes); assertEquals(bundle, deserializedBundle); @@ -48,8 +48,8 @@ public class RyaSubGraphKafkaSerDeTest { @Test public void serializationTestWithLiteral() { RyaSubGraph bundle = new RyaSubGraph(UUID.randomUUID().toString()); - bundle.addStatement(new RyaStatement(new RyaURI("uri:123"), new RyaURI("uri:234"), new RyaType(XMLSchema.INTEGER, "345"))); - bundle.addStatement(new RyaStatement(new RyaURI("uri:345"), new RyaURI("uri:567"), new RyaType(XMLSchema.INTEGER, "789"))); + bundle.addStatement(new RyaStatement(new RyaIRI("uri:123"), new RyaIRI("uri:234"), new RyaType(XMLSchema.INTEGER, "345"))); + bundle.addStatement(new RyaStatement(new RyaIRI("uri:345"), new RyaIRI("uri:567"), new RyaType(XMLSchema.INTEGER, "789"))); byte[] bundleBytes = serializer.toBytes(bundle); RyaSubGraph deserializedBundle = serializer.fromBytes(bundleBytes); assertEquals(bundle, deserializedBundle); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java index 8ef6db3..b12dc9e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java @@ -30,7 +30,7 @@ import org.apache.log4j.Level; 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.persist.RyaDAOException; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.utils.CloseableIterator; @@ -61,38 +61,38 @@ public class FluoAndHistoricPcjsDemo implements Demo { private static final Logger log = Logger.getLogger(FluoAndHistoricPcjsDemo.class); // Employees - private static final RyaURI alice = new RyaURI("http://Alice";); - private static final RyaURI bob = new RyaURI("http://Bob";); - private static final RyaURI charlie = new RyaURI("http://Charlie";); - private static final RyaURI frank = new RyaURI("http://Frank";); + private static final RyaIRI alice = new RyaIRI("http://Alice";); + private static final RyaIRI bob = new RyaIRI("http://Bob";); + private static final RyaIRI charlie = new RyaIRI("http://Charlie";); + private static final RyaIRI frank = new RyaIRI("http://Frank";); // Patrons - private static final RyaURI david = new RyaURI("http://David";); - private static final RyaURI eve = new RyaURI("http://Eve";); - private static final RyaURI george = new RyaURI("http://George";); + private static final RyaIRI david = new RyaIRI("http://David";); + private static final RyaIRI eve = new RyaIRI("http://Eve";); + private static final RyaIRI george = new RyaIRI("http://George";); // Other People - private static final RyaURI henry = new RyaURI("http://Henry";); - private static final RyaURI irene = new RyaURI("http://Irene";); - private static final RyaURI justin = new RyaURI("http://Justin";); - private static final RyaURI kristi = new RyaURI("http://Kristi";); - private static final RyaURI luke = new RyaURI("http://Luke";); - private static final RyaURI manny = new RyaURI("http://Manny";); - private static final RyaURI nate = new RyaURI("http://Nate";); - private static final RyaURI olivia = new RyaURI("http://Olivia";); - private static final RyaURI paul = new RyaURI("http://Paul";); - private static final RyaURI ross = new RyaURI("http://Ross";); - private static final RyaURI sally = new RyaURI("http://Sally";); - private static final RyaURI tim = new RyaURI("http://Tim";); + private static final RyaIRI henry = new RyaIRI("http://Henry";); + private static final RyaIRI irene = new RyaIRI("http://Irene";); + private static final RyaIRI justin = new RyaIRI("http://Justin";); + private static final RyaIRI kristi = new RyaIRI("http://Kristi";); + private static final RyaIRI luke = new RyaIRI("http://Luke";); + private static final RyaIRI manny = new RyaIRI("http://Manny";); + private static final RyaIRI nate = new RyaIRI("http://Nate";); + private static final RyaIRI olivia = new RyaIRI("http://Olivia";); + private static final RyaIRI paul = new RyaIRI("http://Paul";); + private static final RyaIRI ross = new RyaIRI("http://Ross";); + private static final RyaIRI sally = new RyaIRI("http://Sally";); + private static final RyaIRI tim = new RyaIRI("http://Tim";); // Places - private static final RyaURI coffeeShop = new RyaURI("http://CoffeeShop";); - private static final RyaURI burgerShop = new RyaURI("http://BurgerShop";); - private static final RyaURI cupcakeShop= new RyaURI("http://cupcakeShop";); + private static final RyaIRI coffeeShop = new RyaIRI("http://CoffeeShop";); + private static final RyaIRI burgerShop = new RyaIRI("http://BurgerShop";); + private static final RyaIRI cupcakeShop= new RyaIRI("http://cupcakeShop";); // Verbs - private static final RyaURI talksTo = new RyaURI("http://talksTo";); - private static final RyaURI worksAt = new RyaURI("http://worksAt";); + private static final RyaIRI talksTo = new RyaIRI("http://talksTo";); + private static final RyaIRI worksAt = new RyaIRI("http://worksAt";); /** * Used to pause the demo waiting for the presenter to hit the Enter key. @@ -292,8 +292,8 @@ public class FluoAndHistoricPcjsDemo implements Demo { } private static String prettyFormat(final RyaStatement statement) { - final RyaURI s = statement.getSubject(); - final RyaURI p = statement.getPredicate(); + final RyaIRI s = statement.getSubject(); + final RyaIRI p = statement.getPredicate(); final RyaType o = statement.getObject(); return "<" + s.getData() + "> <"+ p.getData() + "> <" + o.getData() + ">"; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java index ca00934..0f15a5d 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ConstructGraphTestUtils.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaSubGraph; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.eclipse.rdf4j.model.Statement; import org.junit.Assert; @@ -72,7 +72,7 @@ public class ConstructGraphTestUtils { } public static void ryaStatementsEqualIgnoresBlankNode(Set<RyaStatement> statements1, Set<RyaStatement> statements2) { - Map<String, RyaURI> bNodeMap = new HashMap<>(); + Map<String, RyaIRI> bNodeMap = new HashMap<>(); statements1.forEach(x-> bNodeMap.put(x.getPredicate().getData(), x.getSubject())); statements2.forEach(x -> x.setSubject(bNodeMap.get(x.getPredicate().getData()))); ryaStatementSetsEqualIgnoresTimestamp(statements1, statements2); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java index cb34d06..6ca87e5 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java @@ -28,7 +28,7 @@ import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.client.FluoFactory; import org.apache.fluo.api.config.ObserverSpecification; 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.pcj.fluo.test.base.RyaExportITBase; import org.junit.Test; @@ -56,11 +56,11 @@ public class CountStatementsIT extends RyaExportITBase { public void countStatements() { // Insert some Triples into the Fluo app. final List<RyaStatement> triples = new ArrayList<>(); - triples.add( RyaStatement.builder().setSubject(new RyaURI("http://Alice";)).setPredicate(new RyaURI("http://talksTo";)).setObject(new RyaURI("http://Bob";)).build() ); - triples.add( RyaStatement.builder().setSubject(new RyaURI("http://Bob";)).setPredicate(new RyaURI("http://talksTo";)).setObject(new RyaURI("http://Alice";)).build() ); - triples.add( RyaStatement.builder().setSubject(new RyaURI("http://Charlie";)).setPredicate(new RyaURI("http://talksTo";)).setObject(new RyaURI("http://Bob";)).build() ); - triples.add( RyaStatement.builder().setSubject(new RyaURI("http://David";)).setPredicate(new RyaURI("http://talksTo";)).setObject(new RyaURI("http://Bob";)).build() ); - triples.add( RyaStatement.builder().setSubject(new RyaURI("http://Eve";)).setPredicate(new RyaURI("http://talksTo";)).setObject(new RyaURI("http://Bob";)).build() ); + triples.add( RyaStatement.builder().setSubject(new RyaIRI("http://Alice";)).setPredicate(new RyaIRI("http://talksTo";)).setObject(new RyaIRI("http://Bob";)).build() ); + triples.add( RyaStatement.builder().setSubject(new RyaIRI("http://Bob";)).setPredicate(new RyaIRI("http://talksTo";)).setObject(new RyaIRI("http://Alice";)).build() ); + triples.add( RyaStatement.builder().setSubject(new RyaIRI("http://Charlie";)).setPredicate(new RyaIRI("http://talksTo";)).setObject(new RyaIRI("http://Bob";)).build() ); + triples.add( RyaStatement.builder().setSubject(new RyaIRI("http://David";)).setPredicate(new RyaIRI("http://talksTo";)).setObject(new RyaIRI("http://Bob";)).build() ); + triples.add( RyaStatement.builder().setSubject(new RyaIRI("http://Eve";)).setPredicate(new RyaIRI("http://talksTo";)).setObject(new RyaIRI("http://Bob";)).build() ); try(FluoClient fluoClient = FluoFactory.newClient(super.getFluoConfiguration())) { new InsertTriples().insert(fluoClient, triples, Optional.<String>absent()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java index c0f0f16..9b82fe6 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java @@ -30,7 +30,7 @@ import org.apache.accumulo.core.client.Connector; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.client.FluoFactory; 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.indexing.pcj.fluo.api.GetQueryReport.QueryReport; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery; import org.apache.rya.indexing.pcj.fluo.app.query.StatementPatternMetadata; @@ -60,22 +60,22 @@ public class GetQueryReportIT extends RyaExportITBase { // Triples that will be streamed into Fluo after the PCJ has been created. final Set<RyaStatement> streamedTriples = Sets.newHashSet( - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://worksAt";), new RyaURI("http://Taco Shop")), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://worksAt";), new RyaURI("http://Burger Join")), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://worksAt";), new RyaURI("http://Pastery Shop")), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://worksAt";), new RyaURI("http://Burrito Place")), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://livesIn";), new RyaURI("http://Lost County")), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://livesIn";), new RyaURI("http://Big City")), - new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://worksAt";), new RyaURI("http://Burrito Place")), - new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://livesIn";), new RyaURI("http://Big City")), - new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://worksAt";), new RyaURI("http://Burrito Place")), - new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://livesIn";), new RyaURI("http://Big City")), - new RyaStatement(new RyaURI("http://David";), new RyaURI("http://worksAt";), new RyaURI("http://Burrito Place")), - new RyaStatement(new RyaURI("http://David";), new RyaURI("http://livesIn";), new RyaURI("http://Lost County")), - new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://worksAt";), new RyaURI("http://Burrito Place")), - new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://livesIn";), new RyaURI("http://Big City")), - new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://worksAt";), new RyaURI("http://Burrito Place")), - new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://livesIn";), new RyaURI("http://Lost County"))); + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://worksAt";), new RyaIRI("http://Taco Shop")), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://worksAt";), new RyaIRI("http://Burger Join")), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://worksAt";), new RyaIRI("http://Pastery Shop")), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://worksAt";), new RyaIRI("http://Burrito Place")), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://livesIn";), new RyaIRI("http://Lost County")), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://livesIn";), new RyaIRI("http://Big City")), + new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://worksAt";), new RyaIRI("http://Burrito Place")), + new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://livesIn";), new RyaIRI("http://Big City")), + new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://worksAt";), new RyaIRI("http://Burrito Place")), + new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://livesIn";), new RyaIRI("http://Big City")), + new RyaStatement(new RyaIRI("http://David";), new RyaIRI("http://worksAt";), new RyaIRI("http://Burrito Place")), + new RyaStatement(new RyaIRI("http://David";), new RyaIRI("http://livesIn";), new RyaIRI("http://Lost County")), + new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://worksAt";), new RyaIRI("http://Burrito Place")), + new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://livesIn";), new RyaIRI("http://Big City")), + new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://worksAt";), new RyaIRI("http://Burrito Place")), + new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://livesIn";), new RyaIRI("http://Lost County"))); // Create the PCJ table. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java index 8ebc9fc..63c7bbe 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/BatchIT.java @@ -38,7 +38,7 @@ import org.apache.fluo.api.data.Span; import org.apache.fluo.core.client.FluoClientImpl; import org.apache.log4j.Logger; 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.function.join.LazyJoiningIterator.Side; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.indexing.pcj.fluo.api.CreateFluoPcj; @@ -82,9 +82,9 @@ public class BatchIT extends RyaExportITBase { + " <urn:predicate_2> ?object2 } "; try (FluoClient fluoClient = new FluoClientImpl(getFluoConfiguration())) { - RyaURI subj = new RyaURI("urn:subject_1"); - RyaStatement statement1 = new RyaStatement(subj, new RyaURI("urn:predicate_1"), null); - RyaStatement statement2 = new RyaStatement(subj, new RyaURI("urn:predicate_2"), null); + RyaIRI subj = new RyaIRI("urn:subject_1"); + RyaStatement statement1 = new RyaStatement(subj, new RyaIRI("urn:predicate_1"), null); + RyaStatement statement2 = new RyaStatement(subj, new RyaIRI("urn:predicate_2"), null); Set<RyaStatement> statements1 = getRyaStatements(statement1, 10); Set<RyaStatement> statements2 = getRyaStatements(statement2, 10); @@ -122,9 +122,9 @@ public class BatchIT extends RyaExportITBase { + " <urn:predicate_2> ?object2 } "; try (FluoClient fluoClient = new FluoClientImpl(getFluoConfiguration())) { - RyaURI subj = new RyaURI("urn:subject_1"); - RyaStatement statement1 = new RyaStatement(subj, new RyaURI("urn:predicate_1"), null); - RyaStatement statement2 = new RyaStatement(subj, new RyaURI("urn:predicate_2"), null); + RyaIRI subj = new RyaIRI("urn:subject_1"); + RyaStatement statement1 = new RyaStatement(subj, new RyaIRI("urn:predicate_1"), null); + RyaStatement statement2 = new RyaStatement(subj, new RyaIRI("urn:predicate_2"), null); Set<RyaStatement> statements1 = getRyaStatements(statement1, 5); Set<RyaStatement> statements2 = getRyaStatements(statement2, 5); @@ -174,8 +174,8 @@ public class BatchIT extends RyaExportITBase { + " <urn:predicate_2> ?object2 } "; try (FluoClient fluoClient = new FluoClientImpl(getFluoConfiguration())) { - RyaURI subj = new RyaURI("urn:subject_1"); - RyaStatement statement2 = new RyaStatement(subj, new RyaURI("urn:predicate_2"), null); + RyaIRI subj = new RyaIRI("urn:subject_1"); + RyaStatement statement2 = new RyaStatement(subj, new RyaIRI("urn:predicate_2"), null); Set<RyaStatement> statements2 = getRyaStatements(statement2, 5); // Create the PCJ table. @@ -222,9 +222,9 @@ public class BatchIT extends RyaExportITBase { + " <urn:predicate_2> ?object2 } "; try (FluoClient fluoClient = new FluoClientImpl(getFluoConfiguration())) { - RyaURI subj = new RyaURI("urn:subject_1"); - RyaStatement statement1 = new RyaStatement(subj, new RyaURI("urn:predicate_1"), null); - RyaStatement statement2 = new RyaStatement(subj, new RyaURI("urn:predicate_2"), null); + RyaIRI subj = new RyaIRI("urn:subject_1"); + RyaStatement statement1 = new RyaStatement(subj, new RyaIRI("urn:predicate_1"), null); + RyaStatement statement2 = new RyaStatement(subj, new RyaIRI("urn:predicate_2"), null); Set<RyaStatement> statements1 = getRyaStatements(statement1, 15); Set<RyaStatement> statements2 = getRyaStatements(statement2, 15); @@ -256,12 +256,12 @@ public class BatchIT extends RyaExportITBase { + "OPTIONAL{ ?subject <urn:predicate_2> ?object2} } "; try (FluoClient fluoClient = new FluoClientImpl(getFluoConfiguration())) { - RyaURI subj = new RyaURI("urn:subject_1"); - RyaStatement statement1 = new RyaStatement(subj, new RyaURI("urn:predicate_1"), null); - RyaStatement statement2 = new RyaStatement(subj, new RyaURI("urn:predicate_2"), null); + RyaIRI subj = new RyaIRI("urn:subject_1"); + RyaStatement statement1 = new RyaStatement(subj, new RyaIRI("urn:predicate_1"), null); + RyaStatement statement2 = new RyaStatement(subj, new RyaIRI("urn:predicate_2"), null); - subj = new RyaURI("urn:subject_2"); - RyaStatement statement3 = new RyaStatement(subj, new RyaURI("urn:predicate_1"), null); + subj = new RyaIRI("urn:subject_2"); + RyaStatement statement3 = new RyaStatement(subj, new RyaIRI("urn:predicate_1"), null); Set<RyaStatement> statements1 = getRyaStatements(statement1, 10); Set<RyaStatement> statements2 = getRyaStatements(statement2, 10); @@ -295,15 +295,15 @@ public class BatchIT extends RyaExportITBase { + " <urn:predicate_2> ?object2 ." + " ?subject2 <urn:predicate_3> ?object2 } "; try (FluoClient fluoClient = new FluoClientImpl(getFluoConfiguration())) { - RyaURI subj1 = new RyaURI("urn:subject_1"); - RyaStatement statement1 = new RyaStatement(subj1, new RyaURI("urn:predicate_1"), null); - RyaStatement statement2 = new RyaStatement(subj1, new RyaURI("urn:predicate_2"), null); + RyaIRI subj1 = new RyaIRI("urn:subject_1"); + RyaStatement statement1 = new RyaStatement(subj1, new RyaIRI("urn:predicate_1"), null); + RyaStatement statement2 = new RyaStatement(subj1, new RyaIRI("urn:predicate_2"), null); Set<RyaStatement> statements1 = getRyaStatements(statement1, 10); Set<RyaStatement> statements2 = getRyaStatements(statement2, 10); - RyaURI subj2 = new RyaURI("urn:subject_2"); - RyaStatement statement3 = new RyaStatement(subj2, new RyaURI("urn:predicate_3"), null); + RyaIRI subj2 = new RyaIRI("urn:subject_2"); + RyaStatement statement3 = new RyaStatement(subj2, new RyaIRI("urn:predicate_3"), null); Set<RyaStatement> statements3 = getRyaStatements(statement3, 10); // Create the PCJ table. @@ -338,13 +338,13 @@ public class BatchIT extends RyaExportITBase { for (int i = 0; i < numTriples; i++) { RyaStatement stmnt = new RyaStatement(statement.getSubject(), statement.getPredicate(), statement.getObject()); if (stmnt.getSubject() == null) { - stmnt.setSubject(new RyaURI(subject + i)); + stmnt.setSubject(new RyaIRI(subject + i)); } if (stmnt.getPredicate() == null) { - stmnt.setPredicate(new RyaURI(predicate + i)); + stmnt.setPredicate(new RyaIRI(predicate + i)); } if (stmnt.getObject() == null) { - stmnt.setObject(new RyaURI(object + i)); + stmnt.setObject(new RyaIRI(object + i)); } statements.add(stmnt); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java index ff2dc28..56fc7df 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java @@ -28,7 +28,7 @@ import org.apache.accumulo.core.client.Connector; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.client.FluoFactory; 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.utils.CloseableIterator; import org.apache.rya.indexing.pcj.fluo.api.CreateFluoPcj; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; @@ -132,16 +132,16 @@ public class InputIT extends RyaExportITBase { // Triples that will be streamed into Fluo after the PCJ has been created. final Set<RyaStatement> streamedTriples = Sets.newHashSet( - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";), new RyaURI("http://Eve";)), - new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://talksTo";), new RyaURI("http://Eve";)), - new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://talksTo";), new RyaURI("http://Eve";)), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";), new RyaIRI("http://Eve";)), + new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://talksTo";), new RyaIRI("http://Eve";)), + new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://talksTo";), new RyaIRI("http://Eve";)), - new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://helps";), new RyaURI("http://Kevin";)), + new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://helps";), new RyaIRI("http://Kevin";)), - new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";)), - new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";)), - new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";)), - new RyaStatement(new RyaURI("http://David";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";))); + new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";)), + new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";)), + new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";)), + new RyaStatement(new RyaIRI("http://David";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";))); // The expected results of the SPARQL query once the PCJ has been computed. final ValueFactory vf = SimpleValueFactory.getInstance(); @@ -211,8 +211,8 @@ public class InputIT extends RyaExportITBase { // Triples that will be streamed into Fluo after the PCJ has been created. final Set<RyaStatement> streamedTriples = Sets.newHashSet( - new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://talksTo";), new RyaURI("http://Eve";)), - new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";))); + new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://talksTo";), new RyaIRI("http://Eve";)), + new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";))); // Load the historic data into Rya. final SailRepositoryConnection ryaConn = super.getRyaSailRepository().getConnection(); @@ -293,8 +293,8 @@ public class InputIT extends RyaExportITBase { // Triples that will be streamed into Fluo after the PCJ has been created. final Set<RyaStatement> streamedTriples = Sets.newHashSet( - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";), new RyaURI("http://Eve";)), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";))); + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";), new RyaIRI("http://Eve";)), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";))); // The expected final result. final Set<BindingSet> expected = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java index 309d1ca..990a69c 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/KafkaRyaSubGraphExportIT.java @@ -43,7 +43,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaSubGraph; 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.indexing.pcj.fluo.ConstructGraphTestUtils; import org.apache.rya.indexing.pcj.fluo.api.CreateFluoPcj; @@ -128,8 +128,8 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { final Set<RyaSubGraph> expectedResults = new HashSet<>(); RyaSubGraph subGraph = new RyaSubGraph(pcjId); - RyaStatement statement1 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:travelsTo"), new RyaURI("urn:London")); - RyaStatement statement2 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:friendsWith"), new RyaURI("urn:Bob")); + RyaStatement statement1 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:travelsTo"), new RyaIRI("urn:London")); + RyaStatement statement2 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:friendsWith"), new RyaIRI("urn:Bob")); // if no visibility indicated, then visibilities set to empty byte in // Fluo - they are null by default in RyaStatement // need to set visibility to empty byte so that RyaStatement's equals @@ -151,9 +151,9 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { + "?customer <urn:talksTo> ?worker. " + "?worker <urn:livesIn> ?city. " + "?worker <urn:worksAt> <urn:burgerShack>. " + "}"; // Create the Statements that will be loaded into Rya. - RyaStatement statement1 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:talksTo"), new RyaURI("urn:Bob")); - RyaStatement statement2 = new RyaStatement(new RyaURI("urn:Bob"), new RyaURI("urn:livesIn"), new RyaURI("urn:London")); - RyaStatement statement3 = new RyaStatement(new RyaURI("urn:Bob"), new RyaURI("urn:worksAt"), new RyaURI("urn:burgerShack")); + RyaStatement statement1 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:talksTo"), new RyaIRI("urn:Bob")); + RyaStatement statement2 = new RyaStatement(new RyaIRI("urn:Bob"), new RyaIRI("urn:livesIn"), new RyaIRI("urn:London")); + RyaStatement statement3 = new RyaStatement(new RyaIRI("urn:Bob"), new RyaIRI("urn:worksAt"), new RyaIRI("urn:burgerShack")); statement1.setColumnVisibility("U&W".getBytes("UTF-8")); statement2.setColumnVisibility("V".getBytes("UTF-8")); statement3.setColumnVisibility("W".getBytes("UTF-8")); @@ -167,8 +167,8 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { // computed. final Set<RyaSubGraph> expectedResults = new HashSet<>(); RyaSubGraph subGraph = new RyaSubGraph(pcjId); - RyaStatement statement4 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:travelsTo"), new RyaURI("urn:London")); - RyaStatement statement5 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:friendsWith"), new RyaURI("urn:Bob")); + RyaStatement statement4 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:travelsTo"), new RyaIRI("urn:London")); + RyaStatement statement5 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:friendsWith"), new RyaIRI("urn:Bob")); // if no visibility indicated, then visibilities set to empty byte in // Fluo - they are null by default in RyaStatement // need to set visibility to empty byte so that RyaStatement's equals @@ -191,12 +191,12 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { + "?customer <urn:talksTo> ?worker. " + "?worker <urn:livesIn> ?city. " + "?worker <urn:worksAt> <urn:burgerShack>. " + "}"; // Create the Statements that will be loaded into Rya. - RyaStatement statement1 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:talksTo"), new RyaURI("urn:Bob")); - RyaStatement statement2 = new RyaStatement(new RyaURI("urn:Bob"), new RyaURI("urn:livesIn"), new RyaURI("urn:London")); - RyaStatement statement3 = new RyaStatement(new RyaURI("urn:Bob"), new RyaURI("urn:worksAt"), new RyaURI("urn:burgerShack")); - RyaStatement statement4 = new RyaStatement(new RyaURI("urn:John"), new RyaURI("urn:talksTo"), new RyaURI("urn:Evan")); - RyaStatement statement5 = new RyaStatement(new RyaURI("urn:Evan"), new RyaURI("urn:livesIn"), new RyaURI("urn:SanFrancisco")); - RyaStatement statement6 = new RyaStatement(new RyaURI("urn:Evan"), new RyaURI("urn:worksAt"), new RyaURI("urn:burgerShack")); + RyaStatement statement1 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:talksTo"), new RyaIRI("urn:Bob")); + RyaStatement statement2 = new RyaStatement(new RyaIRI("urn:Bob"), new RyaIRI("urn:livesIn"), new RyaIRI("urn:London")); + RyaStatement statement3 = new RyaStatement(new RyaIRI("urn:Bob"), new RyaIRI("urn:worksAt"), new RyaIRI("urn:burgerShack")); + RyaStatement statement4 = new RyaStatement(new RyaIRI("urn:John"), new RyaIRI("urn:talksTo"), new RyaIRI("urn:Evan")); + RyaStatement statement5 = new RyaStatement(new RyaIRI("urn:Evan"), new RyaIRI("urn:livesIn"), new RyaIRI("urn:SanFrancisco")); + RyaStatement statement6 = new RyaStatement(new RyaIRI("urn:Evan"), new RyaIRI("urn:worksAt"), new RyaIRI("urn:burgerShack")); statement1.setColumnVisibility("U&W".getBytes("UTF-8")); statement2.setColumnVisibility("V".getBytes("UTF-8")); statement3.setColumnVisibility("W".getBytes("UTF-8")); @@ -211,10 +211,10 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { final Set<RyaSubGraph> results = readAllResults(pcjId); // Create the expected results of the SPARQL query once the PCJ has been // computed. - RyaStatement statement7 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:travelsTo"), new RyaURI("urn:London")); - RyaStatement statement8 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:friendsWith"), new RyaURI("urn:Bob")); - RyaStatement statement9 = new RyaStatement(new RyaURI("urn:John"), new RyaURI("urn:travelsTo"), new RyaURI("urn:SanFrancisco")); - RyaStatement statement10 = new RyaStatement(new RyaURI("urn:John"), new RyaURI("urn:friendsWith"), new RyaURI("urn:Evan")); + RyaStatement statement7 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:travelsTo"), new RyaIRI("urn:London")); + RyaStatement statement8 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:friendsWith"), new RyaIRI("urn:Bob")); + RyaStatement statement9 = new RyaStatement(new RyaIRI("urn:John"), new RyaIRI("urn:travelsTo"), new RyaIRI("urn:SanFrancisco")); + RyaStatement statement10 = new RyaStatement(new RyaIRI("urn:John"), new RyaIRI("urn:friendsWith"), new RyaIRI("urn:Evan")); statement7.setColumnVisibility("U&V&W".getBytes("UTF-8")); statement8.setColumnVisibility("U&V&W".getBytes("UTF-8")); statement9.setColumnVisibility("A&B&C".getBytes("UTF-8")); @@ -242,12 +242,12 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { + "?customer <urn:talksTo> ?worker. " + "?worker <urn:livesIn> ?city. " + "?worker <urn:worksAt> <urn:burgerShack>. " + "}"; // Create the Statements that will be loaded into Rya. - RyaStatement statement1 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:talksTo"), new RyaURI("urn:Bob")); - RyaStatement statement2 = new RyaStatement(new RyaURI("urn:Bob"), new RyaURI("urn:livesIn"), new RyaURI("urn:London")); - RyaStatement statement3 = new RyaStatement(new RyaURI("urn:Bob"), new RyaURI("urn:worksAt"), new RyaURI("urn:burgerShack")); - RyaStatement statement4 = new RyaStatement(new RyaURI("urn:John"), new RyaURI("urn:talksTo"), new RyaURI("urn:Evan")); - RyaStatement statement5 = new RyaStatement(new RyaURI("urn:Evan"), new RyaURI("urn:livesIn"), new RyaURI("urn:SanFrancisco")); - RyaStatement statement6 = new RyaStatement(new RyaURI("urn:Evan"), new RyaURI("urn:worksAt"), new RyaURI("urn:burgerShack")); + RyaStatement statement1 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:talksTo"), new RyaIRI("urn:Bob")); + RyaStatement statement2 = new RyaStatement(new RyaIRI("urn:Bob"), new RyaIRI("urn:livesIn"), new RyaIRI("urn:London")); + RyaStatement statement3 = new RyaStatement(new RyaIRI("urn:Bob"), new RyaIRI("urn:worksAt"), new RyaIRI("urn:burgerShack")); + RyaStatement statement4 = new RyaStatement(new RyaIRI("urn:John"), new RyaIRI("urn:talksTo"), new RyaIRI("urn:Evan")); + RyaStatement statement5 = new RyaStatement(new RyaIRI("urn:Evan"), new RyaIRI("urn:livesIn"), new RyaIRI("urn:SanFrancisco")); + RyaStatement statement6 = new RyaStatement(new RyaIRI("urn:Evan"), new RyaIRI("urn:worksAt"), new RyaIRI("urn:burgerShack")); statement1.setColumnVisibility("U&W".getBytes("UTF-8")); statement2.setColumnVisibility("V".getBytes("UTF-8")); statement3.setColumnVisibility("W".getBytes("UTF-8")); @@ -262,10 +262,10 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { final Set<RyaSubGraph> results = readAllResults(pcjId); // Create the expected results of the SPARQL query once the PCJ has been // computed. - RyaStatement statement7 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:travelsTo"), new RyaURI("urn:London")); - RyaStatement statement8 = new RyaStatement(new RyaURI("urn:Joe"), new RyaURI("urn:friendsWith"), new RyaURI("urn:Bob")); - RyaStatement statement9 = new RyaStatement(new RyaURI("urn:John"), new RyaURI("urn:travelsTo"), new RyaURI("urn:SanFrancisco")); - RyaStatement statement10 = new RyaStatement(new RyaURI("urn:John"), new RyaURI("urn:friendsWith"), new RyaURI("urn:Evan")); + RyaStatement statement7 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:travelsTo"), new RyaIRI("urn:London")); + RyaStatement statement8 = new RyaStatement(new RyaIRI("urn:Joe"), new RyaIRI("urn:friendsWith"), new RyaIRI("urn:Bob")); + RyaStatement statement9 = new RyaStatement(new RyaIRI("urn:John"), new RyaIRI("urn:travelsTo"), new RyaIRI("urn:SanFrancisco")); + RyaStatement statement10 = new RyaStatement(new RyaIRI("urn:John"), new RyaIRI("urn:friendsWith"), new RyaIRI("urn:Evan")); statement7.setColumnVisibility("U&V&W".getBytes("UTF-8")); statement8.setColumnVisibility("U&V&W".getBytes("UTF-8")); statement9.setColumnVisibility("A&B&C".getBytes("UTF-8")); @@ -331,14 +331,14 @@ public class KafkaRyaSubGraphExportIT extends KafkaExportITBase { // Verify the end results of the query match the expected results. final Set<RyaSubGraph> results = readAllResults(pcjId); - RyaStatement statement1 = new RyaStatement(new RyaURI("urn:obs1"), new RyaURI("urn:hasCount"), new RyaType(XMLSchema.INTEGER, "2")); - RyaStatement statement2 = new RyaStatement(new RyaURI("urn:obs1"), new RyaURI("urn:hasAverageVelocity"), new RyaType(XMLSchema.DECIMAL, "84")); - RyaStatement statement3 = new RyaStatement(new RyaURI("urn:obs1"), new RyaURI("urn:hasLocation"), new RyaType("Rosslyn")); - RyaStatement statement4 = new RyaStatement(new RyaURI("urn:obs1"), new RyaURI(RDF.TYPE.toString()), new RyaURI("urn:highSpeedTrafficArea")); - RyaStatement statement5 = new RyaStatement(new RyaURI("urn:obs2"), new RyaURI("urn:hasCount"), new RyaType(XMLSchema.INTEGER, "2")); - RyaStatement statement6 = new RyaStatement(new RyaURI("urn:obs2"), new RyaURI("urn:hasAverageVelocity"), new RyaType(XMLSchema.DECIMAL, "79")); - RyaStatement statement7 = new RyaStatement(new RyaURI("urn:obs2"), new RyaURI("urn:hasLocation"), new RyaType("OldTown")); - RyaStatement statement8 = new RyaStatement(new RyaURI("urn:obs2"), new RyaURI(RDF.TYPE.toString()), new RyaURI("urn:highSpeedTrafficArea")); + RyaStatement statement1 = new RyaStatement(new RyaIRI("urn:obs1"), new RyaIRI("urn:hasCount"), new RyaType(XMLSchema.INTEGER, "2")); + RyaStatement statement2 = new RyaStatement(new RyaIRI("urn:obs1"), new RyaIRI("urn:hasAverageVelocity"), new RyaType(XMLSchema.DECIMAL, "84")); + RyaStatement statement3 = new RyaStatement(new RyaIRI("urn:obs1"), new RyaIRI("urn:hasLocation"), new RyaType("Rosslyn")); + RyaStatement statement4 = new RyaStatement(new RyaIRI("urn:obs1"), new RyaIRI(RDF.TYPE.toString()), new RyaIRI("urn:highSpeedTrafficArea")); + RyaStatement statement5 = new RyaStatement(new RyaIRI("urn:obs2"), new RyaIRI("urn:hasCount"), new RyaType(XMLSchema.INTEGER, "2")); + RyaStatement statement6 = new RyaStatement(new RyaIRI("urn:obs2"), new RyaIRI("urn:hasAverageVelocity"), new RyaType(XMLSchema.DECIMAL, "79")); + RyaStatement statement7 = new RyaStatement(new RyaIRI("urn:obs2"), new RyaIRI("urn:hasLocation"), new RyaType("OldTown")); + RyaStatement statement8 = new RyaStatement(new RyaIRI("urn:obs2"), new RyaIRI(RDF.TYPE.toString()), new RyaIRI("urn:highSpeedTrafficArea")); final Set<RyaSubGraph> expectedResults = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java index eabcd57..912f787 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java @@ -27,7 +27,7 @@ import org.apache.accumulo.core.client.Connector; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.client.FluoFactory; 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.indexing.pcj.fluo.api.CreateFluoPcj; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; @@ -62,25 +62,25 @@ public class RyaExportIT extends RyaExportITBase { // Triples that will be streamed into Fluo after the PCJ has been created. final ValueFactory vf = SimpleValueFactory.getInstance(); final Set<RyaStatement> streamedTriples = Sets.newHashSet( - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";), new RyaURI("http://Bob";)), - new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://livesIn";), new RyaURI("http://London";)), - new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";)), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";), new RyaIRI("http://Bob";)), + new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://livesIn";), new RyaIRI("http://London";)), + new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";)), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";), new RyaURI("http://Charlie";)), - new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://livesIn";), new RyaURI("http://London";)), - new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";)), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";), new RyaIRI("http://Charlie";)), + new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://livesIn";), new RyaIRI("http://London";)), + new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";)), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";), new RyaURI("http://David";)), - new RyaStatement(new RyaURI("http://David";), new RyaURI("http://livesIn";), new RyaURI("http://London";)), - new RyaStatement(new RyaURI("http://David";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";)), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";), new RyaIRI("http://David";)), + new RyaStatement(new RyaIRI("http://David";), new RyaIRI("http://livesIn";), new RyaIRI("http://London";)), + new RyaStatement(new RyaIRI("http://David";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";)), - new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";), new RyaURI("http://Eve";)), - new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://livesIn";), new RyaURI("http://Leeds";)), - new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";)), + new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";), new RyaIRI("http://Eve";)), + new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://livesIn";), new RyaIRI("http://Leeds";)), + new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";)), - new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://talksTo";), new RyaURI("http://Alice";)), - new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://livesIn";), new RyaURI("http://London";)), - new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://worksAt";), new RyaURI("http://Chipotle";))); + new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://talksTo";), new RyaIRI("http://Alice";)), + new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://livesIn";), new RyaIRI("http://London";)), + new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://worksAt";), new RyaIRI("http://Chipotle";))); // The expected results of the SPARQL query once the PCJ has been computed. final Set<BindingSet> expected = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java index 60df148..bb89995 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java @@ -46,7 +46,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.client.RyaClient; import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory; 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.utils.CloseableIterator; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig; @@ -191,25 +191,25 @@ public class PcjVisibilityIT extends RyaExportITBase { // Triples that will be streamed into Fluo after the PCJ has been created. final Map<RyaStatement, String> streamedTriples = new HashMap<>(); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";),new RyaURI("http://Bob";)), "A&B"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://livesIn";),new RyaURI("http://London";)), "A"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://worksAt";),new RyaURI("http://Chipotle";)), "B"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";),new RyaIRI("http://Bob";)), "A&B"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://livesIn";),new RyaIRI("http://London";)), "A"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://worksAt";),new RyaIRI("http://Chipotle";)), "B"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";),new RyaURI("http://Charlie";)), "B&C"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://livesIn";),new RyaURI("http://London";)), "B"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Charlie";), new RyaURI("http://worksAt";),new RyaURI("http://Chipotle";)), "C"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";),new RyaIRI("http://Charlie";)), "B&C"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://livesIn";),new RyaIRI("http://London";)), "B"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Charlie";), new RyaIRI("http://worksAt";),new RyaIRI("http://Chipotle";)), "C"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";),new RyaURI("http://David";)), "C&D"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://David";), new RyaURI("http://livesIn";),new RyaURI("http://London";)), "C"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://David";), new RyaURI("http://worksAt";),new RyaURI("http://Chipotle";)), "D"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";),new RyaIRI("http://David";)), "C&D"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://David";), new RyaIRI("http://livesIn";),new RyaIRI("http://London";)), "C"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://David";), new RyaIRI("http://worksAt";),new RyaIRI("http://Chipotle";)), "D"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Alice";), new RyaURI("http://talksTo";),new RyaURI("http://Eve";)), "D&E"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://livesIn";),new RyaURI("http://Leeds";)), "D"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Eve";), new RyaURI("http://worksAt";),new RyaURI("http://Chipotle";)), "E"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Alice";), new RyaIRI("http://talksTo";),new RyaIRI("http://Eve";)), "D&E"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://livesIn";),new RyaIRI("http://Leeds";)), "D"); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Eve";), new RyaIRI("http://worksAt";),new RyaIRI("http://Chipotle";)), "E"); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://talksTo";),new RyaURI("http://Alice";)), ""); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://livesIn";),new RyaURI("http://London";)), ""); - addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaURI("http://Frank";), new RyaURI("http://worksAt";),new RyaURI("http://Chipotle";)), ""); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://talksTo";),new RyaIRI("http://Alice";)), ""); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://livesIn";),new RyaIRI("http://London";)), ""); + addStatementVisibilityEntry(streamedTriples, new RyaStatement(new RyaIRI("http://Frank";), new RyaIRI("http://worksAt";),new RyaIRI("http://Chipotle";)), ""); final Connector accumuloConn = super.getAccumuloConnector(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.prospector/src/main/java/org/apache/rya/prospector/plans/impl/CountPlan.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/main/java/org/apache/rya/prospector/plans/impl/CountPlan.java b/extras/rya.prospector/src/main/java/org/apache/rya/prospector/plans/impl/CountPlan.java index 251c784..f25b67d 100644 --- a/extras/rya.prospector/src/main/java/org/apache/rya/prospector/plans/impl/CountPlan.java +++ b/extras/rya.prospector/src/main/java/org/apache/rya/prospector/plans/impl/CountPlan.java @@ -46,7 +46,7 @@ import org.apache.hadoop.mapreduce.Reducer; 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.prospector.domain.IndexEntry; import org.apache.rya.prospector.domain.IntermediateProspect; import org.apache.rya.prospector.domain.TripleValueType; @@ -64,8 +64,8 @@ public class CountPlan implements IndexWorkPlan { @Override public Collection<Map.Entry<IntermediateProspect, LongWritable>> map(final RyaStatement ryaStatement) { - final RyaURI subject = ryaStatement.getSubject(); - final RyaURI predicate = ryaStatement.getPredicate(); + final RyaIRI subject = ryaStatement.getSubject(); + final RyaIRI predicate = ryaStatement.getPredicate(); final String subjpred = ryaStatement.getSubject().getData() + DELIM + ryaStatement.getPredicate().getData(); final String predobj = ryaStatement.getPredicate().getData() + DELIM + ryaStatement.getObject().getData(); final String subjobj = ryaStatement.getSubject().getData() + DELIM + ryaStatement.getObject().getData(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectMapperTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectMapperTest.java b/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectMapperTest.java index 8b428a5..126dbc4 100644 --- a/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectMapperTest.java +++ b/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectMapperTest.java @@ -31,7 +31,7 @@ import org.apache.rya.joinselect.mr.utils.TripleEntry; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; 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.triple.TripleRow; import org.apache.rya.api.resolver.triple.TripleRowResolver; import org.apache.rya.api.resolver.triple.TripleRowResolverException; @@ -51,7 +51,7 @@ public class JoinSelectMapperTest { @Test public void testOutput() throws TripleRowResolverException, IOException { - RyaStatement rya = new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("mydata1")); + RyaStatement rya = new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("mydata1")); Text s = new Text(rya.getSubject().getData()); Text p = new Text(rya.getPredicate().getData()); Text o = new Text(rya.getObject().getData());
