http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/entity/update/mongo/MongoEntityIndexerIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/update/mongo/MongoEntityIndexerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/update/mongo/MongoEntityIndexerIT.java index dd1644b..b9e74bc 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/entity/update/mongo/MongoEntityIndexerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/entity/update/mongo/MongoEntityIndexerIT.java @@ -24,7 +24,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.indexing.entity.model.Entity; import org.apache.rya.indexing.entity.model.Property; import org.apache.rya.indexing.entity.model.Type; @@ -46,18 +46,18 @@ import com.google.common.collect.Sets; public class MongoEntityIndexerIT extends MongoITBase { private static final Type PERSON_TYPE = - new Type(new RyaURI("urn:person"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:name")) - .add(new RyaURI("urn:age")) - .add(new RyaURI("urn:eye")) + new Type(new RyaIRI("urn:person"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:name")) + .add(new RyaIRI("urn:age")) + .add(new RyaIRI("urn:eye")) .build()); private static final Type EMPLOYEE_TYPE = - new Type(new RyaURI("urn:employee"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:name")) - .add(new RyaURI("urn:hoursPerWeek")) + new Type(new RyaIRI("urn:employee"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:name")) + .add(new RyaIRI("urn:hoursPerWeek")) .build()); @Test @@ -70,16 +70,16 @@ public class MongoEntityIndexerIT extends MongoITBase { types.create(PERSON_TYPE); // Index a RyaStatement that will create an Entity with an explicit type. - final RyaStatement statement = new RyaStatement(new RyaURI("urn:SSN/111-11-1111"), new RyaURI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")); + final RyaStatement statement = new RyaStatement(new RyaIRI("urn:SSN/111-11-1111"), new RyaIRI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")); indexer.storeStatement(statement); // Fetch the Entity from storage and ensure it looks correct. final EntityStorage entities = new MongoEntityStorage(getMongoClient(), conf.getRyaInstanceName()); - final Entity entity = entities.get(new RyaURI("urn:SSN/111-11-1111")).get(); + final Entity entity = entities.get(new RyaIRI("urn:SSN/111-11-1111")).get(); final Entity expected = Entity.builder() - .setSubject(new RyaURI("urn:SSN/111-11-1111")) - .setExplicitType(new RyaURI("urn:person")) + .setSubject(new RyaIRI("urn:SSN/111-11-1111")) + .setExplicitType(new RyaIRI("urn:person")) .build(); assertEquals(expected, entity); @@ -97,17 +97,17 @@ public class MongoEntityIndexerIT extends MongoITBase { types.create(EMPLOYEE_TYPE); // Index a RyaStatement that will create an Entity with two implicit types. - final RyaStatement statement = new RyaStatement(new RyaURI("urn:SSN/111-11-1111"), new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")); + final RyaStatement statement = new RyaStatement(new RyaIRI("urn:SSN/111-11-1111"), new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")); indexer.storeStatement(statement); // Fetch the Entity from storage and ensure it looks correct. final EntityStorage entities = new MongoEntityStorage(getMongoClient(), conf.getRyaInstanceName()); - final Entity entity = entities.get(new RyaURI("urn:SSN/111-11-1111")).get(); + final Entity entity = entities.get(new RyaIRI("urn:SSN/111-11-1111")).get(); final Entity expected = Entity.builder() - .setSubject(new RyaURI("urn:SSN/111-11-1111")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setSubject(new RyaIRI("urn:SSN/111-11-1111")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) .build(); assertEquals(expected, entity); @@ -125,23 +125,23 @@ public class MongoEntityIndexerIT extends MongoITBase { types.create(EMPLOYEE_TYPE); // Index a bunch of RyaStatements. - final RyaURI aliceSSN = new RyaURI("urn:SSN/111-11-1111"); - indexer.storeStatement(new RyaStatement(aliceSSN, new RyaURI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person"))); - indexer.storeStatement(new RyaStatement(aliceSSN, new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))); - indexer.storeStatement(new RyaStatement(aliceSSN, new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))); - indexer.storeStatement(new RyaStatement(aliceSSN, new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))); + final RyaIRI aliceSSN = new RyaIRI("urn:SSN/111-11-1111"); + indexer.storeStatement(new RyaStatement(aliceSSN, new RyaIRI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person"))); + indexer.storeStatement(new RyaStatement(aliceSSN, new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))); + indexer.storeStatement(new RyaStatement(aliceSSN, new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))); + indexer.storeStatement(new RyaStatement(aliceSSN, new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))); // Fetch the Entity from storage and ensure it looks correct. final EntityStorage entities = new MongoEntityStorage(getMongoClient(), conf.getRyaInstanceName()); - final Entity entity = entities.get(new RyaURI("urn:SSN/111-11-1111")).get(); + final Entity entity = entities.get(new RyaIRI("urn:SSN/111-11-1111")).get(); final Entity expected = Entity.builder() .setSubject(aliceSSN) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) .setVersion( entity.getVersion() ) .build(); @@ -160,18 +160,18 @@ public class MongoEntityIndexerIT extends MongoITBase { types.create(EMPLOYEE_TYPE); // Index a bunch of RyaStatements. - final RyaURI aliceSSN = new RyaURI("urn:SSN/111-11-1111"); - final RyaURI bobSSN = new RyaURI("urn:SSN/222-22-2222"); + final RyaIRI aliceSSN = new RyaIRI("urn:SSN/111-11-1111"); + final RyaIRI bobSSN = new RyaIRI("urn:SSN/222-22-2222"); indexer.storeStatements(Sets.newHashSet( - new RyaStatement(aliceSSN, new RyaURI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")), - new RyaStatement(aliceSSN, new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")), - new RyaStatement(aliceSSN, new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30")), - new RyaStatement(aliceSSN, new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")), + new RyaStatement(aliceSSN, new RyaIRI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")), + new RyaStatement(aliceSSN, new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")), + new RyaStatement(aliceSSN, new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30")), + new RyaStatement(aliceSSN, new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")), - new RyaStatement(bobSSN, new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Bob")), - new RyaStatement(bobSSN, new RyaURI("urn:hoursPerWeek"), new RyaType(XMLSchema.INT, "40")), - new RyaStatement(bobSSN, new RyaURI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:employee")))); + new RyaStatement(bobSSN, new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Bob")), + new RyaStatement(bobSSN, new RyaIRI("urn:hoursPerWeek"), new RyaType(XMLSchema.INT, "40")), + new RyaStatement(bobSSN, new RyaIRI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:employee")))); // Fetch the Entity from storage and ensure it looks correct. final EntityStorage entities = new MongoEntityStorage(getMongoClient(), conf.getRyaInstanceName()); @@ -182,19 +182,19 @@ public class MongoEntityIndexerIT extends MongoITBase { final Entity expectedAlice = Entity.builder() .setSubject(aliceSSN) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) .setVersion( alice.getVersion() ) .build(); final Entity expectedBob = Entity.builder() .setSubject(bobSSN) - .setExplicitType(new RyaURI("urn:employee")) - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:hoursPerWeek"), new RyaType(XMLSchema.INT, "40"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) + .setExplicitType(new RyaIRI("urn:employee")) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:hoursPerWeek"), new RyaType(XMLSchema.INT, "40"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Bob"))) .setVersion( bob.getVersion() ) .build(); final Set<Entity> expected = Sets.newHashSet(expectedAlice, expectedBob); @@ -214,27 +214,27 @@ public class MongoEntityIndexerIT extends MongoITBase { types.create(EMPLOYEE_TYPE); // Index a bunch of RyaStatements. - final RyaURI aliceSSN = new RyaURI("urn:SSN/111-11-1111"); + final RyaIRI aliceSSN = new RyaIRI("urn:SSN/111-11-1111"); indexer.storeStatements(Sets.newHashSet( - new RyaStatement(aliceSSN, new RyaURI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")), - new RyaStatement(aliceSSN, new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")), - new RyaStatement(aliceSSN, new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30")), - new RyaStatement(aliceSSN, new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")))); + new RyaStatement(aliceSSN, new RyaIRI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")), + new RyaStatement(aliceSSN, new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")), + new RyaStatement(aliceSSN, new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30")), + new RyaStatement(aliceSSN, new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")))); // Remove the explicit type from Alice. - indexer.deleteStatement(new RyaStatement(aliceSSN, new RyaURI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person"))); + indexer.deleteStatement(new RyaStatement(aliceSSN, new RyaIRI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person"))); // Fetch the Entity from storage and ensure it looks correct. final EntityStorage entities = new MongoEntityStorage(getMongoClient(), conf.getRyaInstanceName()); - final Entity entity = entities.get(new RyaURI("urn:SSN/111-11-1111")).get(); + final Entity entity = entities.get(new RyaIRI("urn:SSN/111-11-1111")).get(); final Entity expected = Entity.builder() .setSubject(aliceSSN) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) - .setProperty(new RyaURI("urn:employee"), new Property(new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setProperty(new RyaIRI("urn:employee"), new Property(new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))) .setVersion( entity.getVersion() ) .build(); @@ -253,26 +253,26 @@ public class MongoEntityIndexerIT extends MongoITBase { types.create(EMPLOYEE_TYPE); // Index a bunch of RyaStatements. - final RyaURI aliceSSN = new RyaURI("urn:SSN/111-11-1111"); + final RyaIRI aliceSSN = new RyaIRI("urn:SSN/111-11-1111"); indexer.storeStatements(Sets.newHashSet( - new RyaStatement(aliceSSN, new RyaURI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")), - new RyaStatement(aliceSSN, new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")), - new RyaStatement(aliceSSN, new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30")), - new RyaStatement(aliceSSN, new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")))); + new RyaStatement(aliceSSN, new RyaIRI( RDF.TYPE.toString() ), new RyaType(XMLSchema.ANYURI, "urn:person")), + new RyaStatement(aliceSSN, new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice")), + new RyaStatement(aliceSSN, new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30")), + new RyaStatement(aliceSSN, new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue")))); // Remove the name property from Alice. - indexer.deleteStatement(new RyaStatement(aliceSSN, new RyaURI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))); + indexer.deleteStatement(new RyaStatement(aliceSSN, new RyaIRI("urn:name"), new RyaType(XMLSchema.STRING, "Alice"))); // Fetch the Entity from storage and ensure it looks correct. final EntityStorage entities = new MongoEntityStorage(getMongoClient(), conf.getRyaInstanceName()); - final Entity entity = entities.get(new RyaURI("urn:SSN/111-11-1111")).get(); + final Entity entity = entities.get(new RyaIRI("urn:SSN/111-11-1111")).get(); final Entity expected = Entity.builder() .setSubject(aliceSSN) - .setExplicitType(new RyaURI("urn:person")) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:age"), new RyaType(XMLSchema.INT, "30"))) - .setProperty(new RyaURI("urn:person"), new Property(new RyaURI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) + .setExplicitType(new RyaIRI("urn:person")) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:age"), new RyaType(XMLSchema.INT, "30"))) + .setProperty(new RyaIRI("urn:person"), new Property(new RyaIRI("urn:eye"), new RyaType(XMLSchema.STRING, "blue"))) .setVersion( entity.getVersion() ) .build();
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java index 8d86a6d..db599ab 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoDbSmartUriIT.java @@ -27,7 +27,7 @@ import static org.apache.rya.api.domain.RyaTypeUtils.intRyaType; import static org.apache.rya.api.domain.RyaTypeUtils.longRyaType; import static org.apache.rya.api.domain.RyaTypeUtils.shortRyaType; import static org.apache.rya.api.domain.RyaTypeUtils.stringRyaType; -import static org.apache.rya.api.domain.RyaTypeUtils.uriRyaType; +import static org.apache.rya.api.domain.RyaTypeUtils.iriRyaType; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; 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.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.indexing.entity.model.Entity; @@ -79,35 +79,35 @@ public class MongoDbSmartUriIT extends MongoITBase { private static final ValueFactory VF = SimpleValueFactory.getInstance(); // People - private static final RyaURI BOB = createRyaUri("Bob"); + private static final RyaIRI BOB = createRyaIri("Bob"); // Attributes - private static final RyaURI HAS_WEIGHT = createRyaUri("hasWeight"); - private static final RyaURI HAS_HEIGHT = createRyaUri("hasHeight"); - private static final RyaURI HAS_SSN = createRyaUri("hasSSN"); - private static final RyaURI HAS_AGE = createRyaUri("hasAge"); - private static final RyaURI HAS_INCOME = createRyaUri("hasIncome"); - private static final RyaURI HAS_NUMBER_OF_CHILDREN = createRyaUri("hasNumberOfChildren"); - private static final RyaURI HAS_LICENSE_NUMBER = createRyaUri("hasLicenseNumber"); - private static final RyaURI HAS_EYE_COLOR = createRyaUri("hasEyeColor"); - private static final RyaURI HAS_HAIR_COLOR = createRyaUri("hasHairColor"); - private static final RyaURI HAS_DATE_OF_BIRTH = createRyaUri("hasDateOfBirth"); - private static final RyaURI HAS_EXPIRATION_DATE = createRyaUri("hasExpirationDate"); - private static final RyaURI HAS_GLASSES = createRyaUri("hasGlasses"); - private static final RyaURI HAS_EMAIL_ADDRESS = createRyaUri("hasEmailAddress"); - private static final RyaURI HAS_ATTRIBUTE_SPACE = createRyaUri("has Attribute Space"); - private static final RyaURI HAS_MOTTO = createRyaUri("hasMotto"); - private static final RyaURI HAS_BLOOD_TYPE = createRyaUri("hasBloodType"); - private static final RyaURI HAS_SEX = createRyaUri("hasSex"); - private static final RyaURI HAS_ADDRESS = createRyaUri("hasAddress"); - private static final RyaURI HAS_POSITION_TITLE = createRyaUri("hasPositionTitle"); - private static final RyaURI HAS_WORK_ADDRESS = createRyaUri("hasWorkAddress"); - private static final RyaURI HAS_EXTENSION = createRyaUri("hasExtension"); - private static final RyaURI HAS_OFFICE_ROOM_NUMBER = createRyaUri("hasOfficeRoomNumber"); + private static final RyaIRI HAS_WEIGHT = createRyaIri("hasWeight"); + private static final RyaIRI HAS_HEIGHT = createRyaIri("hasHeight"); + private static final RyaIRI HAS_SSN = createRyaIri("hasSSN"); + private static final RyaIRI HAS_AGE = createRyaIri("hasAge"); + private static final RyaIRI HAS_INCOME = createRyaIri("hasIncome"); + private static final RyaIRI HAS_NUMBER_OF_CHILDREN = createRyaIri("hasNumberOfChildren"); + private static final RyaIRI HAS_LICENSE_NUMBER = createRyaIri("hasLicenseNumber"); + private static final RyaIRI HAS_EYE_COLOR = createRyaIri("hasEyeColor"); + private static final RyaIRI HAS_HAIR_COLOR = createRyaIri("hasHairColor"); + private static final RyaIRI HAS_DATE_OF_BIRTH = createRyaIri("hasDateOfBirth"); + private static final RyaIRI HAS_EXPIRATION_DATE = createRyaIri("hasExpirationDate"); + private static final RyaIRI HAS_GLASSES = createRyaIri("hasGlasses"); + private static final RyaIRI HAS_EMAIL_ADDRESS = createRyaIri("hasEmailAddress"); + private static final RyaIRI HAS_ATTRIBUTE_SPACE = createRyaIri("has Attribute Space"); + private static final RyaIRI HAS_MOTTO = createRyaIri("hasMotto"); + private static final RyaIRI HAS_BLOOD_TYPE = createRyaIri("hasBloodType"); + private static final RyaIRI HAS_SEX = createRyaIri("hasSex"); + private static final RyaIRI HAS_ADDRESS = createRyaIri("hasAddress"); + private static final RyaIRI HAS_POSITION_TITLE = createRyaIri("hasPositionTitle"); + private static final RyaIRI HAS_WORK_ADDRESS = createRyaIri("hasWorkAddress"); + private static final RyaIRI HAS_EXTENSION = createRyaIri("hasExtension"); + private static final RyaIRI HAS_OFFICE_ROOM_NUMBER = createRyaIri("hasOfficeRoomNumber"); // Type URIs - private static final RyaURI PERSON_TYPE_URI = new RyaURI("urn:example/person"); - private static final RyaURI EMPLOYEE_TYPE_URI = new RyaURI("urn:example/employee"); + private static final RyaIRI PERSON_TYPE_URI = new RyaIRI("urn:example/person"); + private static final RyaIRI EMPLOYEE_TYPE_URI = new RyaIRI("urn:example/employee"); // Entities private static final Entity BOB_ENTITY = createBobEntity(); @@ -124,22 +124,22 @@ public class MongoDbSmartUriIT extends MongoITBase { } /** - * 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}. */ - private static RyaURI createRyaUri(final String localName) { - return createRyaUri(NAMESPACE, localName); + private 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}. */ - private static RyaURI createRyaUri(final String namespace, final String localName) { - return RdfToRyaConversions.convertURI(VF.createIRI(namespace, localName)); + private static RyaIRI createRyaIri(final String namespace, final String localName) { + return RdfToRyaConversions.convertIRI(VF.createIRI(namespace, localName)); } private static Entity createBobEntity() { @@ -159,7 +159,7 @@ public class MongoDbSmartUriIT extends MongoITBase { .setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime().minusYears(40)))) .setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date()))) .setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(true))) - .setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))) + .setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, iriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))) .setProperty(PERSON_TYPE_URI, new Property(HAS_ATTRIBUTE_SPACE, stringRyaType("attribute space"))) .setProperty(PERSON_TYPE_URI, new Property(HAS_MOTTO, stringRyaType("!@#*\\&%20^ smörgåsbord"))) .setProperty(PERSON_TYPE_URI, new Property(HAS_BLOOD_TYPE, stringRyaType("A+ blood type"))) @@ -176,7 +176,7 @@ public class MongoDbSmartUriIT extends MongoITBase { private static Type createPersonType() { final Type personType = new Type(PERSON_TYPE_URI, - ImmutableSet.<RyaURI>builder() + ImmutableSet.<RyaIRI>builder() .add(HAS_WEIGHT) .add(HAS_HEIGHT) .add(HAS_SSN) @@ -201,7 +201,7 @@ public class MongoDbSmartUriIT extends MongoITBase { private static Type createEmployeeType() { final Type employeeType = new Type(EMPLOYEE_TYPE_URI, - ImmutableSet.<RyaURI>builder() + ImmutableSet.<RyaIRI>builder() .add(HAS_POSITION_TITLE) .add(HAS_WORK_ADDRESS) .add(HAS_EXTENSION) @@ -210,8 +210,8 @@ public class MongoDbSmartUriIT extends MongoITBase { return employeeType; } - private static String getRyaUriLocalName(final RyaURI ryaUri) { - return VF.createIRI(ryaUri.getData()).getLocalName(); + private static String getRyaIriLocalName(final RyaIRI ryaIri) { + return VF.createIRI(ryaIri.getData()).getLocalName(); } @Test @@ -258,8 +258,8 @@ public class MongoDbSmartUriIT extends MongoITBase { smartUriConverter.storeEntity(BOB_ENTITY); // New properties to add - final RyaURI hasNickName = createRyaUri("hasNickName"); - final RyaURI hasWindowOffice = createRyaUri("hasWindowOffice"); + final RyaIRI hasNickName = createRyaIri("hasNickName"); + final RyaIRI hasWindowOffice = createRyaIri("hasWindowOffice"); final Entity.Builder builder = Entity.builder(BOB_ENTITY); builder.setProperty(PERSON_TYPE_URI, new Property(HAS_AGE, shortRyaType((short) 41))); @@ -281,8 +281,8 @@ public class MongoDbSmartUriIT extends MongoITBase { assertEquals(newBobEntity.lookupTypeProperty(EMPLOYEE_TYPE, hasWindowOffice), resultEntity.lookupTypeProperty(EMPLOYEE_TYPE, hasWindowOffice)); assertEquals(newBobEntity.getSmartUri(), resultEntity.getSmartUri()); final String resultUriString = resultEntity.getSmartUri().stringValue(); - assertTrue(resultUriString.contains(getRyaUriLocalName(hasWindowOffice))); - assertTrue(resultUriString.contains(getRyaUriLocalName(hasNickName))); + assertTrue(resultUriString.contains(getRyaIriLocalName(hasWindowOffice))); + assertTrue(resultUriString.contains(getRyaIriLocalName(hasNickName))); } @Test http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java index 3a38923..78da9cd 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndex2IT.java @@ -21,7 +21,7 @@ package org.apache.rya.indexing.mongo; import java.util.List; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.entity.EntityIndexOptimizer; import org.apache.rya.indexing.entity.model.Entity; import org.apache.rya.indexing.entity.model.Property; @@ -46,13 +46,13 @@ import com.google.common.collect.ImmutableSet; public class MongoEntityIndex2IT extends MongoITBase { private static final Type PERSON_TYPE = - new Type(new RyaURI("urn:person"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:name")) - .add(new RyaURI("urn:age")) - .add(new RyaURI("urn:eye")) + new Type(new RyaIRI("urn:person"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:name")) + .add(new RyaIRI("urn:age")) + .add(new RyaIRI("urn:eye")) .build()); - private static final RyaURI RYA_PERSON_TYPE = new RyaURI("urn:person"); + private static final RyaIRI RYA_PERSON_TYPE = new RyaIRI("urn:person"); private EntityIndexOptimizer optimizer; private EntityStorage entityStorage; @@ -66,11 +66,11 @@ public class MongoEntityIndex2IT extends MongoITBase { typeStorage.create(PERSON_TYPE); final Entity entity = Entity.builder() - .setSubject(new RyaURI("urn:SSN:111-11-1111")) + .setSubject(new RyaIRI("urn:SSN:111-11-1111")) .setExplicitType(RYA_PERSON_TYPE) - .setProperty(RYA_PERSON_TYPE, new Property(new RyaURI("urn:age"), new RyaType("25"))) - .setProperty(RYA_PERSON_TYPE, new Property(new RyaURI("urn:eye"), new RyaType("blue"))) - .setProperty(RYA_PERSON_TYPE, new Property(new RyaURI("urn:name"), new RyaType("bob"))) + .setProperty(RYA_PERSON_TYPE, new Property(new RyaIRI("urn:age"), new RyaType("25"))) + .setProperty(RYA_PERSON_TYPE, new Property(new RyaIRI("urn:eye"), new RyaType("blue"))) + .setProperty(RYA_PERSON_TYPE, new Property(new RyaIRI("urn:name"), new RyaType("bob"))) .build(); entityStorage = optimizer.getEntityStorage(); entityStorage.create(entity); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java index f49f274..3636448 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexIT.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.entity.model.Entity; import org.apache.rya.indexing.entity.model.Type; @@ -75,7 +75,7 @@ public class MongoEntityIndexIT extends MongoITBase { addStatements(conn); final EntityStorage entities = indexer.getEntityStorage(); - final RyaURI subject = new RyaURI("urn:alice"); + final RyaIRI subject = new RyaIRI("urn:alice"); final Optional<Entity> alice = entities.get(subject); assertTrue(alice.isPresent()); } finally { @@ -161,32 +161,32 @@ public class MongoEntityIndexIT extends MongoITBase { private void setupTypes(MongoEntityIndexer indexer) throws Exception { final TypeStorage typeStore = indexer.getTypeStorage(); // Add some Types to the storage. - final Type cat = new Type(new RyaURI("urn:cat"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:numLegs")) - .add(new RyaURI("urn:eye")) - .add(new RyaURI("urn:species")) + final Type cat = new Type(new RyaIRI("urn:cat"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:numLegs")) + .add(new RyaIRI("urn:eye")) + .add(new RyaIRI("urn:species")) .build()); - final Type dog = new Type(new RyaURI("urn:dog"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:numLegs")) - .add(new RyaURI("urn:eye")) - .add(new RyaURI("urn:species")) + final Type dog = new Type(new RyaIRI("urn:dog"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:numLegs")) + .add(new RyaIRI("urn:eye")) + .add(new RyaIRI("urn:species")) .build()); - final Type icecream = new Type(new RyaURI("urn:icecream"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:brand")) - .add(new RyaURI("urn:flavor")) - .add(new RyaURI("urn:cost")) + final Type icecream = new Type(new RyaIRI("urn:icecream"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:brand")) + .add(new RyaIRI("urn:flavor")) + .add(new RyaIRI("urn:cost")) .build()); - final Type person = new Type(new RyaURI("urn:person"), - ImmutableSet.<RyaURI>builder() - .add(new RyaURI("urn:name")) - .add(new RyaURI("urn:age")) - .add(new RyaURI("urn:eye")) + final Type person = new Type(new RyaIRI("urn:person"), + ImmutableSet.<RyaIRI>builder() + .add(new RyaIRI("urn:name")) + .add(new RyaIRI("urn:age")) + .add(new RyaIRI("urn:eye")) .build()); typeStore.create(cat); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java index d827f78..4d2c6ce 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerIT.java @@ -26,7 +26,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.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.indexing.StatementConstraints; @@ -126,20 +126,20 @@ public class MongoFreeTextIndexerIT extends MongoITBase { f.init(); // These should not be stored because they are not in the predicate list - f.storeStatement(new RyaStatement(new RyaURI("foo:subj1"), new RyaURI(RDFS.LABEL.toString()), new RyaType("invalid"))); - f.storeStatement(new RyaStatement(new RyaURI("foo:subj2"), new RyaURI(RDFS.COMMENT.toString()), new RyaType("invalid"))); + f.storeStatement(new RyaStatement(new RyaIRI("foo:subj1"), new RyaIRI(RDFS.LABEL.toString()), new RyaType("invalid"))); + f.storeStatement(new RyaStatement(new RyaIRI("foo:subj2"), new RyaIRI(RDFS.COMMENT.toString()), new RyaType("invalid"))); - final RyaURI pred1 = new RyaURI("pred:1"); - final RyaURI pred2 = new RyaURI("pred:2"); + final RyaIRI pred1 = new RyaIRI("pred:1"); + final RyaIRI pred2 = new RyaIRI("pred:2"); // These should be stored because they are in the predicate list - final RyaStatement s3 = new RyaStatement(new RyaURI("foo:subj3"), pred1, new RyaType("valid")); - final RyaStatement s4 = new RyaStatement(new RyaURI("foo:subj4"), pred2, new RyaType("valid")); + final RyaStatement s3 = new RyaStatement(new RyaIRI("foo:subj3"), pred1, new RyaType("valid")); + final RyaStatement s4 = new RyaStatement(new RyaIRI("foo:subj4"), pred2, new RyaType("valid")); f.storeStatement(s3); f.storeStatement(s4); // This should not be stored because the object is not a literal - f.storeStatement(new RyaStatement(new RyaURI("foo:subj5"), pred1, new RyaURI("in:validURI"))); + f.storeStatement(new RyaStatement(new RyaIRI("foo:subj5"), pred1, new RyaIRI("in:validURI"))); f.flush(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java index fa55df4..9d26914 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetectorIT.java @@ -28,7 +28,7 @@ import static org.apache.rya.api.domain.RyaTypeUtils.intRyaType; import static org.apache.rya.api.domain.RyaTypeUtils.longRyaType; import static org.apache.rya.api.domain.RyaTypeUtils.shortRyaType; import static org.apache.rya.api.domain.RyaTypeUtils.stringRyaType; -import static org.apache.rya.api.domain.RyaTypeUtils.uriRyaType; +import static org.apache.rya.api.domain.RyaTypeUtils.iriRyaType; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -47,7 +47,7 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.rya.api.domain.RyaSchema; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaTypeUtils; -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.entity.model.Entity; import org.apache.rya.indexing.entity.model.Entity.Builder; @@ -82,55 +82,55 @@ public class DuplicateDataDetectorIT extends MongoITBase { private static final ValueFactory VF = SimpleValueFactory.getInstance(); // People - private static final RyaURI BOB = createRyaUri("Bob"); + private static final RyaIRI BOB = createRyaIri("Bob"); // Attributes - private static final RyaURI HAS_WEIGHT = createRyaUri("hasWeight"); - private static final RyaURI HAS_HEIGHT = createRyaUri("hasHeight"); - private static final RyaURI HAS_SSN = createRyaUri("hasSSN"); - private static final RyaURI HAS_AGE = createRyaUri("hasAge"); - private static final RyaURI HAS_INCOME = createRyaUri("hasIncome"); - private static final RyaURI HAS_NUMBER_OF_CHILDREN = createRyaUri("hasNumberOfChildren"); - private static final RyaURI HAS_LICENSE_NUMBER = createRyaUri("hasLicenseNumber"); - private static final RyaURI HAS_EYE_COLOR = createRyaUri("hasEyeColor"); - private static final RyaURI HAS_HAIR_COLOR = createRyaUri("hasHairColor"); - private static final RyaURI HAS_DATE_OF_BIRTH = createRyaUri("hasDateOfBirth"); - private static final RyaURI HAS_EXPIRATION_DATE = createRyaUri("hasExpirationDate"); - private static final RyaURI HAS_GLASSES = createRyaUri("hasGlasses"); - private static final RyaURI HAS_EMAIL_ADDRESS = createRyaUri("hasEmailAddress"); - private static final RyaURI HAS_ATTRIBUTE_SPACE = createRyaUri("has Attribute Space"); - private static final RyaURI HAS_MOTTO = createRyaUri("hasMotto"); - private static final RyaURI HAS_BLOOD_TYPE = createRyaUri("hasBloodType"); - private static final RyaURI HAS_SEX = createRyaUri("hasSex"); - private static final RyaURI HAS_ADDRESS = createRyaUri("hasAddress"); - private static final RyaURI HAS_POSITION_TITLE = createRyaUri("hasPositionTitle"); - private static final RyaURI HAS_WORK_ADDRESS = createRyaUri("hasWorkAddress"); - private static final RyaURI HAS_EXTENSION = createRyaUri("hasExtension"); - private static final RyaURI HAS_OFFICE_ROOM_NUMBER = createRyaUri("hasOfficeRoomNumber"); + private static final RyaIRI HAS_WEIGHT = createRyaIri("hasWeight"); + private static final RyaIRI HAS_HEIGHT = createRyaIri("hasHeight"); + private static final RyaIRI HAS_SSN = createRyaIri("hasSSN"); + private static final RyaIRI HAS_AGE = createRyaIri("hasAge"); + private static final RyaIRI HAS_INCOME = createRyaIri("hasIncome"); + private static final RyaIRI HAS_NUMBER_OF_CHILDREN = createRyaIri("hasNumberOfChildren"); + private static final RyaIRI HAS_LICENSE_NUMBER = createRyaIri("hasLicenseNumber"); + private static final RyaIRI HAS_EYE_COLOR = createRyaIri("hasEyeColor"); + private static final RyaIRI HAS_HAIR_COLOR = createRyaIri("hasHairColor"); + private static final RyaIRI HAS_DATE_OF_BIRTH = createRyaIri("hasDateOfBirth"); + private static final RyaIRI HAS_EXPIRATION_DATE = createRyaIri("hasExpirationDate"); + private static final RyaIRI HAS_GLASSES = createRyaIri("hasGlasses"); + private static final RyaIRI HAS_EMAIL_ADDRESS = createRyaIri("hasEmailAddress"); + private static final RyaIRI HAS_ATTRIBUTE_SPACE = createRyaIri("has Attribute Space"); + private static final RyaIRI HAS_MOTTO = createRyaIri("hasMotto"); + private static final RyaIRI HAS_BLOOD_TYPE = createRyaIri("hasBloodType"); + private static final RyaIRI HAS_SEX = createRyaIri("hasSex"); + private static final RyaIRI HAS_ADDRESS = createRyaIri("hasAddress"); + private static final RyaIRI HAS_POSITION_TITLE = createRyaIri("hasPositionTitle"); + private static final RyaIRI HAS_WORK_ADDRESS = createRyaIri("hasWorkAddress"); + private static final RyaIRI HAS_EXTENSION = createRyaIri("hasExtension"); + private static final RyaIRI HAS_OFFICE_ROOM_NUMBER = createRyaIri("hasOfficeRoomNumber"); // Type URIs - private static final RyaURI PERSON_TYPE_URI = new RyaURI("urn:example/person"); - private static final RyaURI EMPLOYEE_TYPE_URI = new RyaURI("urn:example/employee"); + private static final RyaIRI PERSON_TYPE_URI = new RyaIRI("urn:example/person"); + private static final RyaIRI EMPLOYEE_TYPE_URI = new RyaIRI("urn:example/employee"); private static final Date NOW = new Date(); /** - * 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}. */ - private static RyaURI createRyaUri(final String localName) { - return createRyaUri(NAMESPACE, localName); + private 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}. */ - private static RyaURI createRyaUri(final String namespace, final String localName) { - return RdfToRyaConversions.convertURI(VF.createIRI(namespace, localName)); + private static RyaIRI createRyaIri(final String namespace, final String localName) { + return RdfToRyaConversions.convertIRI(VF.createIRI(namespace, localName)); } private static Entity createBobEntity() { @@ -150,7 +150,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { .setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime()).minusYears(40)))) .setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(NOW))) .setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(true))) - .setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))) + .setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, iriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))) .setProperty(PERSON_TYPE_URI, new Property(HAS_ATTRIBUTE_SPACE, stringRyaType("attribute space"))) .setProperty(PERSON_TYPE_URI, new Property(HAS_MOTTO, stringRyaType("!@#*\\&%20^ smörgåsbord"))) .setProperty(PERSON_TYPE_URI, new Property(HAS_BLOOD_TYPE, stringRyaType("A+ blood type"))) @@ -169,7 +169,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { final Type personType = new Type( PERSON_TYPE_URI, - ImmutableSet.<RyaURI>builder() + ImmutableSet.<RyaIRI>builder() .add(HAS_WEIGHT) .add(HAS_HEIGHT) .add(HAS_SSN) @@ -197,7 +197,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { final Type employeeType = new Type( EMPLOYEE_TYPE_URI, - ImmutableSet.<RyaURI>builder() + ImmutableSet.<RyaIRI>builder() .add(HAS_POSITION_TITLE) .add(HAS_WORK_ADDRESS) .add(HAS_EXTENSION) @@ -236,7 +236,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { public void testEntitySubjectsDifferent() throws SmartUriException, ConfigurationException { final Entity entity1 = createBobEntity(); final Builder builder = new Builder(entity1); - builder.setSubject(createRyaUri("Susan")); + builder.setSubject(createRyaIri("Susan")); final Entity entity2 = builder.build(); final DuplicateDataDetector duplicateDataDetector = new DuplicateDataDetector(); @@ -248,7 +248,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { public void testEntityMissingType() throws SmartUriException, ConfigurationException { final Entity entity1 = createBobEntity(); final Builder builder = new Builder(entity1); - builder.setExplicitType(new RyaURI("urn:example/manager")); + builder.setExplicitType(new RyaIRI("urn:example/manager")); final Entity entity2 = builder.build(); final DuplicateDataDetector duplicateDataDetector = new DuplicateDataDetector(); @@ -1801,7 +1801,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { assertTrue(entityStorage.get(bobEntity.getSubject()).isPresent()); final Builder duplicateBobBuilder = Entity.builder(createBobEntity()); - duplicateBobBuilder.setSubject(createRyaUri("Robert")); + duplicateBobBuilder.setSubject(createRyaIri("Robert")); // Modify a property for each type that is within tolerance duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_AGE, shortRyaType((short) 41))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_WEIGHT, floatRyaType(250.76f))); @@ -1812,7 +1812,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 1).minusYears(40)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 1)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(true))); - duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))); + duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, iriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("124 Fake St. Washington, DC 20024"))); duplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 556))); final Entity duplicateBobEntity = duplicateBobBuilder.build(); @@ -1829,7 +1829,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { assertFalse(entityStorage.get(duplicateBobEntity.getSubject()).isPresent()); final Builder notDuplicateBobBuilder = Entity.builder(createBobEntity()); - notDuplicateBobBuilder.setSubject(createRyaUri("Not Bob")); + notDuplicateBobBuilder.setSubject(createRyaIri("Not Bob")); // Modify a property for each type that is within tolerance notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_AGE, shortRyaType((short) 50))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_WEIGHT, floatRyaType(300.0f))); @@ -1840,7 +1840,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 10000000L).minusYears(40)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 10000000L)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(false))); - notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:bad.email.addr...@gmail.com";)))); + notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, iriRyaType(VF.createIRI("mailto:bad.email.addr...@gmail.com";)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("123456789 Fake St. Washington, DC 20024"))); notDuplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 1000))); final Entity notDuplicateBobEntity = notDuplicateBobBuilder.build(); @@ -1892,7 +1892,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { assertTrue(entityStorage.get(bobEntity.getSubject()).isPresent()); final Builder duplicateBobBuilder = Entity.builder(createBobEntity()); - duplicateBobBuilder.setSubject(createRyaUri("Robert")); + duplicateBobBuilder.setSubject(createRyaIri("Robert")); // Modify a property for each type that is within tolerance duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_AGE, shortRyaType((short) 41))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_WEIGHT, floatRyaType(250.76f))); @@ -1903,7 +1903,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 1).minusYears(40)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 1)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(true))); - duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))); + duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, iriRyaType(VF.createIRI("mailto:bob.smitc...@gmail.com";)))); duplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("124 Fake St. Washington, DC 20024"))); duplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 556))); final Entity duplicateBobEntity = duplicateBobBuilder.build(); @@ -1918,7 +1918,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { assertTrue(entityStorage.get(duplicateBobEntity.getSubject()).isPresent()); final Builder notDuplicateBobBuilder = Entity.builder(createBobEntity()); - notDuplicateBobBuilder.setSubject(createRyaUri("Not Bob")); + notDuplicateBobBuilder.setSubject(createRyaIri("Not Bob")); // Modify a property for each type that is within tolerance notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_AGE, shortRyaType((short) 50))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_WEIGHT, floatRyaType(300.0f))); @@ -1929,7 +1929,7 @@ public class DuplicateDataDetectorIT extends MongoITBase { notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_DATE_OF_BIRTH, dateRyaType(new DateTime(NOW.getTime() - 10000000L).minusYears(40)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EXPIRATION_DATE, dateRyaType(new Date(NOW.getTime() - 10000000L)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_GLASSES, booleanRyaType(false))); - notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, uriRyaType(VF.createIRI("mailto:bad.email.addr...@gmail.com";)))); + notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_EMAIL_ADDRESS, iriRyaType(VF.createIRI("mailto:bad.email.addr...@gmail.com";)))); notDuplicateBobBuilder.setProperty(PERSON_TYPE_URI, new Property(HAS_ADDRESS, stringRyaType("123456789 Fake St. Washington, DC 20024"))); notDuplicateBobBuilder.setProperty(EMPLOYEE_TYPE_URI, new Property(HAS_EXTENSION, shortRyaType((short) 1000))); final Entity notDuplicateBobEntity = notDuplicateBobBuilder.build(); @@ -1950,13 +1950,13 @@ public class DuplicateDataDetectorIT extends MongoITBase { * {@code testInputs}. * @param testInputs the {@link List} of {@link TestInput} to insert into * the property. - * @param typeIdUri the type ID {@link RyaURI} that the property falls + * @param typeIdUri the type ID {@link RyaIRI} that the property falls * under. (not {@code null}) - * @param propertyNameUri the property name {@link RyaURI}. + * @param propertyNameUri the property name {@link RyaIRI}. * (not {@code null}) * @throws SmartUriException */ - private static void testProperty(final List<TestInput> testInputs, final RyaURI typeIdUri, final RyaURI propertyNameUri) throws SmartUriException { + private static void testProperty(final List<TestInput> testInputs, final RyaIRI typeIdUri, final RyaIRI propertyNameUri) throws SmartUriException { testProperty(testInputs, typeIdUri, propertyNameUri, new LinkedHashMap<>()); } @@ -1966,15 +1966,15 @@ public class DuplicateDataDetectorIT extends MongoITBase { * {@code testInputs}. * @param testInputs the {@link List} of {@link TestInput} to insert into * the property. - * @param typeIdUri the type ID {@link RyaURI} that the property falls + * @param typeIdUri the type ID {@link RyaIRI} that the property falls * under. (not {@code null}) - * @param propertyNameUri the property name {@link RyaURI}. + * @param propertyNameUri the property name {@link RyaIRI}. * (not {@code null}) * @param equivalentTermsMap the {@link Map} of terms that are considered * equivalent to each other. * @throws SmartUriException */ - private static void testProperty(final List<TestInput> testInputs, final RyaURI typeIdUri, final RyaURI propertyNameUri, final Map<String, List<String>> equivalentTermsMap) throws SmartUriException { + private static void testProperty(final List<TestInput> testInputs, final RyaIRI typeIdUri, final RyaIRI propertyNameUri, final Map<String, List<String>> equivalentTermsMap) throws SmartUriException { requireNonNull(typeIdUri); requireNonNull(propertyNameUri); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java index a353de8..9f6b784 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataNodeTest.java @@ -28,7 +28,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; @@ -78,11 +78,11 @@ public class AccumuloStatementMetadataNodeTest { public void simpleQueryWithoutBindingSet() throws MalformedQueryException, QueryEvaluationException, RyaDAOException { 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(); @@ -121,11 +121,11 @@ public class AccumuloStatementMetadataNodeTest { public void simpleQueryWithoutBindingSetInvalidProperty() throws MalformedQueryException, QueryEvaluationException, RyaDAOException { 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(); @@ -146,13 +146,13 @@ public class AccumuloStatementMetadataNodeTest { public void simpleQueryWithBindingSet() throws MalformedQueryException, QueryEvaluationException, RyaDAOException { 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); @@ -202,13 +202,13 @@ public class AccumuloStatementMetadataNodeTest { throws MalformedQueryException, QueryEvaluationException, RyaDAOException { 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); @@ -264,11 +264,11 @@ public class AccumuloStatementMetadataNodeTest { throws MalformedQueryException, QueryEvaluationException, RyaDAOException { 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 AccumuloStatementMetadataNodeTest { throws MalformedQueryException, QueryEvaluationException, RyaDAOException { 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); @@ -385,13 +385,13 @@ public class AccumuloStatementMetadataNodeTest { + "owl:annotatedProperty <http://worksAt>; owl:annotatedTarget ?x; <http://createdBy> ?y; <http://createdOn> \'2017-01-04\'^^xsd:date }}"; 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_1";), "", metadata); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context_2";), "", metadata); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context_1";), "", metadata); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context_2";), "", metadata); dao.add(statement1); dao.add(statement2); @@ -457,13 +457,13 @@ public class AccumuloStatementMetadataNodeTest { + "owl:annotatedProperty <http://worksAt>; owl:annotatedTarget ?x; <http://createdBy> ?y; <http://createdOn> \'2017-01-04\'^^xsd:date }}"; 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_1";), "", metadata); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context_2";), "", metadata); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context_1";), "", metadata); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context_2";), "", metadata); dao.add(statement1); dao.add(statement2); @@ -538,13 +538,13 @@ public class AccumuloStatementMetadataNodeTest { + "owl:annotatedProperty <http://worksAt>; owl:annotatedTarget ?x; <http://createdBy> ?y; <http://createdOn> \'2017-01-04\'^^xsd:date }}"; 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_1";), "", metadata); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("HardwareStore"), new RyaURI("http://context_2";), "", metadata); + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaIRI("http://context_1";), "", metadata); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaType("HardwareStore"), new RyaIRI("http://context_2";), "", metadata); dao.add(statement1); dao.add(statement2); @@ -580,11 +580,11 @@ public class AccumuloStatementMetadataNodeTest { bsCollection.add(bsConstraint4); // AccumuloRyaQueryEngine engine = dao.getQueryEngine(); -//// CloseableIteration<RyaStatement, RyaDAOException> iter = engine.query(new RyaStatement(new RyaURI("http://Joe";), -//// new RyaURI("http://worksAt";), new RyaType("HardwareStore"), new RyaURI("http://context_2";)), conf); +//// CloseableIteration<RyaStatement, RyaDAOException> iter = engine.query(new RyaStatement(new RyaIRI("http://Joe";), +//// new RyaIRI("http://worksAt";), new RyaType("HardwareStore"), new RyaIRI("http://context_2";)), conf); // CloseableIteration<? extends Map.Entry<RyaStatement,BindingSet>, RyaDAOException> iter = engine.queryWithBindingSet(Arrays.asList(new RdfCloudTripleStoreUtils.CustomEntry<RyaStatement, BindingSet>( -// new RyaStatement(new RyaURI("http://Joe";), -// new RyaURI("http://worksAt";), new RyaType("HardwareStore"), new RyaURI("http://context_2";)), bsConstraint4)), conf); +// new RyaStatement(new RyaIRI("http://Joe";), +// new RyaIRI("http://worksAt";), new RyaType("HardwareStore"), new RyaIRI("http://context_2";)), bsConstraint4)), conf); // while (iter.hasNext()) { // System.out.println(iter.next()); // } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java index d887bc6..ebf22f0 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/AccumuloStatementMetadataOptimizerIT.java @@ -30,7 +30,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; @@ -92,11 +92,11 @@ public class AccumuloStatementMetadataOptimizerIT { @Test public void simpleQueryWithoutBindingSet() throws Exception { 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); TupleQueryResult result = conn.prepareTupleQuery(QueryLanguage.SPARQL, query1).evaluate(); @@ -128,11 +128,11 @@ public class AccumuloStatementMetadataOptimizerIT { @Test public void simpleQueryWithoutBindingSetInvalidProperty() throws Exception { 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); TupleQueryResult result = conn.prepareTupleQuery(QueryLanguage.SPARQL, query1).evaluate(); @@ -150,13 +150,13 @@ public class AccumuloStatementMetadataOptimizerIT { public void simpleQueryWithBindingSet() throws Exception { 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,20 +200,20 @@ public class AccumuloStatementMetadataOptimizerIT { public void simpleQueryWithBindingSetJoinPropertyToSubject() throws Exception { 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")); 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")); - - RyaStatement statement1 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaURI("http://BurgerShack";), new RyaURI("http://context";), "", metadata1); - RyaStatement statement2 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://talksTo";), - new RyaURI("http://Betty";), new RyaURI("http://context";), "", metadata1); - RyaStatement statement3 = new RyaStatement(new RyaURI("http://Fred";), new RyaURI("http://talksTo";), - new RyaType("http://Amanda";), new RyaURI("http://context";), "", metadata1); - RyaStatement statement4 = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://talksTo";), - new RyaType("http://Wanda";), new RyaURI("http://context";), "", metadata2); + metadata2.addMetadata(new RyaIRI("http://createdBy";), new RyaIRI("http://Bob";)); + metadata2.addMetadata(new RyaIRI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-02-04")); + + RyaStatement statement1 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://worksAt";), + new RyaIRI("http://BurgerShack";), new RyaIRI("http://context";), "", metadata1); + RyaStatement statement2 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://talksTo";), + new RyaIRI("http://Betty";), new RyaIRI("http://context";), "", metadata1); + RyaStatement statement3 = new RyaStatement(new RyaIRI("http://Fred";), new RyaIRI("http://talksTo";), + new RyaType("http://Amanda";), new RyaIRI("http://context";), "", metadata1); + RyaStatement statement4 = new RyaStatement(new RyaIRI("http://Joe";), new RyaIRI("http://talksTo";), + new RyaType("http://Wanda";), new RyaIRI("http://context";), "", metadata2); dao.add(statement1); dao.add(statement2); dao.add(statement3); @@ -244,8 +244,8 @@ public class AccumuloStatementMetadataOptimizerIT { private static RdfCloudTripleStoreConfiguration getConf() { RdfCloudTripleStoreConfiguration conf; - Set<RyaURI> propertySet = new HashSet<RyaURI>( - Arrays.asList(new RyaURI("http://createdBy";), new RyaURI("http://createdOn";))); + Set<RyaIRI> propertySet = new HashSet<RyaIRI>( + Arrays.asList(new RyaIRI("http://createdBy";), new RyaIRI("http://createdOn";))); conf = new AccumuloRdfConfiguration(); conf.setBoolean(ConfigUtils.USE_MOCK_INSTANCE, true); conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_");
