http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java index 0797033..611a141 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java @@ -28,7 +28,7 @@ import java.util.Set; 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.mongodb.MongoDBRdfConfiguration; @@ -61,8 +61,8 @@ public class MongoStatementMetadataIT extends MongoITBase { @Override protected void updateConfiguration(final MongoDBRdfConfiguration conf) { - final Set<RyaURI> propertySet = new HashSet<>( - Arrays.asList(new RyaURI("http://createdBy";), new RyaURI("http://createdOn";))); + final Set<RyaIRI> propertySet = new HashSet<>( + Arrays.asList(new RyaIRI("http://createdBy";), new RyaIRI("http://createdOn";))); conf.setUseStatementMetadata(true); conf.setStatementMetadataProperties(propertySet); } @@ -76,11 +76,11 @@ public class MongoStatementMetadataIT extends MongoITBase { dao.init(); final StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Joe")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - final RyaStatement statement = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); + final RyaStatement statement = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); dao.add(statement); SailRepositoryConnection conn = new SailRepository(sail).getConnection(); @@ -121,11 +121,11 @@ public class MongoStatementMetadataIT extends MongoITBase { dao.setConf(conf); dao.init(); final StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Doug")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-15")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Doug")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-15")); - final RyaStatement statement = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); + final RyaStatement statement = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); dao.add(statement); SailRepositoryConnection conn = new SailRepository(sail).getConnection(); @@ -151,13 +151,13 @@ public class MongoStatementMetadataIT extends MongoITBase { dao.setConf(conf); dao.init(); final StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Joe")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - final RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); - final RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata); + final RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); + final RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata); dao.add(statement1); dao.add(statement2); @@ -210,20 +210,20 @@ public class MongoStatementMetadataIT extends MongoITBase { dao.setConf(conf); dao.init(); final StatementMetadata metadata1 = new StatementMetadata(); - metadata1.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Doug";)); - metadata1.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata1.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Doug";)); + metadata1.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); final StatementMetadata metadata2 = new StatementMetadata(); - metadata2.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Bob";)); - metadata2.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); + metadata2.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Bob";)); + metadata2.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); - final RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaURI("http://BurgerShack";), new RyaURI("http://context";), "", metadata1); - final RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://talksTo";), - new RyaURI("http://Betty";), new RyaURI("http://context";), "", metadata1); - final RyaStatement statement3 = new RyaStatement(new RyaURI("http://Fred";), new RyaURI("http://talksTo";), - new RyaURI("http://Amanda";), new RyaURI("http://context";), "", metadata1); - final RyaStatement statement4 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://talksTo";), - new RyaURI("http://Wanda";), new RyaURI("http://context";), "", metadata2); + final RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaIRI("http://BurgerShack";), new RyaIRI("http://context";), "", metadata1); + final RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://talksTo";), + new RyaIRI("http://Betty";), new RyaIRI("http://context";), "", metadata1); + final RyaStatement statement3 = new RyaStatement(new RyaIRI("http://Fred";), new RyaIRI("http://talksTo";), + new RyaIRI("http://Amanda";), new RyaIRI("http://context";), "", metadata1); + final RyaStatement statement4 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://talksTo";), + new RyaIRI("http://Wanda";), new RyaIRI("http://context";), "", metadata2); dao.add(statement1); dao.add(statement2); dao.add(statement3);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java index 20fa32d..4f06ace 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataNodeIT.java @@ -25,7 +25,7 @@ import java.util.Set; 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.indexing.statement.metadata.matching.StatementMetadataNode; import org.apache.rya.mongodb.MongoDBRdfConfiguration; @@ -56,7 +56,7 @@ public class MongoStatementMetadataNodeIT extends MongoITBase { @Before public void init() throws Exception { - final Set<RyaURI> propertySet = new HashSet<RyaURI>(Arrays.asList(new RyaURI("http://createdBy";), new RyaURI("http://createdOn";))); + final Set<RyaIRI> propertySet = new HashSet<RyaIRI>(Arrays.asList(new RyaIRI("http://createdBy";), new RyaIRI("http://createdOn";))); conf.setUseStatementMetadata(true); conf.setStatementMetadataProperties(propertySet); } @@ -68,11 +68,11 @@ public class MongoStatementMetadataNodeIT extends MongoITBase { dao.setConf(conf); dao.init(); StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Joe")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - RyaStatement statement = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); + RyaStatement statement = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); dao.add(statement); SPARQLParser parser = new SPARQLParser(); @@ -112,11 +112,11 @@ public class MongoStatementMetadataNodeIT extends MongoITBase { dao.init(); StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Doug")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-15")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Doug")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-15")); - RyaStatement statement = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); + RyaStatement statement = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); dao.add(statement); SPARQLParser parser = new SPARQLParser(); @@ -143,13 +143,13 @@ public class MongoStatementMetadataNodeIT extends MongoITBase { dao.setConf(conf); dao.init(); StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Joe")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata); dao.add(statement1); dao.add(statement2); @@ -200,13 +200,13 @@ public class MongoStatementMetadataNodeIT extends MongoITBase { dao.setConf(conf); dao.init(); StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Joe";)); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Joe";)); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata); dao.add(statement1); dao.add(statement2); @@ -263,11 +263,11 @@ public class MongoStatementMetadataNodeIT extends MongoITBase { dao.setConf(conf); dao.init(); StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Joe")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); dao.add(statement1); SPARQLParser parser = new SPARQLParser(); @@ -307,13 +307,13 @@ public class MongoStatementMetadataNodeIT extends MongoITBase { dao.setConf(conf); dao.init(); StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + metadata.addMetadata(new RyaIRI("http://createdBy";), new RyaType("Joe")); + metadata.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata); dao.add(statement1); dao.add(statement2); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java index c4318fb..b8b9eba 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.hadoop.conf.Configuration; import org.apache.rya.accumulo.AccumuloRdfConfiguration; 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.domain.VarNameUtils; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.external.matching.JoinSegment; @@ -61,8 +61,8 @@ public class StatementMetadataExternalSetProviderTest { public void createSingleAccumuloMetadataNode() throws MalformedQueryException { AccumuloRdfConfiguration conf = (AccumuloRdfConfiguration) getConf(false); - Set<RyaURI> propertySet = new HashSet<>(); - propertySet.add(new RyaURI("http://createdBy";)); + Set<RyaIRI> propertySet = new HashSet<>(); + propertySet.add(new RyaIRI("http://createdBy";)); conf.setStatementMetadataProperties(propertySet); StatementMetadataExternalSetProvider metaProvider = new StatementMetadataExternalSetProvider( conf); @@ -88,8 +88,8 @@ public class StatementMetadataExternalSetProviderTest { public void createSingleMongoMetadataNode() throws MalformedQueryException { MongoDBRdfConfiguration conf = (MongoDBRdfConfiguration) getConf(true); - Set<RyaURI> propertySet = new HashSet<>(); - propertySet.add(new RyaURI("http://createdBy";)); + Set<RyaIRI> propertySet = new HashSet<>(); + propertySet.add(new RyaIRI("http://createdBy";)); conf.setStatementMetadataProperties(propertySet); StatementMetadataExternalSetProvider metaProvider = new StatementMetadataExternalSetProvider(conf); SPARQLParser parser = new SPARQLParser(); @@ -115,9 +115,9 @@ public class StatementMetadataExternalSetProviderTest { public void createMultipleMetadataNode() throws MalformedQueryException { MongoDBRdfConfiguration conf = (MongoDBRdfConfiguration) getConf(true); - Set<RyaURI> propertySet = new HashSet<>(); - propertySet.add(new RyaURI("http://createdBy";)); - propertySet.add(new RyaURI("http://createdOn";)); + Set<RyaIRI> propertySet = new HashSet<>(); + propertySet.add(new RyaIRI("http://createdBy";)); + propertySet.add(new RyaIRI("http://createdOn";)); conf.setStatementMetadataProperties(propertySet); StatementMetadataExternalSetProvider metaProvider = new StatementMetadataExternalSetProvider(conf); SPARQLParser parser = new SPARQLParser(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java index fba9652..5b6945f 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java @@ -30,7 +30,7 @@ import java.util.Set; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.external.matching.JoinSegment; import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataExternalSetProvider; @@ -128,8 +128,8 @@ public class StatementMetadataOptimizerTest { private static RdfCloudTripleStoreConfiguration getConf(boolean useMongo) { RdfCloudTripleStoreConfiguration conf; - Set<RyaURI> propertySet = new HashSet<>( - Arrays.asList(new RyaURI("http://createdBy";), new RyaURI("http://createdOn";))); + Set<RyaIRI> propertySet = new HashSet<>( + Arrays.asList(new RyaIRI("http://createdBy";), new RyaIRI("http://createdOn";))); if (useMongo) { MongoDBRdfConfiguration mConf = new MongoDBRdfConfiguration(); mConf.setBoolean("sc.useMongo", true); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java index 51ea682..9c4cf6d 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataTestUtils.java @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.statement.metadata.matching.OWLReify; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Value; @@ -37,9 +37,9 @@ import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; public class StatementMetadataTestUtils { - private static final List<RyaURI> uriList = Arrays.asList(new RyaURI(RDF.TYPE.toString()), - new RyaURI(OWLReify.SOURCE.toString()), new RyaURI(OWLReify.PROPERTY.toString()), - new RyaURI(OWLReify.TARGET.toString())); + private static final List<RyaIRI> uriList = Arrays.asList(new RyaIRI(RDF.TYPE.toString()), + new RyaIRI(OWLReify.SOURCE.toString()), new RyaIRI(OWLReify.PROPERTY.toString()), + new RyaIRI(OWLReify.TARGET.toString())); public static Set<QueryModelNode> getMetadataNodes(TupleExpr query) { MetadataNodeCollector collector = new MetadataNodeCollector(); @@ -64,7 +64,7 @@ public class StatementMetadataTestUtils { } } - public static Set<StatementPattern> getMetadataStatementPatterns(TupleExpr te, Set<RyaURI> properties) { + public static Set<StatementPattern> getMetadataStatementPatterns(TupleExpr te, Set<RyaIRI> properties) { MetadataStatementPatternCollector collector = new MetadataStatementPatternCollector(properties); te.visit(collector); return collector.getNodes(); @@ -74,9 +74,9 @@ public class StatementMetadataTestUtils { public static class MetadataStatementPatternCollector extends AbstractQueryModelVisitor<RuntimeException> { private Set<StatementPattern> nodes; - private Set<RyaURI> properties; + private Set<RyaIRI> properties; - public MetadataStatementPatternCollector(Set<RyaURI> properties) { + public MetadataStatementPatternCollector(Set<RyaIRI> properties) { this.properties = properties; nodes = new HashSet<>(); } @@ -86,7 +86,7 @@ public class StatementMetadataTestUtils { Var predicate = node.getPredicateVar(); Value val = predicate.getValue(); if (val != null && val instanceof IRI) { - RyaURI ryaVal = new RyaURI(val.stringValue()); + RyaIRI ryaVal = new RyaIRI(val.stringValue()); if (uriList.contains(ryaVal) || properties.contains(ryaVal)) { nodes.add(node); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexingExample/src/main/java/StatementMetadataExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/StatementMetadataExample.java b/extras/indexingExample/src/main/java/StatementMetadataExample.java index 9f0afc9..56e8581 100644 --- a/extras/indexingExample/src/main/java/StatementMetadataExample.java +++ b/extras/indexingExample/src/main/java/StatementMetadataExample.java @@ -34,7 +34,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO; 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.domain.StatementMetadata; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.indexing.accumulo.ConfigUtils; @@ -111,25 +111,25 @@ public class StatementMetadataExample { + "_:blankNode <http://createdOn> ?z }\n"; StatementMetadata metadata1 = new StatementMetadata(); - metadata1.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Dave";)); - metadata1.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-02")); + metadata1.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Dave";)); + metadata1.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-02")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata1); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata1); StatementMetadata metadata2 = new StatementMetadata(); - metadata2.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Dave";)); - metadata2.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); + metadata2.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Dave";)); + metadata2.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata2); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata2); StatementMetadata metadata3 = new StatementMetadata(); - metadata3.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Fred";)); - metadata3.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-03-08")); + metadata3.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Fred";)); + metadata3.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-03-08")); - RyaStatement statement3 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("Library"), new RyaURI("http://context";), "", metadata3); + RyaStatement statement3 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("Library"), new RyaIRI("http://context";), "", metadata3); // add statements for querying dao.add(statement1); @@ -176,12 +176,12 @@ public class StatementMetadataExample { + "_:blankNode <http://hasTimeStamp> ?y }\n"; StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://hasTimeStamp";), new RyaType(XMLSchema.TIME, "09:30:10.5")); + metadata.addMetadata(new RyaIRI("http://hasTimeStamp";), new RyaType(XMLSchema.TIME, "09:30:10.5")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Doug";), new RyaURI("http://travelsTo";), - new RyaURI("http://NewMexico";), new RyaURI("http://context";), "", metadata); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://NewMexico";), new RyaURI("http://locatedWithin";), - new RyaType("http://UnitedStates";), new RyaURI("http://context";), "", new StatementMetadata()); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Doug";), new RyaIRI("http://travelsTo";), + new RyaIRI("http://NewMexico";), new RyaIRI("http://context";), "", metadata); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://NewMexico";), new RyaIRI("http://locatedWithin";), + new RyaType("http://UnitedStates";), new RyaIRI("http://context";), "", new StatementMetadata()); // add statements for querying dao.add(statement1); @@ -223,25 +223,25 @@ public class StatementMetadataExample { + "_:blankNode <http://createdOn> '2017-02-04'^^xsd:date }\n"; StatementMetadata metadata1 = new StatementMetadata(); - metadata1.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Dave";)); - metadata1.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-02")); + metadata1.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Dave";)); + metadata1.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-02")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata1); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata1); StatementMetadata metadata2 = new StatementMetadata(); - metadata2.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Dave";)); - metadata2.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); + metadata2.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Dave";)); + metadata2.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata2); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata2); StatementMetadata metadata3 = new StatementMetadata(); - metadata3.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Fred";)); - metadata3.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-03-08")); + metadata3.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Fred";)); + metadata3.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-03-08")); - RyaStatement statement3 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("Library"), new RyaURI("http://context";), "", metadata3); + RyaStatement statement3 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("Library"), new RyaIRI("http://context";), "", metadata3); // add statements for querying dao.add(statement1); @@ -293,32 +293,32 @@ public class StatementMetadataExample { + "_:blankNode2 <http://createdOn> ?a }\n"; StatementMetadata metadata1 = new StatementMetadata(); - metadata1.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Dave";)); - metadata1.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-02")); + metadata1.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Dave";)); + metadata1.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-02")); - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata1); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context";), "", metadata1); StatementMetadata metadata2 = new StatementMetadata(); - metadata2.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Dave";)); - metadata2.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); + metadata2.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Dave";)); + metadata2.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata2); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata2); StatementMetadata metadata3 = new StatementMetadata(); - metadata3.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Fred";)); - metadata3.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-03-08")); + metadata3.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Fred";)); + metadata3.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-03-08")); - RyaStatement statement3 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("Library"), new RyaURI("http://context";), "", metadata3); + RyaStatement statement3 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("Library"), new RyaIRI("http://context";), "", metadata3); StatementMetadata metadata4 = new StatementMetadata(); - metadata4.addMetadata(new RyaURI("http://createdBy";), new RyaURI("http://Dave";)); - metadata4.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-04-16")); + metadata4.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Dave";)); + metadata4.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-04-16")); - RyaStatement statement4 = new RyaStatement(new RyaURI("http://Bob";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context";), "", metadata4); + RyaStatement statement4 = new RyaStatement(new RyaIRI("http://Bob";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context";), "", metadata4); // add statements for querying dao.add(statement1); @@ -351,8 +351,8 @@ public class StatementMetadataExample { private static AccumuloRdfConfiguration getConf() { AccumuloRdfConfiguration conf; - Set<RyaURI> propertySet = new HashSet<RyaURI>(Arrays.asList(new RyaURI("http://createdBy";), - new RyaURI("http://createdOn";), new RyaURI("http://hasTimeStamp";))); + Set<RyaIRI> propertySet = new HashSet<RyaIRI>(Arrays.asList(new RyaIRI("http://createdBy";), + new RyaIRI("http://createdOn";), new RyaIRI("http://hasTimeStamp";))); conf = new AccumuloRdfConfiguration(); conf.setDisplayQueryPlan(false); conf.setBoolean(ConfigUtils.USE_MOCK_INSTANCE, true); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java index 090d22f..7e8125c 100644 --- a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java +++ b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java @@ -54,7 +54,7 @@ import org.apache.rya.accumulo.mr.MRUtils; import org.apache.rya.api.RdfCloudTripleStoreConstants; 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.persist.RyaDAOException; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaTripleContext; @@ -89,41 +89,41 @@ public final class AccumuloRyaUtils { } /** - * Creates a {@link RyaURI} for the specified local name. - * @param localName the URI's local name. - * @return the {@link RyaURI}. + * 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 RyaURI}. + * @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)); } /** - * Converts a {@link RyaURI} to the contained data string. - * @param the {@link RyaURI} to convert. + * Converts a {@link RyaIRI} to the contained data string. + * @param ryaIri the {@link RyaIRI} to convert. * @return the data value without the namespace. */ - public static String convertRyaUriToString(final RyaURI ryaUri) { - return convertRyaUriToString(NAMESPACE, ryaUri); + public static String convertRyaIriToString(final RyaIRI ryaIri) { + return convertRyaIriToString(NAMESPACE, ryaIri); } /** - * Converts a {@link RyaURI} to the contained data string. + * Converts a {@link RyaIRI} to the contained data string. * @param namespace the namespace. - * @param the {@link RyaURI} to convert. + * @param ryaIri the {@link RyaIRI} to convert. * @return the data value without the namespace. */ - public static String convertRyaUriToString(final String namespace, final RyaURI ryaUri) { - return StringUtils.replaceOnce(ryaUri.getData(), namespace, ""); + public static String convertRyaIriToString(final String namespace, final RyaIRI ryaIri) { + return StringUtils.replaceOnce(ryaIri.getData(), namespace, ""); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStoreTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStoreTest.java b/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStoreTest.java index 7c2ff83..cdbd0a6 100644 --- a/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStoreTest.java +++ b/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStoreTest.java @@ -272,10 +272,10 @@ public class AccumuloRyaStatementStoreTest { assertEquals(firstRyaStatement, updatedRyaStatement); - final String subject = TestUtils.convertRyaUriToString(updatedRyaStatement.getSubject()); - final String predicate = TestUtils.convertRyaUriToString(updatedRyaStatement.getPredicate()); - updatedRyaStatement.setSubject(TestUtils.createRyaUri(subject + "_UPDATED")); - updatedRyaStatement.setPredicate(TestUtils.createRyaUri(predicate + "_UPDATED")); + final String subject = TestUtils.convertRyaIriToString(updatedRyaStatement.getSubject()); + final String predicate = TestUtils.convertRyaIriToString(updatedRyaStatement.getPredicate()); + updatedRyaStatement.setSubject(TestUtils.createRyaIri(subject + "_UPDATED")); + updatedRyaStatement.setPredicate(TestUtils.createRyaIri(predicate + "_UPDATED")); accumuloRyaStatementStore.updateStatement(firstRyaStatement, updatedRyaStatement); @@ -312,10 +312,10 @@ public class AccumuloRyaStatementStoreTest { assertEquals(firstRyaStatement, updatedRyaStatement); - final String subject = TestUtils.convertRyaUriToString(updatedRyaStatement.getSubject()); - final String predicate = TestUtils.convertRyaUriToString(updatedRyaStatement.getPredicate()); - updatedRyaStatement.setSubject(TestUtils.createRyaUri(subject + "_UPDATED")); - updatedRyaStatement.setPredicate(TestUtils.createRyaUri(predicate + "_UPDATED")); + final String subject = TestUtils.convertRyaIriToString(updatedRyaStatement.getSubject()); + final String predicate = TestUtils.convertRyaIriToString(updatedRyaStatement.getPredicate()); + updatedRyaStatement.setSubject(TestUtils.createRyaIri(subject + "_UPDATED")); + updatedRyaStatement.setPredicate(TestUtils.createRyaIri(predicate + "_UPDATED")); accumuloRyaStatementStore.updateStatement(firstRyaStatement, null); } @@ -333,10 +333,10 @@ public class AccumuloRyaStatementStoreTest { assertEquals(notFoundStatement, updatedRyaStatement); - final String subject = TestUtils.convertRyaUriToString(updatedRyaStatement.getSubject()); - final String predicate = TestUtils.convertRyaUriToString(updatedRyaStatement.getPredicate()); - updatedRyaStatement.setSubject(TestUtils.createRyaUri(subject + "_UPDATED")); - updatedRyaStatement.setPredicate(TestUtils.createRyaUri(predicate + "_UPDATED")); + final String subject = TestUtils.convertRyaIriToString(updatedRyaStatement.getSubject()); + final String predicate = TestUtils.convertRyaIriToString(updatedRyaStatement.getPredicate()); + updatedRyaStatement.setSubject(TestUtils.createRyaIri(subject + "_UPDATED")); + updatedRyaStatement.setPredicate(TestUtils.createRyaIri(predicate + "_UPDATED")); accumuloRyaStatementStore.updateStatement(notFoundStatement, updatedRyaStatement); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/TestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/TestUtils.java b/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/TestUtils.java index 34d1ba9..d0a00c6 100644 --- a/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/TestUtils.java +++ b/extras/rya.export/export.accumulo/src/test/java/org/apache/rya/export/accumulo/TestUtils.java @@ -21,7 +21,7 @@ package org.apache.rya.export.accumulo; import java.util.Date; 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.export.accumulo.util.AccumuloRyaUtils; /** @@ -31,22 +31,21 @@ public final class TestUtils { private static final String NAMESPACE = "#:"; /** - * 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); } /** - * Converts a {@link RyaURI} to the contained data string. - * @param namespace the namespace. - * @param the {@link RyaURI} to convert. + * Converts a {@link RyaIRI} to the contained data string. + * @param ryaIri the {@link RyaIRI} to convert. * @return the data value without the namespace. */ - public static String convertRyaUriToString(final RyaURI RyaUri) { - return AccumuloRyaUtils.convertRyaUriToString(NAMESPACE, RyaUri); + public static String convertRyaIriToString(final RyaIRI ryaIri) { + return AccumuloRyaUtils.convertRyaIriToString(NAMESPACE, ryaIri); } /** @@ -58,10 +57,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.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java index 83fd774..4b7d3f9 100644 --- a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java +++ b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java @@ -35,7 +35,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; 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; @@ -159,11 +159,11 @@ public abstract class ITBase { checkNotNull(predicate); checkNotNull(object); - final RyaStatementBuilder builder = RyaStatement.builder().setSubject(new RyaURI(subject)) - .setPredicate(new RyaURI(predicate)); + final RyaStatementBuilder builder = RyaStatement.builder().setSubject(new RyaIRI(subject)) + .setPredicate(new RyaIRI(predicate)); if (object.startsWith("http://";)) { - builder.setObject(new RyaURI(object)); + builder.setObject(new RyaIRI(object)); } else { builder.setObject(new RyaType(object)); } @@ -188,7 +188,7 @@ public abstract class ITBase { checkNotNull(subject); checkNotNull(predicate); - return RyaStatement.builder().setSubject(new RyaURI(subject)).setPredicate(new RyaURI(predicate)) + return RyaStatement.builder().setSubject(new RyaIRI(subject)).setPredicate(new RyaIRI(predicate)) .setObject(new RyaType(XMLSchema.INT, "" + object)).build(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java ---------------------------------------------------------------------- diff --git a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java index d4ae96f..5220ea5 100644 --- a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java +++ b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java @@ -20,7 +20,7 @@ package org.apache.rya.forwardchain; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaSchema; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.ValueFactory; @@ -32,6 +32,6 @@ public class ForwardChainConstants { public static final IRI DERIVATION_TIME = VF.createIRI(NAMESPACE, "forwardChainIteration"); public static final IRI DERIVATION_RULE = VF.createIRI(NAMESPACE, "forwardChainRule"); - public static final RyaURI RYA_DERIVATION_RULE = RdfToRyaConversions.convertURI(DERIVATION_RULE); - public static final RyaURI RYA_DERIVATION_TIME = RdfToRyaConversions.convertURI(DERIVATION_TIME); + public static final RyaIRI RYA_DERIVATION_RULE = RdfToRyaConversions.convertIRI(DERIVATION_RULE); + public static final RyaIRI RYA_DERIVATION_TIME = RdfToRyaConversions.convertIRI(DERIVATION_TIME); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/Event.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/Event.java b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/Event.java index 4c50bfb..13ea048 100644 --- a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/Event.java +++ b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/Event.java @@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull; import java.util.Objects; import java.util.Optional; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.TemporalInstant; import org.apache.rya.indexing.TemporalInterval; import org.apache.rya.indexing.geotemporal.GeoTemporalIndexer; @@ -42,7 +42,7 @@ public class Event { private final Optional<Geometry> geometry; private final Optional<TemporalInstant> instant; private final Optional<TemporalInterval> interval; - private final RyaURI subject; + private final RyaIRI subject; private final boolean isInstant; @@ -52,7 +52,7 @@ public class Event { * @param instant - The {@link TemporalInstant} to use when querying. * @param subject - The Subject that both statements must have when querying. */ - private Event(final Geometry geo, final TemporalInstant instant, final RyaURI subject) { + private Event(final Geometry geo, final TemporalInstant instant, final RyaIRI subject) { this.subject = requireNonNull(subject); //these fields are nullable since they are filled field by field. @@ -68,7 +68,7 @@ public class Event { * @param interval - The {@link TemporalInterval} to use when querying. * @param subject - The Subject that both statements must have when querying. */ - private Event(final Geometry geo, final TemporalInterval interval, final RyaURI subject) { + private Event(final Geometry geo, final TemporalInterval interval, final RyaIRI subject) { this.subject = requireNonNull(subject); //these fields are nullable since they are filled field by field. @@ -109,7 +109,7 @@ public class Event { /** * @return The statement subject. */ - public RyaURI getSubject() { + public RyaIRI getSubject() { return subject; } @@ -163,16 +163,16 @@ public class Event { */ @DefaultAnnotation(NonNull.class) public static class Builder { - private RyaURI subject; + private RyaIRI subject; private Geometry geo; private TemporalInstant instant; private TemporalInterval interval; /** - * Sets the {@link RyaURI} subject. + * Sets the {@link RyaIRI} subject. * @param subject - The subject to key on the event. */ - public Builder setSubject(final RyaURI subject) { + public Builder setSubject(final RyaIRI subject) { this.subject = subject; return this; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode.java b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode.java index 53d4b74..4110d43 100644 --- a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode.java +++ b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode.java @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.Set; import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.IndexingExpr; import org.apache.rya.indexing.TemporalInstant; import org.apache.rya.indexing.TemporalInstantRfc3339; @@ -179,7 +179,7 @@ public class EventQueryNode extends ExternalSet implements ExternalBatchingItera if(subjectConstant.isPresent()) { // if it is, fetch that value and then fetch the entity for the subject. subj = subjectConstant.get(); - searchEvents = eventStore.search(Optional.of(new RyaURI(subj)), Optional.of(geoFilters), Optional.of(temporalFilters)); + searchEvents = eventStore.search(Optional.of(new RyaIRI(subj)), Optional.of(geoFilters), Optional.of(temporalFilters)); } else { searchEvents = eventStore.search(Optional.empty(), Optional.of(geoFilters), Optional.of(temporalFilters)); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/storage/EventStorage.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/storage/EventStorage.java b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/storage/EventStorage.java index 47c18a0..5529960 100644 --- a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/storage/EventStorage.java +++ b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/geotemporal/storage/EventStorage.java @@ -21,7 +21,7 @@ package org.apache.rya.indexing.geotemporal.storage; import java.util.Collection; import java.util.Optional; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.IndexingExpr; import org.apache.rya.indexing.geotemporal.GeoTemporalIndexer; import org.apache.rya.indexing.geotemporal.model.Event; @@ -38,7 +38,7 @@ public interface EventStorage extends RyaObjectStorage<Event> { * @return The {@link Event}, if one exists for the subject. * @throws ObjectStorageException A problem occurred while fetching the Entity from the storage. */ - public Collection<Event> search(final Optional<RyaURI> subject, Optional<Collection<IndexingExpr>> geoFilters, Optional<Collection<IndexingExpr>> temporalFilters) throws ObjectStorageException; + public Collection<Event> search(final Optional<RyaIRI> subject, Optional<Collection<IndexingExpr>> geoFilters, Optional<Collection<IndexingExpr>> temporalFilters) throws ObjectStorageException; /** * Indicates a problem while interacting with an {@link EventStorage}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverter.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverter.java index 926f357..f44699d 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverter.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverter.java @@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull; import java.util.Date; import java.util.List; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.TemporalInstant; import org.apache.rya.indexing.TemporalInstantRfc3339; import org.apache.rya.indexing.TemporalInterval; @@ -97,7 +97,7 @@ public class EventDocumentConverter implements DocumentConverter<Event>{ final String subject = document.getString(SUBJECT); final Event.Builder builder = new Event.Builder() - .setSubject(new RyaURI(subject)); + .setSubject(new RyaIRI(subject)); if(document.containsKey(GEO_KEY)) { final Document geoObj = (Document) document.get(GEO_KEY); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventUpdater.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventUpdater.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventUpdater.java index 1c62407..e41f405 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventUpdater.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/EventUpdater.java @@ -22,7 +22,7 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.geotemporal.model.Event; import org.apache.rya.indexing.geotemporal.storage.EventStorage; import org.apache.rya.indexing.geotemporal.storage.EventStorage.EventStorageException; @@ -36,7 +36,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; * Performs update operations over an {@link EventStorage}. */ @DefaultAnnotation(NonNull.class) -public class EventUpdater implements MongoDocumentUpdater<RyaURI, Event>{ +public class EventUpdater implements MongoDocumentUpdater<RyaIRI, Event>{ private final EventStorage events; /** @@ -49,7 +49,7 @@ public class EventUpdater implements MongoDocumentUpdater<RyaURI, Event>{ } @Override - public Optional<Event> getOld(final RyaURI key) throws EventStorageException { + public Optional<Event> getOld(final RyaIRI key) throws EventStorageException { try { return events.get(key); } catch (final ObjectStorageException e) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorage.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorage.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorage.java index 9c13c8b..d7b1850 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorage.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorage.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.IndexingExpr; import org.apache.rya.indexing.entity.model.TypedEntity; import org.apache.rya.indexing.entity.storage.mongo.DocumentConverter.DocumentConverterException; @@ -100,7 +100,7 @@ public class MongoEventStorage implements EventStorage { } @Override - public Optional<Event> get(final RyaURI subject) throws EventStorageException { + public Optional<Event> get(final RyaIRI subject) throws EventStorageException { requireNonNull(subject); try { @@ -119,7 +119,7 @@ public class MongoEventStorage implements EventStorage { } @Override - public Collection<Event> search(final Optional<RyaURI> subject, final Optional<Collection<IndexingExpr>> geoFilters, final Optional<Collection<IndexingExpr>> temporalFilters) throws EventStorageException { + public Collection<Event> search(final Optional<RyaIRI> subject, final Optional<Collection<IndexingExpr>> geoFilters, final Optional<Collection<IndexingExpr>> temporalFilters) throws EventStorageException { requireNonNull(subject); try { @@ -174,7 +174,7 @@ public class MongoEventStorage implements EventStorage { } @Override - public boolean delete(final RyaURI subject) throws EventStorageException { + public boolean delete(final RyaIRI subject) throws EventStorageException { requireNonNull(subject); try { @@ -189,7 +189,7 @@ public class MongoEventStorage implements EventStorage { } } - private static Bson makeSubjectFilter(final RyaURI subject) { + private static Bson makeSubjectFilter(final RyaIRI subject) { return Filters.eq(EventDocumentConverter.SUBJECT, subject.getData()); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java index bc836bd..4e53481 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geotemporal/mongo/MongoGeoTemporalIndexer.java @@ -30,7 +30,7 @@ import java.util.regex.Matcher; import org.apache.hadoop.conf.Configuration; 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.resolver.RyaToRdfConversions; import org.apache.rya.indexing.GeoConstants; import org.apache.rya.indexing.TemporalInstant; @@ -112,7 +112,7 @@ public class MongoGeoTemporalIndexer extends AbstractMongoIndexer<GeoTemporalMon @Override public void deleteStatement(final RyaStatement statement) throws IOException { requireNonNull(statement); - final RyaURI subject = statement.getSubject(); + final RyaIRI subject = statement.getSubject(); try { final EventStorage eventStore = events.get(); checkState(events != null, "Must set this indexers configuration before storing statements."); @@ -161,7 +161,7 @@ public class MongoGeoTemporalIndexer extends AbstractMongoIndexer<GeoTemporalMon } } - private void updateEvent(final RyaURI subject, final RyaStatement statement) throws IndexingException, ParseException { + private void updateEvent(final RyaIRI subject, final RyaStatement statement) throws IndexingException, ParseException { final EventStorage eventStore = events.get(); checkState(events != null, "Must set this indexers configuration before storing statements."); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java index 316117b..f49252a 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/MongoGeoTemporalIndexIT.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.GeoConstants; import org.apache.rya.indexing.GeoRyaSailFactory; import org.apache.rya.indexing.TemporalInstantRfc3339; @@ -70,7 +70,7 @@ public class MongoGeoTemporalIndexIT extends MongoITBase { addStatements(repo.getConnection()); final EventStorage events = indexer.getEventStorage(); - final RyaURI subject = new RyaURI("urn:event1"); + final RyaIRI subject = new RyaIRI("urn:event1"); final Optional<Event> event = events.get(subject); assertTrue(event.isPresent()); } finally { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java index cfcb513..e27b720 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/model/EventQueryNode2IT.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.IndexingExpr; import org.apache.rya.indexing.IndexingFunctionRegistry; import org.apache.rya.indexing.IndexingFunctionRegistry.FUNCTION_TYPE; @@ -114,7 +114,7 @@ public class EventQueryNode2IT extends MongoITBase { @Test public void evaluate_constantSubject() throws Exception { final EventStorage storage = new MongoEventStorage(super.getMongoClient(), "testDB"); - RyaURI subject = new RyaURI("urn:event-1111"); + RyaIRI subject = new RyaIRI("urn:event-1111"); final Geometry geo = GF.createPoint(new Coordinate(1, 1)); final TemporalInstant temp = new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0); final Event event = Event.builder() @@ -123,7 +123,7 @@ public class EventQueryNode2IT extends MongoITBase { .setTemporalInstant(temp) .build(); - subject = new RyaURI("urn:event-2222"); + subject = new RyaIRI("urn:event-2222"); final Event otherEvent = Event.builder() .setSubject(subject) .setGeometry(geo) @@ -163,7 +163,7 @@ public class EventQueryNode2IT extends MongoITBase { @Test public void evaluate_variableSubject() throws Exception { final EventStorage storage = new MongoEventStorage(super.getMongoClient(), "testDB"); - RyaURI subject = new RyaURI("urn:event-1111"); + RyaIRI subject = new RyaIRI("urn:event-1111"); Geometry geo = GF.createPoint(new Coordinate(1, 1)); final TemporalInstant temp = new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0); final Event event = Event.builder() @@ -172,7 +172,7 @@ public class EventQueryNode2IT extends MongoITBase { .setTemporalInstant(temp) .build(); - subject = new RyaURI("urn:event-2222"); + subject = new RyaIRI("urn:event-2222"); geo = GF.createPoint(new Coordinate(-1, -1)); final Event otherEvent = Event.builder() .setSubject(subject) @@ -217,7 +217,7 @@ public class EventQueryNode2IT extends MongoITBase { @Test public void evaluate_variableSubject_existingBindingset() throws Exception { final EventStorage storage = new MongoEventStorage(super.getMongoClient(), "testDB"); - RyaURI subject = new RyaURI("urn:event-1111"); + RyaIRI subject = new RyaIRI("urn:event-1111"); Geometry geo = GF.createPoint(new Coordinate(1, 1)); final TemporalInstant temp = new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0); final Event event = Event.builder() @@ -226,7 +226,7 @@ public class EventQueryNode2IT extends MongoITBase { .setTemporalInstant(temp) .build(); - subject = new RyaURI("urn:event-2222"); + subject = new RyaIRI("urn:event-2222"); geo = GF.createPoint(new Coordinate(-1, -1)); final Event otherEvent = Event.builder() .setSubject(subject) @@ -269,7 +269,7 @@ public class EventQueryNode2IT extends MongoITBase { @Test public void evaluate_variableSubject_existingBindingsetWrongFilters() throws Exception { final EventStorage storage = new MongoEventStorage(super.getMongoClient(), "testDB"); - RyaURI subject = new RyaURI("urn:event-1111"); + RyaIRI subject = new RyaIRI("urn:event-1111"); Geometry geo = GF.createPoint(new Coordinate(1, 1)); final TemporalInstant temp = new TemporalInstantRfc3339(2015, 12, 30, 12, 00, 0); final Event event = Event.builder() @@ -278,7 +278,7 @@ public class EventQueryNode2IT extends MongoITBase { .setTemporalInstant(temp) .build(); - subject = new RyaURI("urn:event-2222"); + subject = new RyaIRI("urn:event-2222"); geo = GF.createPoint(new Coordinate(-10, -10)); final Event otherEvent = Event.builder() .setSubject(subject) @@ -319,11 +319,11 @@ public class EventQueryNode2IT extends MongoITBase { final List<StatementPattern> sps = getSps(query); final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { - final IRI filterURI = VF.createIRI(filter.getURI()); - final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(filterURI, filter.getArgs()); + final IRI filterIRI = VF.createIRI(filter.getURI()); + final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(filterIRI, filter.getArgs()); final Value[] arguments = extractArguments(objVar.getName(), filter); - final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), Arrays.stream(arguments).toArray()); - if(IndexingFunctionRegistry.getFunctionType(filterURI) == FUNCTION_TYPE.GEO) { + final IndexingExpr expr = new IndexingExpr(filterIRI, sps.get(0), Arrays.stream(arguments).toArray()); + if(IndexingFunctionRegistry.getFunctionType(filterIRI) == FUNCTION_TYPE.GEO) { geoFilters.add(expr); } else { temporalFilters.add(expr); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverterTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverterTest.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverterTest.java index 3f2f9d5..fa6ce85 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverterTest.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/EventDocumentConverterTest.java @@ -20,7 +20,7 @@ package org.apache.rya.indexing.geotemporal.mongo; import static org.junit.Assert.assertEquals; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.TemporalInstant; import org.apache.rya.indexing.TemporalInstantRfc3339; import org.apache.rya.indexing.entity.storage.mongo.DocumentConverter.DocumentConverterException; @@ -48,7 +48,7 @@ public class EventDocumentConverterTest { // An Event that will be stored. final Event event = Event.builder() - .setSubject(new RyaURI("urn:event/001")) + .setSubject(new RyaIRI("urn:event/001")) .setGeometry(geo) .setTemporalInstant(instant) .build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java index f18b1da..b50fddb 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/GeoTemporalMongoDBStorageStrategyTest.java @@ -315,11 +315,11 @@ public class GeoTemporalMongoDBStorageStrategyTest { final List<StatementPattern> sps = getSps(query); final List<FunctionCall> filters = getFilters(query); for(final FunctionCall filter : filters) { - final IRI filterURI = VF.createIRI(filter.getURI()); - final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(filterURI, filter.getArgs()); + final IRI filterIRI = VF.createIRI(filter.getURI()); + final Var objVar = IndexingFunctionRegistry.getResultVarFromFunctionCall(filterIRI, filter.getArgs()); final Value[] arguments = extractArguments(objVar.getName(), filter); - final IndexingExpr expr = new IndexingExpr(filterURI, sps.get(0), Arrays.stream(arguments).toArray()); - if(IndexingFunctionRegistry.getFunctionType(filterURI) == FUNCTION_TYPE.GEO) { + final IndexingExpr expr = new IndexingExpr(filterIRI, sps.get(0), Arrays.stream(arguments).toArray()); + if(IndexingFunctionRegistry.getFunctionType(filterIRI) == FUNCTION_TYPE.GEO) { geoFilters.add(expr); } else { temporalFilters.add(expr); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorageIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorageIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorageIT.java index c7d8a81..a10f05e 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorageIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/geotemporal/mongo/MongoEventStorageIT.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; import java.util.Optional; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.TemporalInstant; import org.apache.rya.indexing.TemporalInstantRfc3339; import org.apache.rya.indexing.geotemporal.model.Event; @@ -55,7 +55,7 @@ public class MongoEventStorageIT extends MongoITBase { // An Event that will be stored. final Event event = Event.builder() - .setSubject(new RyaURI("urn:event/001")) + .setSubject(new RyaIRI("urn:event/001")) .setGeometry(geo) .setTemporalInstant(instant) .build(); @@ -65,7 +65,7 @@ public class MongoEventStorageIT extends MongoITBase { storage.create(event); // Get it. - final Optional<Event> storedEvent = storage.get(new RyaURI("urn:event/001")); + final Optional<Event> storedEvent = storage.get(new RyaIRI("urn:event/001")); // Verify the correct value was returned. assertEquals(event, storedEvent.get()); @@ -78,7 +78,7 @@ public class MongoEventStorageIT extends MongoITBase { // An Event that will be stored. final Event event = Event.builder() - .setSubject(new RyaURI("urn:event/001")) + .setSubject(new RyaIRI("urn:event/001")) .setGeometry(geo) .setTemporalInstant(instant) .build(); @@ -101,7 +101,7 @@ public class MongoEventStorageIT extends MongoITBase { public void get_noneExisting() throws Exception { // Get a Type that hasn't been created. final EventStorage storage = new MongoEventStorage(super.getMongoClient(), RYA_INSTANCE_NAME); - final Optional<Event> storedEvent = storage.get(new RyaURI("urn:event/000")); + final Optional<Event> storedEvent = storage.get(new RyaIRI("urn:event/000")); // Verify nothing was returned. assertFalse(storedEvent.isPresent()); @@ -114,7 +114,7 @@ public class MongoEventStorageIT extends MongoITBase { // An Event that will be stored. final Event event = Event.builder() - .setSubject(new RyaURI("urn:event/002")) + .setSubject(new RyaIRI("urn:event/002")) .setGeometry(geo) .setTemporalInstant(instant) .build(); @@ -124,7 +124,7 @@ public class MongoEventStorageIT extends MongoITBase { storage.create(event); // Delete it. - final boolean deleted = storage.delete( new RyaURI("urn:event/002") ); + final boolean deleted = storage.delete( new RyaIRI("urn:event/002") ); // Verify a document was deleted. assertTrue( deleted ); @@ -134,7 +134,7 @@ public class MongoEventStorageIT extends MongoITBase { public void delete_nonExisting() throws Exception { // Delete an Event that has not been created. final EventStorage storage = new MongoEventStorage(super.getMongoClient(), RYA_INSTANCE_NAME); - final boolean deleted = storage.delete( new RyaURI("urn:event/003") ); + final boolean deleted = storage.delete( new RyaIRI("urn:event/003") ); // Verify no document was deleted. assertFalse( deleted ); @@ -148,7 +148,7 @@ public class MongoEventStorageIT extends MongoITBase { // An Event that will be stored. final Event event = Event.builder() - .setSubject(new RyaURI("urn:event/004")) + .setSubject(new RyaIRI("urn:event/004")) .setGeometry(geo) .setTemporalInstant(instant) .build(); @@ -156,7 +156,7 @@ public class MongoEventStorageIT extends MongoITBase { storage.create(event); // Show Alice was stored. - Optional<Event> latest = storage.get(new RyaURI("urn:event/004")); + Optional<Event> latest = storage.get(new RyaIRI("urn:event/004")); assertEquals(event, latest.get()); instant = new TemporalInstantRfc3339(DateTime.now()); @@ -168,7 +168,7 @@ public class MongoEventStorageIT extends MongoITBase { storage.update(event, updated); // Fetch the Alice object and ensure it has the new value. - latest = storage.get(new RyaURI("urn:event/004")); + latest = storage.get(new RyaIRI("urn:event/004")); assertEquals(updated, latest.get()); } @@ -181,13 +181,13 @@ public class MongoEventStorageIT extends MongoITBase { // Two objects that do not have the same Subjects. final Event old = Event.builder() - .setSubject(new RyaURI("urn:event/001")) + .setSubject(new RyaIRI("urn:event/001")) .setGeometry(geo) .setTemporalInstant(instant) .build(); final Event updated = Event.builder() - .setSubject(new RyaURI("urn:event/002")) + .setSubject(new RyaIRI("urn:event/002")) .setGeometry(geo) .setTemporalInstant(instant) .build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.giraph/src/test/java/org/apache/rya/giraph/format/TestVertexFormat.java ---------------------------------------------------------------------- diff --git a/extras/rya.giraph/src/test/java/org/apache/rya/giraph/format/TestVertexFormat.java b/extras/rya.giraph/src/test/java/org/apache/rya/giraph/format/TestVertexFormat.java index 920e876..25aafee 100644 --- a/extras/rya.giraph/src/test/java/org/apache/rya/giraph/format/TestVertexFormat.java +++ b/extras/rya.giraph/src/test/java/org/apache/rya/giraph/format/TestVertexFormat.java @@ -34,7 +34,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; 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.giraph.format.RyaVertexInputFormat; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.sail.config.RyaSailFactory; @@ -83,18 +83,18 @@ public class TestVertexFormat extends BspCase { AccumuloRdfConfiguration conf = getConf(); AccumuloRyaDAO ryaDAO = RyaSailFactory.getAccumuloDAO(conf); - ryaDAO.add(new RyaStatement(new RyaURI("urn:test#1234"), - new RyaURI("urn:test#pred1"), - new RyaURI("urn:test#obj1"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:test#1234"), - new RyaURI("urn:test#pred2"), - new RyaURI("urn:test#obj2"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:test#1234"), - new RyaURI("urn:test#pred3"), - new RyaURI("urn:test#obj3"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:test#1234"), - new RyaURI("urn:test#pred4"), - new RyaURI("urn:test#obj4"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:test#1234"), + new RyaIRI("urn:test#pred1"), + new RyaIRI("urn:test#obj1"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:test#1234"), + new RyaIRI("urn:test#pred2"), + new RyaIRI("urn:test#obj2"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:test#1234"), + new RyaIRI("urn:test#pred3"), + new RyaIRI("urn:test#obj3"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:test#1234"), + new RyaIRI("urn:test#pred4"), + new RyaIRI("urn:test#obj4"))); ryaDAO.flush(); GiraphJob job = new GiraphJob(conf, getCallingMethodName());
