http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java index d2db8b1..4ce6932 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java @@ -19,9 +19,7 @@ package org.apache.rya.api.date; * under the License. */ - - -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; /** * Class TimestampTtlValueConverter
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java index b850002..98ea208 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java @@ -19,11 +19,9 @@ package org.apache.rya.api.date; * under the License. */ - - -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; /** * Class TtlValueConverter @@ -31,7 +29,7 @@ import org.openrdf.model.impl.ValueFactoryImpl; */ public interface TtlValueConverter { - ValueFactory vf = ValueFactoryImpl.getInstance(); + ValueFactory vf = SimpleValueFactory.getInstance(); public void convert(String ttl, String startTime); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java index a5c1a02..a1e1468 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java @@ -21,14 +21,14 @@ package org.apache.rya.api.domain; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.SimpleIRI; /** * A Node is an expected node in the global graph. This typing of the URI allows us to dictate the difference between a * URI that is just an Attribute on the subject vs. a URI that is another subject Node in the global graph. It does not * guarantee that the subject exists, just that there is an Edge to it. */ -public class Node extends URIImpl { +public class Node extends SimpleIRI { public Node() { } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java index 0623e51..d47ab5a 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java @@ -21,8 +21,7 @@ package org.apache.rya.api.domain; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.IRI; /** * Created by IntelliJ IDEA. @@ -30,14 +29,14 @@ import org.openrdf.model.Value; * Time: 1:03 PM * To change this template use File | Settings | File Templates. */ -public class RangeURI extends RangeValue<URI> implements URI { +public class RangeURI extends RangeValue<IRI> implements IRI { - public RangeURI(URI start, URI end) { + public RangeURI(IRI start, IRI end) { super(start, end); } public RangeURI(RangeValue rangeValue) { - super((URI) rangeValue.getStart(), (URI) rangeValue.getEnd()); + super((IRI) rangeValue.getStart(), (IRI) rangeValue.getEnd()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java index 7d9ed24..b92f8b6 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java @@ -19,9 +19,7 @@ package org.apache.rya.api.domain; * under the License. */ - - -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; /** * Created by IntelliJ IDEA. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java index adbad38..e181597 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java @@ -22,7 +22,7 @@ package org.apache.rya.api.domain; import org.apache.rya.api.RdfCloudTripleStoreConstants; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Date: 7/16/12 @@ -35,9 +35,9 @@ public class RyaSchema { public static final String BNODE_NAMESPACE = "urn:org.apache.rya/bnode/2012/07#"; //datatypes - public static final URI NODE = RdfCloudTripleStoreConstants.VALUE_FACTORY.createURI(NAMESPACE, "node"); - public static final URI LANGUAGE = RdfCloudTripleStoreConstants.VALUE_FACTORY.createURI(NAMESPACE, "lang"); + public static final IRI NODE = RdfCloudTripleStoreConstants.VALUE_FACTORY.createIRI(NAMESPACE, "node"); + public static final IRI LANGUAGE = RdfCloudTripleStoreConstants.VALUE_FACTORY.createIRI(NAMESPACE, "lang"); //functions - public static final URI RANGE = RdfCloudTripleStoreConstants.VALUE_FACTORY.createURI(NAMESPACE, "range"); + public static final IRI RANGE = RdfCloudTripleStoreConstants.VALUE_FACTORY.createIRI(NAMESPACE, "range"); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java index ab5306e..8de4667 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java @@ -18,8 +18,9 @@ */ package org.apache.rya.api.domain; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.XMLSchema; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Base Rya Type @@ -28,7 +29,7 @@ import org.openrdf.model.vocabulary.XMLSchema; */ public class RyaType implements Comparable { - private URI dataType; + private IRI dataType; private String data; public RyaType() { @@ -40,17 +41,17 @@ public class RyaType implements Comparable { } - public RyaType(final URI dataType, final String data) { + public RyaType(final IRI dataType, final String data) { setDataType(dataType); setData(data); } /** - * TODO: Can we get away without using the openrdf URI + * TODO: Can we get away without using the RDF4J IRI * * @return */ - public URI getDataType() { + public IRI getDataType() { return dataType; } @@ -58,7 +59,7 @@ public class RyaType implements Comparable { return data; } - public void setDataType(final URI dataType) { + public void setDataType(final IRI dataType) { this.dataType = dataType; } @@ -89,14 +90,11 @@ public class RyaType implements Comparable { if (o == null || !(o instanceof RyaType)) { return false; } - final RyaType ryaType = (RyaType) o; - if (data != null ? !data.equals(ryaType.data) : ryaType.data != null) { - return false; - } - if (dataType != null ? !dataType.equals(ryaType.dataType) : ryaType.dataType != null) { - return false; - } - return true; + final RyaType other = (RyaType) o; + final EqualsBuilder builder = new EqualsBuilder() + .append(getData(), other.getData()) + .append(getDataType(), other.getDataType()); + return builder.isEquals(); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java index dab53a6..d08bc5b 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java @@ -21,7 +21,7 @@ package org.apache.rya.api.domain; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM; import static org.apache.rya.api.RdfCloudTripleStoreConstants.LAST; @@ -32,7 +32,7 @@ import static org.apache.rya.api.RdfCloudTripleStoreConstants.LAST; */ public class RyaTypePrefix extends RyaTypeRange { - public RyaTypePrefix(URI datatype, String prefix) { + public RyaTypePrefix(IRI datatype, String prefix) { super(); setPrefix(datatype, prefix); } @@ -47,7 +47,7 @@ public class RyaTypePrefix extends RyaTypeRange { setStop(new RyaType(prefix + LAST)); } - public void setPrefix(URI datatype, String prefix) { + public void setPrefix(IRI datatype, String prefix) { setStart(new RyaType(datatype, prefix + DELIM)); setStop(new RyaType(datatype, prefix + LAST)); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java index badde87..38d57f5 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java @@ -21,7 +21,7 @@ package org.apache.rya.api.domain; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Date: 7/17/12 @@ -56,7 +56,7 @@ public class RyaTypeRange extends RyaType implements RyaRange { } @Override - public URI getDataType() { + public IRI getDataType() { return start.getDataType(); } @@ -84,9 +84,7 @@ public class RyaTypeRange extends RyaType implements RyaRange { RyaTypeRange that = (RyaTypeRange) o; if (start != null ? !start.equals(that.start) : that.start != null) return false; - if (stop != null ? !stop.equals(that.stop) : that.stop != null) return false; - - return true; + return stop != null ? stop.equals(that.stop) : that.stop == null; } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java index 6f9902e..e7032e3 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeUtils.java @@ -20,12 +20,12 @@ package org.apache.rya.api.domain; import java.util.Date; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleIRI; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; import com.google.common.collect.ImmutableMap; @@ -45,8 +45,8 @@ public final class RyaTypeUtils { .put(Long.class, (v) -> longRyaType((Long) v)) .put(Short.class, (v) -> shortRyaType((Short) v)) .put(String.class, (v) -> stringRyaType((String) v)) - .put(URI.class, (v) -> uriRyaType((URI) v)) - .put(URIImpl.class, (v) -> uriRyaType((URIImpl) v)) + .put(IRI.class, (v) -> uriRyaType((IRI) v)) + .put(SimpleIRI.class, (v) -> uriRyaType((SimpleIRI) v)) .build(); /** @@ -182,11 +182,11 @@ public final class RyaTypeUtils { /** * * Creates a URI {@link RyaType} object. - * @param value the {@link URI} object. + * @param value the {@link IRI} object. * @return the {@link RyaType} with the data type set to * {@link XMLSchema#ANYURI} and the data set to the specified {@code value}. */ - public static RyaType uriRyaType(final URI value) { + public static RyaType uriRyaType(final IRI value) { return new RyaType(XMLSchema.ANYURI, value.stringValue()); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java index d90ba4b..1e948ae 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java @@ -19,11 +19,9 @@ package org.apache.rya.api.domain; * under the License. */ - - -import org.openrdf.model.URI; -import org.openrdf.model.util.URIUtil; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.util.URIUtil; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** @@ -44,7 +42,7 @@ public class RyaURI extends RyaType { super(XMLSchema.ANYURI, namespace + data); } - protected RyaURI(URI datatype, String data) { + protected RyaURI(IRI datatype, String data) { super(datatype, data); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java index 83612b7..23fe2d3 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/StatementMetadata.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.rya.api.persist.RdfDAOException; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.google.common.base.Preconditions; import com.google.common.reflect.TypeToken; @@ -42,7 +42,7 @@ import com.google.gson.JsonSerializer; public class StatementMetadata { private static Gson gson = new GsonBuilder().enableComplexMapKeySerialization() - .registerTypeHierarchyAdapter(RyaType.class, new RyaTypeAdapter()).create();; + .registerTypeHierarchyAdapter(RyaType.class, new RyaTypeAdapter()).create(); public static StatementMetadata EMPTY_METADATA = new StatementMetadata(); private Map<RyaURI, RyaType> metadataMap = new HashMap<>(); @@ -127,7 +127,7 @@ public class StatementMetadata { if(type.equals(RyaURI.class.getName())){ return new RyaURI(array[0]); } else if(type.equals(RyaType.class.getName())){ - RyaType ryaType = new RyaType(new URIImpl(array[1]), array[0]); + RyaType ryaType = new RyaType(SimpleValueFactory.getInstance().createIRI(array[1]), array[0]); return ryaType; } else { throw new IllegalArgumentException("Unparseable RyaType."); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/VarNameUtils.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/VarNameUtils.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/VarNameUtils.java new file mode 100644 index 0000000..6f47e35 --- /dev/null +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/VarNameUtils.java @@ -0,0 +1,202 @@ +/* + * 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. + */ +package org.apache.rya.api.domain; + +import org.apache.commons.lang.StringUtils; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.TupleExprs; + +/** + * Utility methods and constants for RDF {@link Var} names. + */ +public final class VarNameUtils { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + + /** + * Prepended to the start of constant var names. + */ + public static final String CONSTANT_PREFIX = "_const_"; + private static final String LEGACY_CONSTANT_PREFIX = "-const-"; + + /** + * Prepended to the start of anonymous var names. + */ + public static final String ANONYMOUS_PREFIX = "_anon_"; + private static final String LEGACY_ANONYMOUS_PREFIX = "-anon-"; + + /** + * Private constructor to prevent instantiation. + */ + private VarNameUtils() { + } + + /** + * Prepends the constant prefix to the specified value. + * @param value the value to add the constant prefix to. + * @return the value with the constant prefix attached before it. + */ + public static String prependConstant(final String value) { + if (value != null) { + return CONSTANT_PREFIX + value; + } + return null; + } + + /** + * Checks if the var name has the constant prefix. + * @param name the var name to check. + * @return {@code true} if the name begins with the constant prefix. + * {@code false} otherwise. + */ + public static boolean isConstant(final String name) { + if (name != null) { + return name.startsWith(CONSTANT_PREFIX) || name.startsWith(LEGACY_CONSTANT_PREFIX); + } + return false; + } + + /** + * Removes the constant prefix from a string if it exists. + * @param name the name string to strip the constant prefix from. + * @return the string with the constant prefix removed. Otherwise returns + * the original string. + */ + public static String removeConstant(final String name) { + if (isConstant(name)) { + String removed = StringUtils.removeStart(name, CONSTANT_PREFIX); + if (name.equals(removed)) { + removed = StringUtils.removeStart(name, LEGACY_CONSTANT_PREFIX); + } + return removed; + } + return name; + } + + /** + * Prepends the anonymous prefix to the specified value. + * @param value the value to add the anonymous prefix to. + * @return the value with the anonymous prefix attached before it. + */ + public static String prependAnonymous(final String value) { + if (value != null) { + return ANONYMOUS_PREFIX + value; + } + return null; + } + + /** + * Checks if the var name has the anonymous prefix. + * @param name the var name to check. + * @return {@code true} if the name begins with the anonymous prefix. + * {@code false} otherwise. + */ + public static boolean isAnonymous(final String name) { + if (name != null) { + return name.startsWith(ANONYMOUS_PREFIX) || name.startsWith(LEGACY_ANONYMOUS_PREFIX); + } + return false; + } + + /** + * Removes the anonymous prefix from a string if it exists. + * @param name the name string to strip the anonymous prefix from. + * @return the string with the anonymous prefix removed. Otherwise returns + * the original string. + */ + public static String removeAnonymous(final String name) { + if (isAnonymous(name)) { + String removed = StringUtils.removeStart(name, ANONYMOUS_PREFIX); + if (name.equals(removed)) { + removed = StringUtils.removeStart(name, LEGACY_ANONYMOUS_PREFIX); + } + } + return name; + } + + /** + * Creates a unique constant name for the {@link Var} with the supplied + * {@link Value}. + * @param value the {@link Value}. + * @return the unique constant name for the {@link Var}. + */ + public static String createUniqueConstVarName(final Value value) { + return TupleExprs.getConstVarName(value); + } + + /** + * Creates a unique constant name for the {@link Var} with the supplied + * label. + * @param label the label for the {@code Literal}. + * @return the unique constant name for the {@link Var}. + */ + public static String createUniqueConstVarNameLiteral(final String label) { + return createUniqueConstVarName(VF.createLiteral(label)); + } + + /** + * Creates a unique constant name for the {@link Var} with the supplied + * IRI string. + * @param iri the string-representation of the {@IRI} + * @return the unique constant name for the {@link Var}. + */ + public static String createUniqueConstVarNameIri(final String iri) { + return createUniqueConstVarName(VF.createIRI(iri)); + } + + /** + * Creates a simple constant name for a {@link Var} to replace the unique + * hex string constant name. The simple constant name will be one of: + * <ul> + * <li>The var's original string value with "_const_" prepended to it if + * it's a constant (i.e. the constant var name was already likely + * derived from {@link TupleExprs#createConstVar(Value)})</li> + * <li>The original var name if it's not a constant or if it has no + * value to generate a simple constant name from</li> + * <li>{@code null} if {@code var} is {@code null}</li> + * </ul> + * @param var the {@link Var}. + * @return the simple constant var name. + */ + public static String createSimpleConstVarName(final Var var) { + String varName = null; + if (var != null) { + if (var.getValue() != null && isConstant(var.getName())) { + // Replaces the unique constant hex string name with a simple + // readable constant name + varName = prependConstant(var.getValue().stringValue()); + } else { + varName = var.getName(); + } + } + return varName; + } + + /** + * Creates a uniquely named constant {@link Var} with the supplied + * {@link Value}. + * @param value the {@link Value}. + * @return the uniquely named constant {@link Var}. + */ + public static Var createUniqueConstVar(final Value value) { + return new Var(TupleExprs.getConstVarName(value), value); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java index 6c0efd2..69a09bb 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/serialization/kryo/RyaStatementSerializer.java @@ -17,26 +17,27 @@ package org.apache.rya.api.domain.serialization.kryo; * specific language governing permissions and limitations * under the License. */ -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; + +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; - /** * Kryo Serializer for {@link RyaStatement}s * */ public class RyaStatementSerializer extends Serializer<RyaStatement> { - + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + /** * Uses Kryo to write RyaStatement to {@lin Output} * @param kryo - writes statement to output @@ -117,7 +118,7 @@ public class RyaStatementSerializer extends Serializer<RyaStatement> { value = new RyaURI(objectValue); } else { - value = new RyaType(new URIImpl(objectType), objectValue); + value = new RyaType(VF.createIRI(objectType), objectValue); } RyaStatement statement = new RyaStatement(new RyaURI(subject), new RyaURI(predicate), value); int length = 0; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/functions/DateTimeWithinPeriod.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/functions/DateTimeWithinPeriod.java b/common/rya.api/src/main/java/org/apache/rya/api/functions/DateTimeWithinPeriod.java index aedeea7..655425d 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/functions/DateTimeWithinPeriod.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/functions/DateTimeWithinPeriod.java @@ -17,21 +17,21 @@ * under the License. */package org.apache.rya.api.functions; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - import java.time.Duration; import java.time.Instant; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.vocabulary.FN; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.vocabulary.FN; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; /** * This {@link Function} determines whether two {@link XMLSchema#DATETIME}s occur within a specified period of time of @@ -83,11 +83,11 @@ public class DateTimeWithinPeriod implements Function { checkArgument(values[0] instanceof Literal); checkArgument(values[1] instanceof Literal); checkArgument(values[2] instanceof Literal); - checkArgument(values[3] instanceof URI); + checkArgument(values[3] instanceof IRI); Instant dateTime1 = convertToInstant((Literal) values[0]); Instant dateTime2 = convertToInstant((Literal) values[1]); - long periodMillis = convertPeriodToMillis((Literal) values[2], (URI) values[3]); + long periodMillis = convertPeriodToMillis((Literal) values[2], (IRI) values[3]); long timeBetween = Math.abs(Duration.between(dateTime1, dateTime2).toMillis()); return valueFactory.createLiteral(timeBetween < periodMillis); @@ -98,16 +98,16 @@ public class DateTimeWithinPeriod implements Function { private Instant convertToInstant(Literal literal) { String stringVal = literal.getLabel(); - URI dataType = literal.getDatatype(); + IRI dataType = literal.getDatatype(); checkArgument(dataType.equals(XMLSchema.DATETIME) || dataType.equals(XMLSchema.DATE), String.format("Invalid data type for date time. Data Type must be of type %s or %s .", XMLSchema.DATETIME, XMLSchema.DATE)); checkArgument(XMLDatatypeUtil.isValidDateTime(stringVal) || XMLDatatypeUtil.isValidDate(stringVal), "Invalid date time value."); return literal.calendarValue().toGregorianCalendar().toInstant(); } - private long convertPeriodToMillis(Literal literal, URI unit) { + private long convertPeriodToMillis(Literal literal, IRI unit) { String stringVal = literal.getLabel(); - URI dataType = literal.getDatatype(); + IRI dataType = literal.getDatatype(); checkArgument(dataType.equals(XMLSchema.INTEGER) || dataType.equals(XMLSchema.INT), String .format("Invalid data type for period duration. Data Type must be of type %s or %s .", XMLSchema.INTEGER, XMLSchema.INT)); checkArgument(XMLDatatypeUtil.isValidInteger(stringVal) || XMLDatatypeUtil.isValidInt(stringVal), "Invalid duration value."); @@ -122,7 +122,7 @@ public class DateTimeWithinPeriod implements Function { * indicated by the namespace <http://www.w3.org/2006/time#>) * @return - duration in milliseconds */ - private long convertToMillis(int duration, URI unit) { + private long convertToMillis(int duration, IRI unit) { checkArgument(duration > 0); return OWLTime.getMillis(duration, unit); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/functions/OWLTime.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/functions/OWLTime.java b/common/rya.api/src/main/java/org/apache/rya/api/functions/OWLTime.java index 5ffc4ee..48649d1 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/functions/OWLTime.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/functions/OWLTime.java @@ -26,9 +26,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; /** * Constants for OWL-Time primitives in the OWL-Time namespace. @@ -36,7 +36,7 @@ import org.openrdf.model.impl.ValueFactoryImpl; */ public class OWLTime { - private static final ValueFactory FACTORY = ValueFactoryImpl.getInstance(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); /** * Indicates namespace of OWL-Time ontology @@ -45,25 +45,25 @@ public class OWLTime { /** * Seconds class of type DurationDescription in OWL-Time ontology */ - public static final URI SECONDS_URI = FACTORY.createURI(NAMESPACE, "seconds"); + public static final IRI SECONDS_URI = VF.createIRI(NAMESPACE, "seconds"); /** * Minutes class of type DurationDescription in OWL-Time ontology */ - public static final URI MINUTES_URI = FACTORY.createURI(NAMESPACE, "minutes"); + public static final IRI MINUTES_URI = VF.createIRI(NAMESPACE, "minutes"); /** * Hours class of type DurationDescription in OWL-Time ontology */ - public static final URI HOURS_URI = FACTORY.createURI(NAMESPACE, "hours"); + public static final IRI HOURS_URI = VF.createIRI(NAMESPACE, "hours"); /** * Days class of type DurationDescription in OWL-Time ontology */ - public static final URI DAYS_URI = FACTORY.createURI(NAMESPACE, "days"); + public static final IRI DAYS_URI = VF.createIRI(NAMESPACE, "days"); /** * Weeks class of type DurationDescription in OWL-Time ontology */ - public static final URI WEEKS_URI = FACTORY.createURI(NAMESPACE, "weeks"); + public static final IRI WEEKS_URI = VF.createIRI(NAMESPACE, "weeks"); - private static final Map<URI, ChronoUnit> DURATION_MAP = new HashMap<>(); + private static final Map<IRI, ChronoUnit> DURATION_MAP = new HashMap<>(); static { DURATION_MAP.put(SECONDS_URI, ChronoUnit.SECONDS); @@ -78,7 +78,7 @@ public class OWLTime { * @param durationURI - OWLTime URI indicating the time unit (not null) * @return - {@code true} if this URI indicates a supported OWLTime time unit */ - public static boolean isValidDurationType(URI durationURI) { + public static boolean isValidDurationType(IRI durationURI) { checkNotNull(durationURI); return DURATION_MAP.containsKey(durationURI); } @@ -89,9 +89,9 @@ public class OWLTime { * @param duration - amount of time in the units indicated by the provided {@link OWLTime} URI * @param uri - OWLTime URI indicating the time unit of duration (not null) * @return - the amount of time in milliseconds - * @throws IllegalArgumentException if provided {@link URI} is not a valid, supported OWL-Time time unit. + * @throws IllegalArgumentException if provided {@link IRI} is not a valid, supported OWL-Time time unit. */ - public static long getMillis(int duration, URI uri) throws IllegalArgumentException { + public static long getMillis(int duration, IRI uri) throws IllegalArgumentException { Optional<ChronoUnit> unit = getChronoUnitFromURI(uri); checkArgument(unit.isPresent(), String.format("URI %s does not indicate a valid OWLTime time unit. URI must of be of type %s, %s, %s, %s, or %s .", uri, @@ -105,7 +105,7 @@ public class OWLTime { * @param durationURI - OWLTime time unit URI (not null) * @return - corresponding ChronoUnit time unit */ - public static Optional<ChronoUnit> getChronoUnitFromURI(URI durationURI) { + public static Optional<ChronoUnit> getChronoUnitFromURI(IRI durationURI) { return Optional.ofNullable(DURATION_MAP.get(durationURI)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/path/PathUtils.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/path/PathUtils.java b/common/rya.api/src/main/java/org/apache/rya/api/path/PathUtils.java index 8f46977..ae47b3f 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/path/PathUtils.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/path/PathUtils.java @@ -202,7 +202,7 @@ public final class PathUtils { final UserPrincipal owner = Files.getOwner(partialPath); if (!user.equals(owner) && !root.equals(owner)) { // dir owned by someone else, not secure - return false; + return SystemUtils.IS_OS_UNIX ? false : Files.isWritable(partialPath); } } } catch (final IOException x) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java index 0b63d58..b91a137 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java @@ -19,13 +19,11 @@ package org.apache.rya.api.persist; * under the License. */ - - import java.util.List; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.openrdf.model.Resource; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; /** * Class RdfEvalStatsDAO @@ -45,7 +43,7 @@ public interface RdfEvalStatsDAO<C extends RdfCloudTripleStoreConfiguration> { // XXX returns -1 if no cardinality could be found. public double getCardinality(C conf, CARDINALITY_OF card, List<Value> val) throws RdfDAOException; - public double getCardinality(C conf, CARDINALITY_OF card, List<Value> val, Resource context) throws RdfDAOException; + public double getCardinality(C conf, CARDINALITY_OF card, List<Value> val, Resource context) throws RdfDAOException; public void setConf(C conf); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java index 8415edd..83d90a5 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java @@ -19,11 +19,9 @@ package org.apache.rya.api.persist; * under the License. */ - - -import info.aduna.iteration.CloseableIteration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.openrdf.model.Namespace; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.Namespace; /** * Date: 7/17/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java index ef21f1f..1bdc95b 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java @@ -19,7 +19,6 @@ package org.apache.rya.api.persist.index; * under the License. */ - import java.io.Closeable; import java.io.Flushable; import java.io.IOException; @@ -27,23 +26,22 @@ import java.util.Collection; import java.util.Set; import org.apache.hadoop.conf.Configurable; -import org.openrdf.model.URI; - import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaURI; +import org.eclipse.rdf4j.model.IRI; public interface RyaSecondaryIndexer extends Closeable, Flushable, Configurable { /** * initialize after setting configuration. */ - public void init(); + public void init(); /** * Returns the table name if the implementation supports it. * Note that some indexers use multiple tables, this only returns one. * TODO recommend that we deprecate this method because it's a leaky interface. * @return table name as a string. */ - public String getTableName(); + public String getTableName(); public void storeStatements(Collection<RyaStatement> statements) throws IOException; @@ -56,11 +54,11 @@ public interface RyaSecondaryIndexer extends Closeable, Flushable, Configurable /** * @return the set of predicates indexed by the indexer. */ - public abstract Set<URI> getIndexablePredicates(); + public Set<IRI> getIndexablePredicates(); @Override - public abstract void flush() throws IOException; + public void flush() throws IOException; @Override - public abstract void close() throws IOException; + public void close() throws IOException; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java index af2a5d8..5ebe7fb 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java @@ -19,12 +19,10 @@ package org.apache.rya.api.persist.joinselect; * under the License. */ - - import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.persist.RdfEvalStatsDAO; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; public interface SelectivityEvalDAO<C extends RdfCloudTripleStoreConfiguration> extends RdfEvalStatsDAO<C> { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java index 2cef5a1..5630289 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java @@ -23,7 +23,6 @@ package org.apache.rya.api.persist.query; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; /** @@ -92,9 +91,7 @@ public class BatchRyaQuery extends RyaQueryOptions { BatchRyaQuery that = (BatchRyaQuery) o; - if (queries != null ? !queries.equals(that.queries) : that.queries != null) return false; - - return true; + return queries != null ? queries.equals(that.queries) : that.queries == null; } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java index 5404804..1e027ec 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java @@ -19,10 +19,6 @@ package org.apache.rya.api.persist.query; * under the License. */ - - -import info.aduna.iteration.CloseableIteration; - import java.io.Closeable; import java.util.Collection; import java.util.Map; @@ -31,9 +27,9 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.persist.RyaConfigured; import org.apache.rya.api.persist.RyaDAOException; - import org.calrissian.mango.collect.CloseableIterable; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.query.BindingSet; /** * Rya Query Engine to perform queries against the Rya triple store. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java index 01a2b0d..5ddc19d 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java @@ -19,14 +19,12 @@ package org.apache.rya.api.persist.query; * under the License. */ - +import java.util.Arrays; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; - /** */ public class RyaQueryOptions { @@ -225,9 +223,7 @@ public class RyaQueryOptions { if (regexPredicate != null ? !regexPredicate.equals(that.regexPredicate) : that.regexPredicate != null) return false; if (regexSubject != null ? !regexSubject.equals(that.regexSubject) : that.regexSubject != null) return false; - if (ttl != null ? !ttl.equals(that.ttl) : that.ttl != null) return false; - - return true; + return ttl != null ? ttl.equals(that.ttl) : that.ttl == null; } @Override http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java index 353d1ee..65c01a7 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java @@ -19,9 +19,10 @@ package org.apache.rya.api.persist.query.join; * under the License. */ +import java.util.Enumeration; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; - -import info.aduna.iteration.CloseableIteration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaStatement; @@ -31,10 +32,7 @@ import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQueryEngine; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.utils.EnumerationWrapper; - -import java.util.Enumeration; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; /** * Use HashTable to do a HashJoin. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java index 965251b..9bf216c 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java @@ -19,22 +19,23 @@ package org.apache.rya.api.persist.query.join; * under the License. */ +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; - -import com.google.common.base.Preconditions; -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.ConvertingIteration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreUtils; -import org.apache.rya.api.domain.*; +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.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQueryEngine; import org.apache.rya.api.resolver.RyaContext; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.ConvertingIteration; +import org.eclipse.rdf4j.query.BindingSet; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; +import com.google.common.base.Preconditions; /** * Date: 7/24/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java index f0d9f57..3334cd8 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java @@ -19,16 +19,14 @@ package org.apache.rya.api.persist.query.join; * under the License. */ +import java.util.Map; - -import info.aduna.iteration.CloseableIteration; 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.persist.RyaDAOException; - -import java.util.Map; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; /** * Date: 7/24/12 @@ -36,9 +34,9 @@ import java.util.Map; */ public interface Join<C extends RdfCloudTripleStoreConfiguration> { - CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaURI... preds) + public CloseableIteration<RyaStatement, RyaDAOException> join(C conf, RyaURI... preds) throws RyaDAOException; - CloseableIteration<RyaURI, RyaDAOException> join(C conf, Map.Entry<RyaURI, RyaType>... predObjs) + public CloseableIteration<RyaURI, RyaDAOException> join(C conf, Map.Entry<RyaURI, RyaType>... predObjs) throws RyaDAOException; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java index 767f61f..c858327 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java @@ -19,21 +19,24 @@ package org.apache.rya.api.persist.query.join; * under the License. */ +import java.util.ArrayList; +import java.util.List; +import java.util.Map; - -import com.google.common.base.Preconditions; -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.EmptyIteration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.domain.*; +import org.apache.rya.api.domain.RyaRange; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaURIRange; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.persist.query.RyaQueryEngine; import org.apache.rya.api.resolver.RyaContext; import org.apache.rya.api.utils.PeekingCloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.EmptyIteration; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.google.common.base.Preconditions; /** * Date: 7/24/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java index 06fe88b..5b5978a 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java @@ -19,9 +19,11 @@ package org.apache.rya.api.persist.utils; * under the License. */ +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.NoSuchElementException; - -import info.aduna.iteration.CloseableIteration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaStatement; @@ -30,17 +32,13 @@ import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.utils.NullableStatementImpl; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import java.util.NoSuchElementException; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; /** * Date: 7/20/12 @@ -48,7 +46,7 @@ import java.util.NoSuchElementException; */ public class RyaDAOHelper { - public static CloseableIteration<Statement, QueryEvaluationException> query(RyaDAO ryaDAO, Resource subject, URI predicate, Value object, RdfCloudTripleStoreConfiguration conf, Resource... contexts) throws QueryEvaluationException { + public static CloseableIteration<Statement, QueryEvaluationException> query(RyaDAO ryaDAO, Resource subject, IRI predicate, Value object, RdfCloudTripleStoreConfiguration conf, Resource... contexts) throws QueryEvaluationException { return query(ryaDAO, new NullableStatementImpl(subject, predicate, object, contexts), conf); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDaoQueryWrapper.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDaoQueryWrapper.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDaoQueryWrapper.java index af7af8a..2122f53 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDaoQueryWrapper.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDaoQueryWrapper.java @@ -24,14 +24,13 @@ import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.persist.RyaDAO; import org.apache.rya.api.resolver.RyaToRdfConversions; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.rio.RDFHandler; - -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.rio.RDFHandler; /** * Wraps Rya DAO queries into a simpler interface that just passes in the @@ -66,14 +65,14 @@ public class RyaDaoQueryWrapper { /** * Handles all results of a query. Closes the query iterator when done. * @param subject the subject {@link Resource} to query for. - * @param predicate the predicate {@link URI} to query for. + * @param predicate the predicate {@link IRI} to query for. * @param object the object {@link Value} to query for. * @param rdfStatementHandler the {@link RDFHandler} to use for handling * each statement returned. (not {@code null}) * @param contexts the context {@link Resource}s to query for. * @throws QueryEvaluationException */ - public void queryAll(final Resource subject, final URI predicate, final Value object, final RDFHandler rdfStatementHandler, final Resource... contexts) throws QueryEvaluationException { + public void queryAll(final Resource subject, final IRI predicate, final Value object, final RDFHandler rdfStatementHandler, final Resource... contexts) throws QueryEvaluationException { checkNotNull(rdfStatementHandler); final CloseableIteration<Statement, QueryEvaluationException> iter = RyaDAOHelper.query(ryaDao, subject, predicate, object, conf, contexts); try { @@ -101,7 +100,7 @@ public class RyaDaoQueryWrapper { */ public void queryAll(final Statement statement, final RDFHandler rdfStatementHandler) throws QueryEvaluationException { final Resource subject = statement.getSubject(); - final URI predicate = statement.getPredicate(); + final IRI predicate = statement.getPredicate(); final Value object = statement.getObject(); final Resource context = statement.getContext(); queryAll(subject, predicate, object, rdfStatementHandler, context); @@ -125,14 +124,14 @@ public class RyaDaoQueryWrapper { * Handles only the first result of a query. Closes the query iterator when * done. * @param subject the subject {@link Resource} to query for. - * @param predicate the predicate {@link URI} to query for. + * @param predicate the predicate {@link IRI} to query for. * @param object the object {@link Value} to query for. * @param rdfStatementHandler the {@link RDFHandler} to use for handling the * first statement returned. (not {@code null}) * @param contexts the context {@link Resource}s to query for. * @throws QueryEvaluationException */ - public void queryFirst(final Resource subject, final URI predicate, final Value object, final RDFHandler rdfStatementHandler, final Resource... contexts) throws QueryEvaluationException { + public void queryFirst(final Resource subject, final IRI predicate, final Value object, final RDFHandler rdfStatementHandler, final Resource... contexts) throws QueryEvaluationException { checkNotNull(rdfStatementHandler); final CloseableIteration<Statement, QueryEvaluationException> iter = RyaDAOHelper.query(ryaDao, subject, predicate, object, conf, contexts); try { @@ -162,7 +161,7 @@ public class RyaDaoQueryWrapper { public void queryFirst(final Statement statement, final RDFHandler rdfStatementHandler) throws QueryEvaluationException { checkNotNull(statement); final Resource subject = statement.getSubject(); - final URI predicate = statement.getPredicate(); + final IRI predicate = statement.getPredicate(); final Value object = statement.getObject(); final Resource context = statement.getContext(); queryFirst(subject, predicate, object, rdfStatementHandler, context); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java index 7d61312..15a3a88 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java @@ -19,18 +19,15 @@ package org.apache.rya.api.query.strategy; * under the License. */ - +import java.io.IOException; +import java.util.Map; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.triple.TripleRowRegex; -import java.io.IOException; -import java.util.Map; - -import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; - /** * Date: 7/14/12 * Time: 7:21 AM http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java index 314ce91..5398fc0 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/NullRowTriplePatternStrategy.java @@ -19,10 +19,12 @@ package org.apache.rya.api.query.strategy.wholerow; * under the License. */ +import static org.apache.rya.api.RdfCloudTripleStoreConstants.LAST_BYTES; + import java.io.IOException; import java.util.Map; + import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import static org.apache.rya.api.RdfCloudTripleStoreConstants.*; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaType; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java index 44f77bd..b6d2758 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java @@ -21,7 +21,7 @@ package org.apache.rya.api.resolver; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Date: 7/16/12 @@ -29,24 +29,24 @@ import org.openrdf.model.URI; */ public class CustomRyaTypeResolverMapping extends RyaTypeResolverMapping { - protected URI ryaDataType; + protected IRI ryaDataType; protected byte markerByte; public CustomRyaTypeResolverMapping() { } - public CustomRyaTypeResolverMapping(URI ryaDataType, byte markerByte) { + public CustomRyaTypeResolverMapping(IRI ryaDataType, byte markerByte) { this(null, ryaDataType, markerByte); } - public CustomRyaTypeResolverMapping(RyaTypeResolver ryaTypeResolver, URI ryaDataType, byte markerByte) { + public CustomRyaTypeResolverMapping(RyaTypeResolver ryaTypeResolver, IRI ryaDataType, byte markerByte) { super(ryaTypeResolver); this.ryaDataType = ryaDataType; this.markerByte = markerByte; } @Override - public URI getRyaDataType() { + public IRI getRyaDataType() { return ryaDataType; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/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 61c2b4d..6cd27b7 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,10 +19,20 @@ package org.apache.rya.api.resolver; * under the License. */ - - -import org.apache.rya.api.domain.*; -import org.openrdf.model.*; +import org.apache.rya.api.domain.RangeURI; +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.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; /** * Date: 7/17/12 @@ -30,7 +40,7 @@ import org.openrdf.model.*; */ public class RdfToRyaConversions { - public static RyaURI convertURI(URI uri) { + public static RyaURI convertURI(IRI uri) { if (uri == null) return null; if (uri instanceof RangeURI) { RangeURI ruri = (RangeURI) uri; @@ -59,8 +69,8 @@ public class RdfToRyaConversions { } if (value instanceof RangeValue) { RangeValue rv = (RangeValue) value; - if (rv.getStart() instanceof URI) { - return new RyaURIRange(convertURI((URI) rv.getStart()), convertURI((URI) rv.getEnd())); + if (rv.getStart() instanceof IRI) { + return new RyaURIRange(convertURI((IRI) rv.getStart()), convertURI((IRI) rv.getEnd())); } else { //literal return new RyaTypeRange(convertLiteral((Literal) rv.getStart()), convertLiteral((Literal) rv.getEnd())); @@ -74,13 +84,13 @@ public class RdfToRyaConversions { if (subject instanceof BNode) { return new RyaURI(RyaSchema.BNODE_NAMESPACE + ((BNode) subject).getID()); } - return convertURI((URI) subject); + return convertURI((IRI) subject); } public static RyaStatement convertStatement(Statement statement) { if (statement == null) return null; Resource subject = statement.getSubject(); - URI predicate = statement.getPredicate(); + IRI predicate = statement.getPredicate(); Value object = statement.getObject(); Resource context = statement.getContext(); return new RyaStatement( http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/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 49fc5d1..237a228 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 @@ -19,8 +19,6 @@ package org.apache.rya.api.resolver; * under the License. */ - - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,8 +37,8 @@ import org.apache.rya.api.resolver.impl.RyaTypeResolverImpl; import org.apache.rya.api.resolver.impl.RyaURIResolver; import org.apache.rya.api.resolver.impl.ServiceBackedRyaTypeResolverMappings; import org.apache.rya.api.resolver.impl.ShortRyaTypeResolver; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +50,7 @@ public class RyaContext { public Logger logger = LoggerFactory.getLogger(RyaContext.class); - private final Map<URI, RyaTypeResolver> uriToResolver = new HashMap<URI, RyaTypeResolver>(); + private final Map<IRI, RyaTypeResolver> uriToResolver = new HashMap<IRI, RyaTypeResolver>(); private final Map<Byte, RyaTypeResolver> byteToResolver = new HashMap<Byte, RyaTypeResolver>(); private RyaTypeResolver defaultResolver = new CustomDatatypeResolver(); @@ -93,7 +91,7 @@ public class RyaContext { //need to go from datatype->resolver - public RyaTypeResolver retrieveResolver(final URI datatype) { + public RyaTypeResolver retrieveResolver(final IRI datatype) { final RyaTypeResolver ryaTypeResolver = uriToResolver.get(datatype); if (ryaTypeResolver == null) { return defaultResolver; @@ -152,7 +150,7 @@ public class RyaContext { } } - public RyaTypeResolver removeRyaTypeResolver(final URI dataType) { + public RyaTypeResolver removeRyaTypeResolver(final IRI dataType) { final RyaTypeResolver ryaTypeResolver = uriToResolver.remove(dataType); if (ryaTypeResolver != null) { if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/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 51062c9..102db46 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 @@ -19,40 +19,37 @@ package org.apache.rya.api.resolver; * under the License. */ - - import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Date: 7/17/12 * Time: 8:34 AM */ public class RyaToRdfConversions { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); - public static URI convertURI(RyaURI uri) { - return new URIImpl(uri.getData()); + public static IRI convertURI(RyaURI uri) { + return VF.createIRI(uri.getData()); } - private static URI convertURI(RyaType value) { - return new URIImpl(value.getData()); + private static IRI convertURI(RyaType value) { + return VF.createIRI(value.getData()); } public static Literal convertLiteral(RyaType literal) { if (XMLSchema.STRING.equals(literal.getDataType())) { - return new LiteralImpl(literal.getData()); + return VF.createLiteral(literal.getData()); } else { - return new LiteralImpl(literal.getData(), literal.getDataType()); + return VF.createLiteral(literal.getData(), literal.getDataType()); } //TODO: No Language support yet } @@ -65,12 +62,12 @@ public class RyaToRdfConversions { public static Statement convertStatement(RyaStatement statement) { assert statement != null; if (statement.getContext() != null) { - return new ContextStatementImpl(convertURI(statement.getSubject()), + return VF.createStatement(convertURI(statement.getSubject()), convertURI(statement.getPredicate()), convertValue(statement.getObject()), convertURI(statement.getContext())); } else { - return new StatementImpl(convertURI(statement.getSubject()), + return VF.createStatement(convertURI(statement.getSubject()), convertURI(statement.getPredicate()), convertValue(statement.getObject())); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/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 17fab47..f3f5925 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 @@ -19,15 +19,12 @@ package org.apache.rya.api.resolver; * under the License. */ - - import java.util.ArrayList; import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java index 98e2f82..4e061ea 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java @@ -23,8 +23,7 @@ package org.apache.rya.api.resolver; import org.apache.rya.api.domain.RyaRange; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaTypeRange; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Date: 7/16/12 @@ -44,9 +43,9 @@ public interface RyaTypeResolver { */ public boolean deserializable(byte[] bytes); - public URI getRyaDataType(); + public IRI getRyaDataType(); - byte getMarkerByte(); + public byte getMarkerByte(); /** * This will allow a resolver to modify a range. For example, a date time resolver, with a reverse index, http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java index 82502ff..ca2c81a 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java @@ -21,7 +21,7 @@ package org.apache.rya.api.resolver; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Date: 7/16/12 @@ -46,7 +46,7 @@ public class RyaTypeResolverMapping { return ryaTypeResolver; } - public URI getRyaDataType() { + public IRI getRyaDataType() { return ryaTypeResolver.getRyaDataType(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java index 1727944..c45efe8 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java @@ -19,14 +19,12 @@ package org.apache.rya.api.resolver.impl; * under the License. */ - - import org.apache.rya.api.resolver.RyaTypeResolverException; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; import org.calrissian.mango.types.exception.TypeDecodingException; import org.calrissian.mango.types.exception.TypeEncodingException; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; public class BooleanRyaTypeResolver extends RyaTypeResolverImpl { public static final int BOOLEAN_LITERAL_MARKER = 10; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java index 5de72fc..0503e76 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java @@ -19,14 +19,12 @@ package org.apache.rya.api.resolver.impl; * under the License. */ - - import org.apache.rya.api.resolver.RyaTypeResolverException; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; import org.calrissian.mango.types.exception.TypeDecodingException; import org.calrissian.mango.types.exception.TypeEncodingException; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; public class ByteRyaTypeResolver extends RyaTypeResolverImpl { public static final int LITERAL_MARKER = 9; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java index 3b4dcfa..075b3f8 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java @@ -25,7 +25,7 @@ import java.nio.charset.StandardCharsets; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.resolver.RyaTypeResolverException; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.google.common.primitives.Bytes; @@ -64,7 +64,7 @@ public class CustomDatatypeResolver extends RyaTypeResolverImpl { throw new RyaTypeResolverException("Not a datatype literal"); } final String label = deserializeData(new String(bytes, 0, indexOfType, StandardCharsets.UTF_8)); - rt.setDataType(new URIImpl(new String(bytes, indexOfType + 1, (length - indexOfType) - 3, StandardCharsets.UTF_8))); + rt.setDataType(SimpleValueFactory.getInstance().createIRI(new String(bytes, indexOfType + 1, (length - indexOfType) - 3, StandardCharsets.UTF_8))); rt.setData(label); return rt; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java index c244b9e..8167401 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java @@ -19,20 +19,18 @@ package org.apache.rya.api.resolver.impl; * under the License. */ - +import java.util.Date; import org.apache.rya.api.resolver.RyaTypeResolverException; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; import org.calrissian.mango.types.exception.TypeDecodingException; import org.calrissian.mango.types.exception.TypeEncodingException; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import org.openrdf.model.vocabulary.XMLSchema; - -import java.util.Date; /** * Reverse index xml datetime strings http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java index de8f753..42f81ed 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java @@ -19,16 +19,12 @@ package org.apache.rya.api.resolver.impl; * under the License. */ - - import org.apache.rya.api.resolver.RyaTypeResolverException; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; import org.calrissian.mango.types.exception.TypeDecodingException; import org.calrissian.mango.types.exception.TypeEncodingException; -import org.openrdf.model.vocabulary.XMLSchema; - -import java.text.DecimalFormat; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Date: 7/20/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java index 851b32c..18467f6 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java @@ -19,14 +19,12 @@ package org.apache.rya.api.resolver.impl; * under the License. */ - - import org.apache.rya.api.resolver.RyaTypeResolverException; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; import org.calrissian.mango.types.exception.TypeDecodingException; import org.calrissian.mango.types.exception.TypeEncodingException; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java index 12705d8..344406a 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java @@ -19,14 +19,12 @@ package org.apache.rya.api.resolver.impl; * under the License. */ - - import org.apache.rya.api.resolver.RyaTypeResolverException; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; import org.calrissian.mango.types.exception.TypeDecodingException; import org.calrissian.mango.types.exception.TypeEncodingException; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Date: 7/20/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java ---------------------------------------------------------------------- diff --git a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java index 3b700d7..9dfe488 100644 --- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java +++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java @@ -19,14 +19,12 @@ package org.apache.rya.api.resolver.impl; * under the License. */ - - import org.apache.rya.api.resolver.RyaTypeResolverException; import org.calrissian.mango.types.LexiTypeEncoders; import org.calrissian.mango.types.TypeEncoder; import org.calrissian.mango.types.exception.TypeDecodingException; import org.calrissian.mango.types.exception.TypeEncodingException; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Date: 7/20/12
