http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java index 98861c0..a9706dc 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java @@ -30,7 +30,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaRange; 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.query.strategy.AbstractTriplePatternStrategy; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.resolver.RyaContext; @@ -51,8 +51,8 @@ public class OspWholeRowTriplePatternStrategy extends AbstractTriplePatternStrat @Override public Map.Entry<TABLE_LAYOUT, - ByteRange> defineRange(final RyaURI subject, final RyaURI predicate, final RyaType object, - final RyaURI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { + ByteRange> defineRange(final RyaIRI subject, final RyaIRI predicate, final RyaType object, + final RyaIRI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { try { //os(ng) //o_r(s)(ng) @@ -103,7 +103,7 @@ public class OspWholeRowTriplePatternStrategy extends AbstractTriplePatternStrat } @Override - public boolean handles(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context) { + public boolean handles(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context) { //os(ng) //o_r(s)(ng) //o(ng)
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java index e09e5d0..dbf8023 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java @@ -31,7 +31,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaRange; 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.query.strategy.AbstractTriplePatternStrategy; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.resolver.RyaContext; @@ -52,8 +52,8 @@ public class PoWholeRowTriplePatternStrategy extends AbstractTriplePatternStrate @Override public Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, - ByteRange> defineRange(final RyaURI subject, final RyaURI predicate, final RyaType object, - final RyaURI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { + ByteRange> defineRange(final RyaIRI subject, final RyaIRI predicate, final RyaType object, + final RyaIRI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { try { //po(ng) //po_r(s)(ng) @@ -116,7 +116,7 @@ public class PoWholeRowTriplePatternStrategy extends AbstractTriplePatternStrate } @Override - public boolean handles(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context) { + public boolean handles(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context) { //po(ng) //p_r(o)(ng) //po_r(s)(ng) http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java index b2c29bb..eed3ab0 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java @@ -31,8 +31,8 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaRange; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; -import org.apache.rya.api.domain.RyaURIRange; +import org.apache.rya.api.domain.RyaIRI; +import org.apache.rya.api.domain.RyaIRIRange; import org.apache.rya.api.query.strategy.AbstractTriplePatternStrategy; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.resolver.RyaContext; @@ -52,8 +52,8 @@ public class SpoWholeRowTriplePatternStrategy extends AbstractTriplePatternStrat } @Override - public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(final RyaURI subject, final RyaURI predicate, final RyaType object, - final RyaURI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { + public Map.Entry<TABLE_LAYOUT, ByteRange> defineRange(final RyaIRI subject, final RyaIRI predicate, final RyaType object, + final RyaIRI context, final RdfCloudTripleStoreConfiguration conf) throws IOException { try { //spo(ng) //sp(ng) @@ -127,8 +127,8 @@ public class SpoWholeRowTriplePatternStrategy extends AbstractTriplePatternStrat } @Override - public boolean handles(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context) { + public boolean handles(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context) { //if subject is not null and (if predicate is null then object must be null) - return (subject != null && !(subject instanceof RyaURIRange && predicate != null)) && !((predicate == null || predicate instanceof RyaURIRange) && (object != null)); + return (subject != null && !(subject instanceof RyaIRIRange && predicate != null)) && !((predicate == null || predicate instanceof RyaIRIRange) && (object != null)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java index fca31e4..0618c82 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java @@ -19,14 +19,14 @@ package org.apache.rya.api.resolver; * under the License. */ -import org.apache.rya.api.domain.RangeURI; +import org.apache.rya.api.domain.RangeIRI; import org.apache.rya.api.domain.RangeValue; import org.apache.rya.api.domain.RyaSchema; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaTypeRange; -import org.apache.rya.api.domain.RyaURI; -import org.apache.rya.api.domain.RyaURIRange; +import org.apache.rya.api.domain.RyaIRI; +import org.apache.rya.api.domain.RyaIRIRange; import org.eclipse.rdf4j.model.BNode; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; @@ -40,13 +40,13 @@ import org.eclipse.rdf4j.model.Value; */ public class RdfToRyaConversions { - public static RyaURI convertURI(IRI iri) { + public static RyaIRI convertIRI(IRI iri) { if (iri == null) return null; - if (iri instanceof RangeURI) { - RangeURI riri = (RangeURI) iri; - return new RyaURIRange(convertURI(riri.getStart()), convertURI(riri.getEnd())); + if (iri instanceof RangeIRI) { + RangeIRI riri = (RangeIRI) iri; + return new RyaIRIRange(convertIRI(riri.getStart()), convertIRI(riri.getEnd())); } - return new RyaURI(iri.stringValue()); + return new RyaIRI(iri.stringValue()); } public static RyaType convertLiteral(Literal literal) { @@ -70,7 +70,7 @@ public class RdfToRyaConversions { if (value instanceof RangeValue) { RangeValue<?> rv = (RangeValue<?>) value; if (rv.getStart() instanceof IRI) { - return new RyaURIRange(convertURI((IRI) rv.getStart()), convertURI((IRI) rv.getEnd())); + return new RyaIRIRange(convertIRI((IRI) rv.getStart()), convertIRI((IRI) rv.getEnd())); } else { //literal return new RyaTypeRange(convertLiteral((Literal) rv.getStart()), convertLiteral((Literal) rv.getEnd())); @@ -79,12 +79,12 @@ public class RdfToRyaConversions { return null; } - public static RyaURI convertResource(Resource subject) { + public static RyaIRI convertResource(Resource subject) { if(subject == null) return null; if (subject instanceof BNode) { - return new RyaURI(RyaSchema.BNODE_NAMESPACE + ((BNode) subject).getID()); + return new RyaIRI(RyaSchema.BNODE_NAMESPACE + ((BNode) subject).getID()); } - return convertURI((IRI) subject); + return convertIRI((IRI) subject); } public static RyaStatement convertStatement(Statement statement) { @@ -95,7 +95,7 @@ public class RdfToRyaConversions { Resource context = statement.getContext(); return new RyaStatement( convertResource(subject), - convertURI(predicate), + convertIRI(predicate), convertValue(object), convertResource(context)); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java index 237a228..bc0c6df 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java @@ -34,7 +34,7 @@ import org.apache.rya.api.resolver.impl.FloatRyaTypeResolver; import org.apache.rya.api.resolver.impl.IntegerRyaTypeResolver; import org.apache.rya.api.resolver.impl.LongRyaTypeResolver; import org.apache.rya.api.resolver.impl.RyaTypeResolverImpl; -import org.apache.rya.api.resolver.impl.RyaURIResolver; +import org.apache.rya.api.resolver.impl.RyaIRIResolver; import org.apache.rya.api.resolver.impl.ServiceBackedRyaTypeResolverMappings; import org.apache.rya.api.resolver.impl.ShortRyaTypeResolver; import org.eclipse.rdf4j.model.IRI; @@ -64,7 +64,7 @@ public class RyaContext { logger.debug("Adding default mappings"); } addRyaTypeResolverMapping(new RyaTypeResolverMapping(new RyaTypeResolverImpl())); // plain string - addRyaTypeResolverMapping(new RyaTypeResolverMapping(new RyaURIResolver())); // uri + addRyaTypeResolverMapping(new RyaTypeResolverMapping(new RyaIRIResolver())); // iri addRyaTypeResolverMapping(new RyaTypeResolverMapping(new DateTimeRyaTypeResolver())); // dateTime addRyaTypeResolverMapping(new RyaTypeResolverMapping(new DoubleRyaTypeResolver())); // double addRyaTypeResolverMapping(new RyaTypeResolverMapping(new FloatRyaTypeResolver())); // float http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java index b43bdaa..88b79bf 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java @@ -21,7 +21,7 @@ package org.apache.rya.api.resolver; 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.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Statement; @@ -37,11 +37,11 @@ import org.eclipse.rdf4j.model.vocabulary.XMLSchema; public class RyaToRdfConversions { private static final ValueFactory VF = SimpleValueFactory.getInstance(); - public static IRI convertURI(RyaURI iri) { + public static IRI convertIRI(RyaIRI iri) { return VF.createIRI(iri.getData()); } - private static IRI convertURI(RyaType value) { + private static IRI convertIRI(RyaType value) { return VF.createIRI(value.getData()); } @@ -56,19 +56,19 @@ public class RyaToRdfConversions { public static Value convertValue(RyaType value) { //assuming either IRI or Literal here - return (value instanceof RyaURI || value.getDataType().equals(XMLSchema.ANYURI)) ? convertURI(value) : convertLiteral(value); + return (value instanceof RyaIRI || value.getDataType().equals(XMLSchema.ANYURI)) ? convertIRI(value) : convertLiteral(value); } public static Statement convertStatement(RyaStatement statement) { assert statement != null; if (statement.getContext() != null) { - return VF.createStatement(convertURI(statement.getSubject()), - convertURI(statement.getPredicate()), + return VF.createStatement(convertIRI(statement.getSubject()), + convertIRI(statement.getPredicate()), convertValue(statement.getObject()), - convertURI(statement.getContext())); + convertIRI(statement.getContext())); } else { - return VF.createStatement(convertURI(statement.getSubject()), - convertURI(statement.getPredicate()), + return VF.createStatement(convertIRI(statement.getSubject()), + convertIRI(statement.getPredicate()), convertValue(statement.getObject())); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java index f3f5925..dc4a42e 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java @@ -30,7 +30,7 @@ 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.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.query.strategy.TriplePatternStrategy; import org.apache.rya.api.query.strategy.wholerow.HashedPoWholeRowTriplePatternStrategy; import org.apache.rya.api.query.strategy.wholerow.HashedSpoWholeRowTriplePatternStrategy; @@ -101,7 +101,7 @@ public class RyaTripleContext { } //retrieve triple pattern strategy - public TriplePatternStrategy retrieveStrategy(final RyaURI subject, final RyaURI predicate, final RyaType object, final RyaURI context) { + public TriplePatternStrategy retrieveStrategy(final RyaIRI subject, final RyaIRI predicate, final RyaType object, final RyaIRI context) { for (final TriplePatternStrategy strategy : triplePatternStrategyList) { if (strategy.handles(subject, predicate, object, context)) { return strategy; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaIRIResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaIRIResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaIRIResolver.java new file mode 100644 index 0000000..0e4df4d --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaIRIResolver.java @@ -0,0 +1,42 @@ +package org.apache.rya.api.resolver.impl; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaIRI; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; + +/** + * Date: 7/16/12 + * Time: 12:41 PM + */ +public class RyaIRIResolver extends RyaTypeResolverImpl { + + public static final int URI_MARKER = 2; + + public RyaIRIResolver() { + super((byte) URI_MARKER, XMLSchema.ANYURI); + } + + @Override + public RyaType newInstance() { + return new RyaIRI(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java deleted file mode 100644 index c7ac82c..0000000 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.apache.rya.api.resolver.impl; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; -import org.eclipse.rdf4j.model.vocabulary.XMLSchema; - -/** - * Date: 7/16/12 - * Time: 12:41 PM - */ -public class RyaURIResolver extends RyaTypeResolverImpl { - - public static final int URI_MARKER = 2; - - public RyaURIResolver() { - super((byte) URI_MARKER, XMLSchema.ANYURI); - } - - @Override - public RyaType newInstance() { - return new RyaURI(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java index 62ac2b5..fd91751 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java @@ -24,7 +24,7 @@ package org.apache.rya.api.resolver.triple; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java index 5907b5b..701ff02 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java @@ -34,7 +34,7 @@ import org.apache.commons.codec.binary.Hex; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; import org.apache.rya.api.resolver.triple.TripleRow; @@ -53,10 +53,10 @@ public class WholeRowHashedTripleResolver implements TripleRowResolver { @Override public Map<TABLE_LAYOUT, TripleRow> serialize(final RyaStatement stmt) throws TripleRowResolverException { try { - final RyaURI subject = stmt.getSubject(); - final RyaURI predicate = stmt.getPredicate(); + final RyaIRI subject = stmt.getSubject(); + final RyaIRI predicate = stmt.getPredicate(); final RyaType object = stmt.getObject(); - final RyaURI context = stmt.getContext(); + final RyaIRI context = stmt.getContext(); final Long timestamp = stmt.getTimestamp(); final byte[] columnVisibility = stmt.getColumnVisibility(); final String qualifer = stmt.getQualifer(); @@ -115,7 +115,7 @@ public class WholeRowHashedTripleResolver implements TripleRowResolver { final byte[] type = Arrays.copyOfRange(row, typeIndex, row.length); final byte[] columnFamily = tripleRow.getColumnFamily(); final boolean contextExists = columnFamily != null && columnFamily.length > 0; - final RyaURI context = (contextExists) ? (new RyaURI(new String(columnFamily, StandardCharsets.UTF_8))) : null; + final RyaIRI context = (contextExists) ? (new RyaIRI(new String(columnFamily, StandardCharsets.UTF_8))) : null; final byte[] columnQualifier = tripleRow.getColumnQualifier(); final String qualifier = columnQualifier != null && columnQualifier.length > 0 ? new String(columnQualifier, StandardCharsets.UTF_8) : null; final Long timestamp = tripleRow.getTimestamp(); @@ -126,24 +126,24 @@ public class WholeRowHashedTripleResolver implements TripleRowResolver { case SPO: { final byte[] obj = Bytes.concat(third, type); return new RyaStatement( - new RyaURI(new String(first, StandardCharsets.UTF_8)), - new RyaURI(new String(second, StandardCharsets.UTF_8)), + new RyaIRI(new String(first, StandardCharsets.UTF_8)), + new RyaIRI(new String(second, StandardCharsets.UTF_8)), RyaContext.getInstance().deserialize(obj), context, qualifier, columnVisibility, value, timestamp); } case PO: { final byte[] obj = Bytes.concat(second, type); return new RyaStatement( - new RyaURI(new String(third, StandardCharsets.UTF_8)), - new RyaURI(new String(first, StandardCharsets.UTF_8)), + new RyaIRI(new String(third, StandardCharsets.UTF_8)), + new RyaIRI(new String(first, StandardCharsets.UTF_8)), RyaContext.getInstance().deserialize(obj), context, qualifier, columnVisibility, value, timestamp); } case OSP: { final byte[] obj = Bytes.concat(first, type); return new RyaStatement( - new RyaURI(new String(second, StandardCharsets.UTF_8)), - new RyaURI(new String(third, StandardCharsets.UTF_8)), + new RyaIRI(new String(second, StandardCharsets.UTF_8)), + new RyaIRI(new String(third, StandardCharsets.UTF_8)), RyaContext.getInstance().deserialize(obj), context, qualifier, columnVisibility, value, timestamp); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java index cbd65b6..994347f 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java @@ -31,7 +31,7 @@ import java.util.Map; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTypeResolverException; import org.apache.rya.api.resolver.triple.TripleRow; @@ -50,10 +50,10 @@ public class WholeRowTripleResolver implements TripleRowResolver { @Override public Map<TABLE_LAYOUT, TripleRow> serialize(final RyaStatement stmt) throws TripleRowResolverException { try { - final RyaURI subject = stmt.getSubject(); - final RyaURI predicate = stmt.getPredicate(); + final RyaIRI subject = stmt.getSubject(); + final RyaIRI predicate = stmt.getPredicate(); final RyaType object = stmt.getObject(); - final RyaURI context = stmt.getContext(); + final RyaIRI context = stmt.getContext(); final Long timestamp = stmt.getTimestamp(); final byte[] columnVisibility = stmt.getColumnVisibility(); final String qualifer = stmt.getQualifer(); @@ -100,7 +100,7 @@ public class WholeRowTripleResolver implements TripleRowResolver { final byte[] type = Arrays.copyOfRange(row, typeIndex, row.length); final byte[] columnFamily = tripleRow.getColumnFamily(); final boolean contextExists = columnFamily != null && columnFamily.length > 0; - final RyaURI context = (contextExists) ? (new RyaURI(new String(columnFamily, StandardCharsets.UTF_8))) : null; + final RyaIRI context = (contextExists) ? (new RyaIRI(new String(columnFamily, StandardCharsets.UTF_8))) : null; final byte[] columnQualifier = tripleRow.getColumnQualifier(); final String qualifier = columnQualifier != null && columnQualifier.length > 0 ? new String(columnQualifier, StandardCharsets.UTF_8) : null; final Long timestamp = tripleRow.getTimestamp(); @@ -111,24 +111,24 @@ public class WholeRowTripleResolver implements TripleRowResolver { case SPO: { final byte[] obj = Bytes.concat(third, type); return new RyaStatement( - new RyaURI(new String(first, StandardCharsets.UTF_8)), - new RyaURI(new String(second, StandardCharsets.UTF_8)), + new RyaIRI(new String(first, StandardCharsets.UTF_8)), + new RyaIRI(new String(second, StandardCharsets.UTF_8)), RyaContext.getInstance().deserialize(obj), context, qualifier, columnVisibility, value, timestamp); } case PO: { final byte[] obj = Bytes.concat(second, type); return new RyaStatement( - new RyaURI(new String(third, StandardCharsets.UTF_8)), - new RyaURI(new String(first, StandardCharsets.UTF_8)), + new RyaIRI(new String(third, StandardCharsets.UTF_8)), + new RyaIRI(new String(first, StandardCharsets.UTF_8)), RyaContext.getInstance().deserialize(obj), context, qualifier, columnVisibility, value, timestamp); } case OSP: { final byte[] obj = Bytes.concat(first, type); return new RyaStatement( - new RyaURI(new String(second, StandardCharsets.UTF_8)), - new RyaURI(new String(third, StandardCharsets.UTF_8)), + new RyaIRI(new String(second, StandardCharsets.UTF_8)), + new RyaIRI(new String(third, StandardCharsets.UTF_8)), RyaContext.getInstance().deserialize(obj), context, qualifier, columnVisibility, value, timestamp); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaIRIPrefixTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaIRIPrefixTest.java b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaIRIPrefixTest.java new file mode 100644 index 0000000..ab32406 --- /dev/null +++ b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaIRIPrefixTest.java @@ -0,0 +1,37 @@ +package org.apache.rya.api.domain; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + + +import junit.framework.TestCase; + +/** + * Date: 7/24/12 + * Time: 3:30 PM + */ +public class RyaIRIPrefixTest extends TestCase { + + public void testPrefix() throws Exception { + String prefix = "urn:test#"; + RyaIRIPrefix iriPrefix = new RyaIRIPrefix(prefix); + assertEquals(prefix, iriPrefix.getPrefix()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java index fe1216a..7cfc77b 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java @@ -27,8 +27,8 @@ public class RyaTypeTest { static RyaType a = new RyaType(XMLSchema.STRING, "http://www.example.com/Alice";); static RyaType b = new RyaType(XMLSchema.STRING, "http://www.example.com/Bob";); static RyaType c = new RyaType(XMLSchema.STRING, "http://www.example.com/Carol";); - static RyaType aUri = new RyaType(XMLSchema.ANYURI, "http://www.example.com/Alice";); - static RyaType bUri = new RyaType(XMLSchema.ANYURI, "http://www.example.com/Bob";); + static RyaType aIri = new RyaType(XMLSchema.ANYURI, "http://www.example.com/Alice";); + static RyaType bIri = new RyaType(XMLSchema.ANYURI, "http://www.example.com/Bob";); RyaType nullData = new RyaType(XMLSchema.STRING, null); RyaType nullType = new RyaType(null, "http://www.example.com/Alice";); RyaType nullBoth = new RyaType(null, null); @@ -36,10 +36,10 @@ public class RyaTypeTest { @Test public void testCompareTo() throws Exception { - Assert.assertEquals("compareTo(self) should return zero.", 0, aUri.compareTo(aUri)); - Assert.assertFalse("compareTo should return nonzero for different data and type.", aUri.compareTo(b) == 0); - Assert.assertFalse("compareTo should return nonzero for same data and different datatypes.", a.compareTo(aUri) == 0); - Assert.assertFalse("compareTo should return nonzero for same datatype and different data.", bUri.compareTo(aUri) == 0); + Assert.assertEquals("compareTo(self) should return zero.", 0, aIri.compareTo(aIri)); + Assert.assertFalse("compareTo should return nonzero for different data and type.", aIri.compareTo(b) == 0); + Assert.assertFalse("compareTo should return nonzero for same data and different datatypes.", a.compareTo(aIri) == 0); + Assert.assertFalse("compareTo should return nonzero for same datatype and different data.", bIri.compareTo(aIri) == 0); Assert.assertEquals("compareTo should return zero for different objects with matching data and datatype.", 0, a.compareTo(same)); } @@ -60,11 +60,11 @@ public class RyaTypeTest { int forward = Integer.signum(a.compareTo(b)); int backward = Integer.signum(b.compareTo(a)); Assert.assertEquals("Comparison of different values with same type should yield opposite signs.", forward, backward * -1); - forward = Integer.signum(bUri.compareTo(b)); - backward = Integer.signum(b.compareTo(bUri)); + forward = Integer.signum(bIri.compareTo(b)); + backward = Integer.signum(b.compareTo(bIri)); Assert.assertEquals("Comparison of same values with different types should yield opposite signs.", forward, backward*-1); - forward = Integer.signum(aUri.compareTo(b)); - backward = Integer.signum(b.compareTo(aUri)); + forward = Integer.signum(aIri.compareTo(b)); + backward = Integer.signum(b.compareTo(aIri)); Assert.assertEquals("Comparison of different values with different types should yield opposite signs.", forward, backward * -1); } @@ -80,7 +80,7 @@ public class RyaTypeTest { @Test public void testEquals() throws Exception { Assert.assertTrue("Same data and datatype should be equal.", a.equals(same)); - Assert.assertFalse("Same data, different datatype should be unequal.", a.equals(aUri)); + Assert.assertFalse("Same data, different datatype should be unequal.", a.equals(aIri)); Assert.assertFalse("Same datatype, different data should be unequal.", a.equals(b)); } @@ -100,9 +100,9 @@ public class RyaTypeTest { Assert.assertEquals("equals and compareTo inconsistent for different values with same types.", a.equals(b), a.compareTo(b) == 0); Assert.assertEquals("equals and compareTo inconsistent for same values having different types.", - a.equals(aUri), a.compareTo(aUri) == 0); + a.equals(aIri), a.compareTo(aIri) == 0); Assert.assertEquals("equals and compareTo inconsistent for different values and different types.", - a.equals(bUri), a.compareTo(bUri) == 0); + a.equals(bIri), a.compareTo(bIri) == 0); } @Test http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java deleted file mode 100644 index dee896b..0000000 --- a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.apache.rya.api.domain; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - - -import junit.framework.TestCase; - -/** - * Date: 7/24/12 - * Time: 3:30 PM - */ -public class RyaURIPrefixTest extends TestCase { - - public void testPrefix() throws Exception { - String prefix = "urn:test#"; - RyaURIPrefix uriPrefix = new RyaURIPrefix(prefix); - assertEquals(prefix, uriPrefix.getPrefix()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java b/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java index c316b50..fd7cb2a 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/domain/StatementMetadataTest.java @@ -31,7 +31,7 @@ public class StatementMetadataTest { StatementMetadata single = new StatementMetadata(); - single.addMetadata(new RyaURI("http://uri";), new RyaType("http://type";)); + single.addMetadata(new RyaIRI("http://uri";), new RyaType("http://type";)); byte[] singleData = single.toBytes(); Assert.assertArrayEquals(singleData, new StatementMetadata(singleData).toBytes()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java b/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java index 967c6dc..b2c535d 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java @@ -22,7 +22,7 @@ package org.apache.rya.api.persist.query; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.junit.Test; import java.util.Arrays; @@ -37,9 +37,9 @@ public class RyaQueryTest { @Test public void testBuildQueryWithOptions() { - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); RyaStatement ryaStatement = new RyaStatement(subj, pred, obj); String[] auths = {"U,FOUO"}; long currentTime = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java index bd96436..66ca868 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java @@ -31,7 +31,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.query.strategy.wholerow.OspWholeRowTriplePatternStrategy; import org.apache.rya.api.query.strategy.wholerow.PoWholeRowTriplePatternStrategy; import org.apache.rya.api.query.strategy.wholerow.SpoWholeRowTriplePatternStrategy; @@ -59,9 +59,9 @@ public class AbstractTriplePatternStrategyTest extends TestCase { } public void testRegex() throws Exception { - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); RyaStatement ryaStatement = new RyaStatement(subj, pred, obj); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = new WholeRowTripleResolver().serialize(ryaStatement); TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO); @@ -117,8 +117,8 @@ public class AbstractTriplePatternStrategyTest extends TestCase { } public void testObjectTypeInfo() throws Exception { - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); RyaType obj = new RyaType(XMLSchema.LONG, "10"); RyaStatement ryaStatement = new RyaStatement(subj, pred, obj); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = RyaTripleContext.getInstance(new MockRdfConfiguration()).serializeTriple(ryaStatement); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java index 0775dfa..fe2c20c 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java @@ -27,8 +27,8 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaTypeRange; -import org.apache.rya.api.domain.RyaURI; -import org.apache.rya.api.domain.RyaURIRange; +import org.apache.rya.api.domain.RyaIRI; +import org.apache.rya.api.domain.RyaIRIRange; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.query.strategy.TriplePatternStrategy; import org.apache.rya.api.resolver.RyaContext; @@ -49,10 +49,10 @@ import junit.framework.TestCase; public class HashedPoWholeRowTriplePatternStrategyTest extends TestCase { private static final ValueFactory VF = SimpleValueFactory.getInstance(); - RyaURI uri = new RyaURI("urn:test#1234"); - RyaURI uri2 = new RyaURI("urn:test#1235"); - RyaURIRange rangeURI = new RyaURIRange(uri, uri2); - RyaURIRange rangeURI2 = new RyaURIRange(new RyaURI("urn:test#1235"), new RyaURI("urn:test#1236")); + RyaIRI uri = new RyaIRI("urn:test#1234"); + RyaIRI uri2 = new RyaIRI("urn:test#1235"); + RyaIRIRange rangeIRI = new RyaIRIRange(uri, uri2); + RyaIRIRange rangeIRI2 = new RyaIRIRange(new RyaIRI("urn:test#1235"), new RyaIRI("urn:test#1236")); HashedPoWholeRowTriplePatternStrategy strategy = new HashedPoWholeRowTriplePatternStrategy(); RyaContext ryaContext = RyaContext.getInstance(); RyaTripleContext ryaTripleContext; @@ -72,9 +72,9 @@ public class HashedPoWholeRowTriplePatternStrategyTest extends TestCase { public void testRegex() throws Exception { - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); RyaStatement ryaStatement = new RyaStatement(subj, pred, obj); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = new WholeRowHashedTripleResolver().serialize(ryaStatement); TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO); @@ -135,10 +135,10 @@ public class HashedPoWholeRowTriplePatternStrategyTest extends TestCase { new RyaStatement(uri, uri, uri, null)); TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO); - Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(null, uri, rangeURI, null, null); + Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(null, uri, rangeIRI, null, null); assertContains(entry.getValue(), tripleRow.getRow()); - entry = strategy.defineRange(null, uri, rangeURI2, null, null); + entry = strategy.defineRange(null, uri, rangeIRI2, null, null); assertContainsFalse(entry.getValue(), tripleRow.getRow()); } @@ -197,15 +197,15 @@ public class HashedPoWholeRowTriplePatternStrategyTest extends TestCase { new RyaStatement(uri, uri, uri, null)); TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO); - Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(rangeURI, uri, uri, null, null); + Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(rangeIRI, uri, uri, null, null); assertContains(entry.getValue(), tripleRow.getRow()); - entry = strategy.defineRange(rangeURI2, uri, uri, null, null); + entry = strategy.defineRange(rangeIRI2, uri, uri, null, null); assertContainsFalse(entry.getValue(), tripleRow.getRow()); } public void testPRange() throws Exception { - Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(null, rangeURI, null, null, null); + Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(null, rangeIRI, null, null, null); assertNull(entry); } @@ -222,22 +222,22 @@ public class HashedPoWholeRowTriplePatternStrategyTest extends TestCase { assertTrue(strategy.handles(null, uri, uri, null)); assertTrue(strategy.handles(null, uri, uri, uri)); //po_r(s)(ng) - assertTrue(strategy.handles(rangeURI, uri, uri, null)); - assertTrue(strategy.handles(rangeURI, uri, uri, uri)); + assertTrue(strategy.handles(rangeIRI, uri, uri, null)); + assertTrue(strategy.handles(rangeIRI, uri, uri, uri)); //p(ng) assertTrue(strategy.handles(null, uri, null, null)); assertTrue(strategy.handles(null, uri, null, uri)); //p_r(o)(ng) - assertTrue(strategy.handles(null, uri, rangeURI, null)); - assertTrue(strategy.handles(null, uri, rangeURI, uri)); + assertTrue(strategy.handles(null, uri, rangeIRI, null)); + assertTrue(strategy.handles(null, uri, rangeIRI, uri)); //r(p)(ng) - assertFalse(strategy.handles(null, rangeURI, null, null)); - assertFalse(strategy.handles(null, rangeURI, null, uri)); + assertFalse(strategy.handles(null, rangeIRI, null, null)); + assertFalse(strategy.handles(null, rangeIRI, null, uri)); //false cases //sp.. assertFalse(strategy.handles(uri, uri, null, null)); //r(s)_p - assertFalse(strategy.handles(rangeURI, uri, null, null)); + assertFalse(strategy.handles(rangeIRI, uri, null, null)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java index d71e4e8..763c0d1 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java @@ -26,8 +26,8 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaTypeRange; -import org.apache.rya.api.domain.RyaURI; -import org.apache.rya.api.domain.RyaURIRange; +import org.apache.rya.api.domain.RyaIRI; +import org.apache.rya.api.domain.RyaIRIRange; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.resolver.RyaTripleContext; @@ -45,10 +45,10 @@ import junit.framework.TestCase; public class HashedSpoWholeRowTriplePatternStrategyTest extends TestCase { private static final ValueFactory VF = SimpleValueFactory.getInstance(); - RyaURI uri = new RyaURI("urn:test#1234"); - RyaURI uri2 = new RyaURI("urn:test#1235"); - RyaURIRange rangeURI = new RyaURIRange(uri, uri2); - RyaURIRange rangeURI2 = new RyaURIRange(new RyaURI("urn:test#1235"), new RyaURI("urn:test#1236")); + RyaIRI uri = new RyaIRI("urn:test#1234"); + RyaIRI uri2 = new RyaIRI("urn:test#1235"); + RyaIRIRange rangeIRI = new RyaIRIRange(uri, uri2); + RyaIRIRange rangeIRI2 = new RyaIRIRange(new RyaIRI("urn:test#1235"), new RyaIRI("urn:test#1236")); HashedSpoWholeRowTriplePatternStrategy strategy = new HashedSpoWholeRowTriplePatternStrategy(); RyaContext ryaContext = RyaContext.getInstance(); RyaTripleContext ryaTripleContext; @@ -110,10 +110,10 @@ public class HashedSpoWholeRowTriplePatternStrategyTest extends TestCase { new RyaStatement(uri, uri, uri, null)); TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO); - Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(uri, uri, rangeURI, null, null); + Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(uri, uri, rangeIRI, null, null); assertContains(entry.getValue(), tripleRow.getRow()); - entry = strategy.defineRange(uri, uri, rangeURI2, null, null); + entry = strategy.defineRange(uri, uri, rangeIRI2, null, null); assertContainsFalse(entry.getValue(), tripleRow.getRow()); } @@ -145,9 +145,9 @@ public class HashedSpoWholeRowTriplePatternStrategyTest extends TestCase { new RyaStatement(uri, uri, uri, null)); TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO); - Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(uri, rangeURI, null, null, null); + Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(uri, rangeIRI, null, null, null); assertContains(entry.getValue(), tripleRow.getRow()); - entry = strategy.defineRange(uri, rangeURI2, null, null, null); + entry = strategy.defineRange(uri, rangeIRI2, null, null, null); assertContainsFalse(entry.getValue(), tripleRow.getRow()); } @@ -165,7 +165,7 @@ public class HashedSpoWholeRowTriplePatternStrategyTest extends TestCase { public void testSRange() throws Exception { - Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(rangeURI, null, null, null, null); + Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> entry = strategy.defineRange(rangeIRI, null, null, null, null); assertNull(entry); } @@ -180,20 +180,20 @@ public class HashedSpoWholeRowTriplePatternStrategyTest extends TestCase { assertTrue(strategy.handles(uri, null, null, null)); assertTrue(strategy.handles(uri, null, null, uri)); //sp_r(o)(ng) - assertTrue(strategy.handles(uri, uri, rangeURI, null)); - assertTrue(strategy.handles(uri, uri, rangeURI, uri)); + assertTrue(strategy.handles(uri, uri, rangeIRI, null)); + assertTrue(strategy.handles(uri, uri, rangeIRI, uri)); //s_r(p)(ng) - assertTrue(strategy.handles(uri, rangeURI, null, null)); - assertTrue(strategy.handles(uri, rangeURI, null, uri)); + assertTrue(strategy.handles(uri, rangeIRI, null, null)); + assertTrue(strategy.handles(uri, rangeIRI, null, uri)); //fail //s_r(p)_r(o) - assertFalse(strategy.handles(uri, rangeURI, rangeURI, null)); + assertFalse(strategy.handles(uri, rangeIRI, rangeIRI, null)); //s==null assertFalse(strategy.handles(null, uri, uri, null)); //s_r(o) - assertFalse(strategy.handles(uri, null, rangeURI, null)); + assertFalse(strategy.handles(uri, null, rangeIRI, null)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategyTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategyTest.java b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategyTest.java index 9bac95a..be607a8 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategyTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategyTest.java @@ -30,7 +30,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.RdfCloudTripleStoreUtils; 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.query.strategy.ByteRange; import org.junit.After; import org.junit.AfterClass; @@ -85,10 +85,10 @@ public class NullRowTriplePatternStrategyTest { */ @Test public void testDefineRange() throws Exception { - RyaURI subject = null; - RyaURI predicate = null; + RyaIRI subject = null; + RyaIRI predicate = null; RyaType object = null; - RyaURI context = null; + RyaIRI context = null; RdfCloudTripleStoreConfiguration conf = new MockRdfConfiguration(); NullRowTriplePatternStrategy instance = new NullRowTriplePatternStrategy(); Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, ByteRange> expResult = new RdfCloudTripleStoreUtils.CustomEntry<>(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO, new ByteRange(new byte[]{}, LAST_BYTES)); @@ -103,14 +103,14 @@ public class NullRowTriplePatternStrategyTest { */ @Test public void testHandles() { - RyaURI subject = null; - RyaURI predicate = null; + RyaIRI subject = null; + RyaIRI predicate = null; RyaType object = null; - RyaURI context = null; + RyaIRI context = null; NullRowTriplePatternStrategy instance = new NullRowTriplePatternStrategy(); assertTrue(instance.handles(subject, predicate, object, context)); - RyaURI uri = new RyaURI("urn:test#1234"); + RyaIRI uri = new RyaIRI("urn:test#1234"); assertFalse(instance.handles(uri, predicate, object, context)); assertFalse(instance.handles(subject, uri, object, context)); assertFalse(instance.handles(subject, predicate, uri, context)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java index a3a467d..e1e9dc6 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java @@ -40,10 +40,10 @@ //public class OspWholeRowTriplePatternStrategyTest extends TestCase { // private static final ValueFactory VF = SimpleValueFactory.getInstance(); // -// RyaURI uri = new RyaURI("urn:test#1234"); -// RyaURI uri2 = new RyaURI("urn:test#1235"); -// RyaURIRange rangeURI = new RyaURIRange(uri, uri2); -// RyaURIRange rangeURI2 = new RyaURIRange(new RyaURI("urn:test#1235"), new RyaURI("urn:test#1236")); +// RyaIRI uri = new RyaIRI("urn:test#1234"); +// RyaIRI uri2 = new RyaIRI("urn:test#1235"); +// RyaIRIRange rangeIRI = new RyaIRIRange(uri, uri2); +// RyaIRIRange rangeIRI2 = new RyaIRIRange(new RyaIRI("urn:test#1235"), new RyaIRI("urn:test#1236")); // // RyaType customType1 = new RyaType(VF.createIRI("urn:custom#type"), "1234"); // RyaType customType2 = new RyaType(VF.createIRI("urn:custom#type"), "1235"); @@ -72,10 +72,10 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(null, null, rangeURI, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(null, null, rangeIRI, null, null); // assertTrue(entry.getValue().contains(key)); // -// entry = strategy.defineRange(null, null, rangeURI2, null, null); +// entry = strategy.defineRange(null, null, rangeIRI2, null, null); // assertFalse(entry.getValue().contains(key)); // } // @@ -98,10 +98,10 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeURI, null, uri, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeIRI, null, uri, null, null); // assertTrue(entry.getValue().contains(key)); // -// entry = strategy.defineRange(rangeURI2, null, uri, null, null); +// entry = strategy.defineRange(rangeIRI2, null, uri, null, null); // assertFalse(entry.getValue().contains(key)); // } // @@ -111,10 +111,10 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeURI, null, customType1, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeIRI, null, customType1, null, null); // assertTrue(entry.getValue().contains(key)); // -// entry = strategy.defineRange(rangeURI2, null, customType2, null, null); +// entry = strategy.defineRange(rangeIRI2, null, customType2, null, null); // assertFalse(entry.getValue().contains(key)); // } // @@ -123,16 +123,16 @@ // assertTrue(strategy.handles(uri, null, uri, null)); // assertTrue(strategy.handles(uri, null, uri, uri)); // //o_r(s)(ng) -// assertTrue(strategy.handles(rangeURI, null, uri, null)); -// assertTrue(strategy.handles(rangeURI, null, uri, uri)); +// assertTrue(strategy.handles(rangeIRI, null, uri, null)); +// assertTrue(strategy.handles(rangeIRI, null, uri, uri)); // //o(ng) // assertTrue(strategy.handles(null, null, uri, null)); // assertTrue(strategy.handles(null, null, uri, uri)); // //r(o) -// assertTrue(strategy.handles(null, null, rangeURI, null)); -// assertTrue(strategy.handles(null, null, rangeURI, uri)); +// assertTrue(strategy.handles(null, null, rangeIRI, null)); +// assertTrue(strategy.handles(null, null, rangeIRI, uri)); // // //false -// assertFalse(strategy.handles(uri, null, rangeURI, null)); +// assertFalse(strategy.handles(uri, null, rangeIRI, null)); // } //} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java index 7060457..6fe7540 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java @@ -40,10 +40,10 @@ //public class PoWholeRowTriplePatternStrategyTest extends TestCase { // private static final ValueFactory VF = SimpleValueFactory.getInstance(); // -// RyaURI uri = new RyaURI("urn:test#1234"); -// RyaURI uri2 = new RyaURI("urn:test#1235"); -// RyaURIRange rangeURI = new RyaURIRange(uri, uri2); -// RyaURIRange rangeURI2 = new RyaURIRange(new RyaURI("urn:test#1235"), new RyaURI("urn:test#1236")); +// RyaIRI uri = new RyaIRI("urn:test#1234"); +// RyaIRI uri2 = new RyaIRI("urn:test#1235"); +// RyaIRIRange rangeIRI = new RyaIRIRange(uri, uri2); +// RyaIRIRange rangeIRI2 = new RyaIRIRange(new RyaIRI("urn:test#1235"), new RyaIRI("urn:test#1236")); // PoWholeRowTriplePatternStrategy strategy = new PoWholeRowTriplePatternStrategy(); // RyaContext ryaContext = RyaContext.getInstance(); // @@ -59,10 +59,10 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(null, uri, rangeURI, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(null, uri, rangeIRI, null, null); // assertTrue(entry.getValue().contains(key)); // -// entry = strategy.defineRange(null, uri, rangeURI2, null, null); +// entry = strategy.defineRange(null, uri, rangeIRI2, null, null); // assertFalse(entry.getValue().contains(key)); // } // @@ -111,15 +111,15 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeURI, uri, uri, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeIRI, uri, uri, null, null); // assertTrue(entry.getValue().contains(key)); // -// entry = strategy.defineRange(rangeURI2, uri, uri, null, null); +// entry = strategy.defineRange(rangeIRI2, uri, uri, null, null); // assertFalse(entry.getValue().contains(key)); // } // // public void testPRange() throws Exception { -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(null, rangeURI, null, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(null, rangeIRI, null, null, null); // Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = ryaContext.serializeTriple(new RyaStatement(uri, uri, uri, null)); // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO); // Key key = new Key(new Text(tripleRow.getRow())); @@ -140,22 +140,22 @@ // assertTrue(strategy.handles(null, uri, uri, null)); // assertTrue(strategy.handles(null, uri, uri, uri)); // //po_r(s)(ng) -// assertTrue(strategy.handles(rangeURI, uri, uri, null)); -// assertTrue(strategy.handles(rangeURI, uri, uri, uri)); +// assertTrue(strategy.handles(rangeIRI, uri, uri, null)); +// assertTrue(strategy.handles(rangeIRI, uri, uri, uri)); // //p(ng) // assertTrue(strategy.handles(null, uri, null, null)); // assertTrue(strategy.handles(null, uri, null, uri)); // //p_r(o)(ng) -// assertTrue(strategy.handles(null, uri, rangeURI, null)); -// assertTrue(strategy.handles(null, uri, rangeURI, uri)); +// assertTrue(strategy.handles(null, uri, rangeIRI, null)); +// assertTrue(strategy.handles(null, uri, rangeIRI, uri)); // //r(p)(ng) -// assertTrue(strategy.handles(null, rangeURI, null, null)); -// assertTrue(strategy.handles(null, rangeURI, null, uri)); +// assertTrue(strategy.handles(null, rangeIRI, null, null)); +// assertTrue(strategy.handles(null, rangeIRI, null, uri)); // // //false cases // //sp.. // assertFalse(strategy.handles(uri, uri, null, null)); // //r(s)_p -// assertFalse(strategy.handles(rangeURI, uri, null, null)); +// assertFalse(strategy.handles(rangeIRI, uri, null, null)); // } //} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java index 2c40053..9fb0793 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java @@ -40,10 +40,10 @@ //public class SpoWholeRowTriplePatternStrategyTest extends TestCase { // private static final ValueFactory VF = SimpleValueFactory.getInstance(); // -// RyaURI uri = new RyaURI("urn:test#1234"); -// RyaURI uri2 = new RyaURI("urn:test#1235"); -// RyaURIRange rangeURI = new RyaURIRange(uri, uri2); -// RyaURIRange rangeURI2 = new RyaURIRange(new RyaURI("urn:test#1235"), new RyaURI("urn:test#1236")); +// RyaIRI uri = new RyaIRI("urn:test#1234"); +// RyaIRI uri2 = new RyaIRI("urn:test#1235"); +// RyaIRIRange rangeIRI = new RyaIRIRange(uri, uri2); +// RyaIRIRange rangeIRI2 = new RyaIRIRange(new RyaIRI("urn:test#1235"), new RyaIRI("urn:test#1236")); // SpoWholeRowTriplePatternStrategy strategy = new SpoWholeRowTriplePatternStrategy(); // RyaContext ryaContext = RyaContext.getInstance(); // @@ -85,10 +85,10 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(uri, uri, rangeURI, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(uri, uri, rangeIRI, null, null); // assertTrue(entry.getValue().contains(key)); // -// entry = strategy.defineRange(uri, uri, rangeURI2, null, null); +// entry = strategy.defineRange(uri, uri, rangeIRI2, null, null); // assertFalse(entry.getValue().contains(key)); // } // @@ -123,9 +123,9 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(uri, rangeURI, null, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(uri, rangeIRI, null, null, null); // assertTrue(entry.getValue().contains(key)); -// entry = strategy.defineRange(uri, rangeURI2, null, null, null); +// entry = strategy.defineRange(uri, rangeIRI2, null, null, null); // assertFalse(entry.getValue().contains(key)); // } // @@ -148,10 +148,10 @@ // TripleRow tripleRow = serialize.get(RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO); // Key key = new Key(new Text(tripleRow.getRow())); // -// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeURI, null, null, null, null); +// Map.Entry<RdfCloudTripleStoreConstants.TABLE_LAYOUT, Range> entry = strategy.defineRange(rangeIRI, null, null, null, null); // assertTrue(entry.getValue().contains(key)); // -// entry = strategy.defineRange(rangeURI2, null, null, null, null); +// entry = strategy.defineRange(rangeIRI2, null, null, null, null); // assertFalse(entry.getValue().contains(key)); // } // @@ -166,22 +166,22 @@ // assertTrue(strategy.handles(uri, null, null, null)); // assertTrue(strategy.handles(uri, null, null, uri)); // //sp_r(o)(ng) -// assertTrue(strategy.handles(uri, uri, rangeURI, null)); -// assertTrue(strategy.handles(uri, uri, rangeURI, uri)); +// assertTrue(strategy.handles(uri, uri, rangeIRI, null)); +// assertTrue(strategy.handles(uri, uri, rangeIRI, uri)); // //s_r(p)(ng) -// assertTrue(strategy.handles(uri, rangeURI, null, null)); -// assertTrue(strategy.handles(uri, rangeURI, null, uri)); +// assertTrue(strategy.handles(uri, rangeIRI, null, null)); +// assertTrue(strategy.handles(uri, rangeIRI, null, uri)); // //r(s) -// assertTrue(strategy.handles(rangeURI, null, null, null)); +// assertTrue(strategy.handles(rangeIRI, null, null, null)); // // //fail // //s_r(p)_r(o) -// assertFalse(strategy.handles(uri, rangeURI, rangeURI, null)); +// assertFalse(strategy.handles(uri, rangeIRI, rangeIRI, null)); // // //s==null // assertFalse(strategy.handles(null, uri, uri, null)); // // //s_r(o) -// assertFalse(strategy.handles(uri, null, rangeURI, null)); +// assertFalse(strategy.handles(uri, null, rangeIRI, null)); // } //} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java index ade343f..d4b5f5c 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.query.strategy.wholerow.MockRdfConfiguration; import org.apache.rya.api.resolver.triple.TripleRow; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; @@ -42,11 +42,11 @@ public class RyaContextTest extends TestCase { byte[] serialize = instance.serialize(ryaType); assertEquals(ryaType, instance.deserialize(serialize)); - //uri - RyaURI ryaURI = new RyaURI("urn:test#1234"); - serialize = instance.serialize(ryaURI); + //iri + RyaIRI ryaIRI = new RyaIRI("urn:test#1234"); + serialize = instance.serialize(ryaIRI); RyaType deserialize = instance.deserialize(serialize); - assertEquals(ryaURI, deserialize); + assertEquals(ryaIRI, deserialize); //custom type ryaType = new RyaType(SimpleValueFactory.getInstance().createIRI("urn:test#customDataType"), "mydata"); @@ -55,8 +55,8 @@ public class RyaContextTest extends TestCase { } public void testTripleRowSerialization() throws Exception { - RyaURI subj = new RyaURI("urn:test#subj"); - RyaURI pred = new RyaURI("urn:test#pred"); + RyaIRI subj = new RyaIRI("urn:test#subj"); + RyaIRI pred = new RyaIRI("urn:test#pred"); RyaType obj = new RyaType("mydata"); RyaStatement statement = new RyaStatement(subj, pred, obj); RyaTripleContext instance = RyaTripleContext.getInstance(new MockRdfConfiguration()); @@ -67,8 +67,8 @@ public class RyaContextTest extends TestCase { } public void testHashedTripleRowSerialization() throws Exception { - RyaURI subj = new RyaURI("urn:test#subj"); - RyaURI pred = new RyaURI("urn:test#pred"); + RyaIRI subj = new RyaIRI("urn:test#subj"); + RyaIRI pred = new RyaIRI("urn:test#pred"); RyaType obj = new RyaType("mydata"); RyaStatement statement = new RyaStatement(subj, pred, obj); MockRdfConfiguration config = new MockRdfConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaIRIResolverTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaIRIResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaIRIResolverTest.java new file mode 100644 index 0000000..40c58e0 --- /dev/null +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaIRIResolverTest.java @@ -0,0 +1,40 @@ +package org.apache.rya.api.resolver.impl; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + + +import junit.framework.TestCase; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaIRI; + +/** + * Date: 7/16/12 + * Time: 2:51 PM + */ +public class RyaIRIResolverTest extends TestCase { + + public void testSerialization() throws Exception { + RyaIRI ryaIRI = new RyaIRI("urn:testdata#data"); + byte[] serialize = new RyaIRIResolver().serialize(ryaIRI); + RyaType deserialize = new RyaIRIResolver().deserialize(serialize); + assertEquals(ryaIRI, deserialize); + } +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaURIResolverTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaURIResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaURIResolverTest.java deleted file mode 100644 index 811961a..0000000 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/impl/RyaURIResolverTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.apache.rya.api.resolver.impl; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - - -import junit.framework.TestCase; -import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; - -/** - * Date: 7/16/12 - * Time: 2:51 PM - */ -public class RyaURIResolverTest extends TestCase { - - public void testSerialization() throws Exception { - RyaURI ryaURI = new RyaURI("urn:testdata#data"); - byte[] serialize = new RyaURIResolver().serialize(ryaURI); - RyaType deserialize = new RyaURIResolver().deserialize(serialize); - assertEquals(ryaURI, deserialize); - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/HashedWholeRowTripleResolverTest.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/HashedWholeRowTripleResolverTest.java b/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/HashedWholeRowTripleResolverTest.java index f57b5d1..2dcb362 100644 --- a/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/HashedWholeRowTripleResolverTest.java +++ b/common/rya.api/src/test/java/org/apache/rya/api/resolver/triple/impl/HashedWholeRowTripleResolverTest.java @@ -26,7 +26,7 @@ import java.util.Map; import junit.framework.TestCase; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.triple.TripleRow; /** @@ -39,10 +39,10 @@ public class HashedWholeRowTripleResolverTest extends TestCase { public void testSerialize() throws Exception { //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); @@ -61,10 +61,10 @@ public class HashedWholeRowTripleResolverTest extends TestCase { public void testSerializePO() throws Exception { RdfCloudTripleStoreConstants.TABLE_LAYOUT po = RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO; //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = tripleResolver.serialize(stmt); @@ -82,10 +82,10 @@ public class HashedWholeRowTripleResolverTest extends TestCase { public void testSerializeOSP() throws Exception { RdfCloudTripleStoreConstants.TABLE_LAYOUT po = RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP; //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = tripleResolver.serialize(stmt); @@ -103,10 +103,10 @@ public class HashedWholeRowTripleResolverTest extends TestCase { public void testSerializeOSPCustomType() throws Exception { RdfCloudTripleStoreConstants.TABLE_LAYOUT po = RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP; //no context - RyaURI subj = new RyaURI("urn:test#1234"); - RyaURI pred = new RyaURI("urn:test#pred"); - RyaURI obj = new RyaURI("urn:test#obj"); - RyaURI cntxt = new RyaURI("urn:test#cntxt"); + RyaIRI subj = new RyaIRI("urn:test#1234"); + RyaIRI pred = new RyaIRI("urn:test#pred"); + RyaIRI obj = new RyaIRI("urn:test#obj"); + RyaIRI cntxt = new RyaIRI("urn:test#cntxt"); final RyaStatement stmt = new RyaStatement(subj, pred, obj, null, null, null, null, 100l); final RyaStatement stmtContext = new RyaStatement(subj, pred, obj, cntxt, null, null, null, 100l); Map<RdfCloudTripleStoreConstants.TABLE_LAYOUT, TripleRow> serialize = tripleResolver.serialize(stmt);
