http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/ApproxEqualsDetector.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/ApproxEqualsDetector.java b/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/ApproxEqualsDetector.java index c450951..fbd0aff 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/ApproxEqualsDetector.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/ApproxEqualsDetector.java @@ -19,7 +19,7 @@ package org.apache.rya.indexing.smarturi.duplication; import org.apache.rya.indexing.smarturi.SmartUriException; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Interface for detecting if two objects of type {@code T} are considered @@ -57,10 +57,10 @@ public interface ApproxEqualsDetector<T> { public Class<?> getTypeClass(); /** - * @return the {@link URI} for the XML schema type this detector is used + * @return the {@link IRI} for the XML schema type this detector is used * for. */ - public URI getXmlSchemaUri(); + public IRI getXmlSchemaUri(); /** * Checks if two string representations of objects are approximately equal.
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetector.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetector.java b/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetector.java index 220db30..1d17097 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetector.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/smarturi/duplication/DuplicateDataDetector.java @@ -44,10 +44,10 @@ import org.apache.rya.indexing.smarturi.SmartUriAdapter; import org.apache.rya.indexing.smarturi.SmartUriException; import org.apache.rya.indexing.smarturi.duplication.conf.DuplicateDataConfig; import org.calrissian.mango.types.exception.TypeEncodingException; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.joda.time.DateTime; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; import com.google.common.collect.ImmutableMap; @@ -63,7 +63,7 @@ import com.google.common.collect.ImmutableMap; * compared. */ public class DuplicateDataDetector { - private final Map<URI, ApproxEqualsDetector<?>> uriMap = new HashMap<>(); + private final Map<IRI, ApproxEqualsDetector<?>> uriMap = new HashMap<>(); private final Map<Class<?>, ApproxEqualsDetector<?>> classMap = new HashMap<>(); private boolean isDetectionEnabled; @@ -137,7 +137,7 @@ public class DuplicateDataDetector { * if not specified. * @param stringTolerance the {@link String} tolerance value or {@code null} * if not specified. - * @param uriTolerance the {@link URI} tolerance value or {@code null} if + * @param uriTolerance the {@link IRI} tolerance value or {@code null} if * not specified. * @param equivalentTermsMap the {@link Map} of terms that are considered * equivalent to each other. (not {@code null}) @@ -224,13 +224,13 @@ public class DuplicateDataDetector { /** * Compares two Smart URI's to determine if they have nearly identical data. - * @param uri1 the first Smart {@link URI}. (not {@code null}) - * @param uri2 the second Smart {@link URI}. (not {@code null}) + * @param uri1 the first Smart {@link IRI}. (not {@code null}) + * @param uri2 the second Smart {@link IRI}. (not {@code null}) * @return {@code true} if the two Smart URI's have nearly identical data. * {@code false} otherwise. * @throws SmartUriException */ - public boolean compareSmartUris(final URI uri1, final URI uri2) throws SmartUriException { + public boolean compareSmartUris(final IRI uri1, final IRI uri2) throws SmartUriException { requireNonNull(uri1); requireNonNull(uri2); final Entity entity1 = SmartUriAdapter.deserializeUriEntity(uri1); @@ -270,7 +270,7 @@ public class DuplicateDataDetector { final RyaType value2 = property2.getValue(); final String data1 = value1.getData(); final String data2 = value2.getData(); - final URI xmlSchemaUri1 = value1.getDataType(); + final IRI xmlSchemaUri1 = value1.getDataType(); final ApproxEqualsDetector<?> approxEqualsDetector = uriMap.get(xmlSchemaUri1); if (approxEqualsDetector == null) { throw new SmartUriException("No appropriate detector found for the type: " + xmlSchemaUri1); @@ -328,7 +328,7 @@ public class DuplicateDataDetector { public boolean areObjectsApproxEquals(final Boolean lhs, final Boolean rhs) { // Should never be almost equals when tolerance is 0, only exactly equals // Otherwise if there's any tolerance specified everything is equal - return tolerance.getValue() == 0 ? Objects.equals(lhs, rhs) : true; + return tolerance.getValue() != 0 || Objects.equals(lhs, rhs); } @Override @@ -347,7 +347,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.BOOLEAN; } } @@ -412,7 +412,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.BYTE; } } @@ -486,7 +486,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.DATE; } } @@ -559,7 +559,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.DATETIME; } } @@ -638,7 +638,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.DOUBLE; } } @@ -718,7 +718,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.FLOAT; } } @@ -783,7 +783,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.INTEGER; } } @@ -848,7 +848,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.LONG; } } @@ -913,7 +913,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.SHORT; } } @@ -988,7 +988,7 @@ public class DuplicateDataDetector { } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.STRING; } } @@ -997,7 +997,7 @@ public class DuplicateDataDetector { * Class to detect if two URIs are considered approximately equal to each * other. */ - public static class UriApproxEqualsDetector implements ApproxEqualsDetector<URI> { + public static class UriApproxEqualsDetector implements ApproxEqualsDetector<IRI> { private static final Tolerance DEFAULT_TOLERANCE = new Tolerance(1.0, ToleranceType.DIFFERENCE); private final Tolerance tolerance; @@ -1010,7 +1010,7 @@ public class DuplicateDataDetector { } @Override - public boolean areObjectsApproxEquals(final URI lhs, final URI rhs) { + public boolean areObjectsApproxEquals(final IRI lhs, final IRI rhs) { if (isOnlyOneNull(lhs, rhs)) { return false; } @@ -1049,17 +1049,17 @@ public class DuplicateDataDetector { } @Override - public URI convertStringToObject(final String string) throws SmartUriException { - return new URIImpl(string); + public IRI convertStringToObject(final String string) throws SmartUriException { + return SimpleValueFactory.getInstance().createIRI(string); } @Override public Class<?> getTypeClass() { - return URI.class; + return IRI.class; } @Override - public URI getXmlSchemaUri() { + public IRI getXmlSchemaUri() { return XMLSchema.ANYURI; } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/MetadataNodeToSegmentConverter.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/MetadataNodeToSegmentConverter.java b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/MetadataNodeToSegmentConverter.java index 9ee21d0..4b3322b 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/MetadataNodeToSegmentConverter.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/MetadataNodeToSegmentConverter.java @@ -17,19 +17,19 @@ package org.apache.rya.indexing.statement.metadata.matching; * specific language governing permissions and limitations * under the License. */ + import java.util.HashMap; import java.util.List; import java.util.Set; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import org.apache.rya.indexing.external.matching.ExternalSetConverter; import org.apache.rya.indexing.external.matching.JoinSegment; import org.apache.rya.indexing.external.matching.QuerySegment; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.ValueExpr; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.ValueExpr; public class MetadataNodeToSegmentConverter implements ExternalSetConverter<StatementMetadataNode<?>> { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/OWLReify.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/OWLReify.java b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/OWLReify.java index 640f358..cb81773 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/OWLReify.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/OWLReify.java @@ -17,31 +17,32 @@ package org.apache.rya.indexing.statement.metadata.matching; * specific language governing permissions and limitations * under the License. */ -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.OWL; + +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.OWL; public class OWLReify { /** http://www.w3.org/2002/07/owl#Annotation*/ - public final static URI ANNOTATION; + public final static IRI ANNOTATION; /** http://www.w3.org/2002/07/owl#annotatedSource*/ - public static final URI SOURCE; + public static final IRI SOURCE; /** http://www.w3.org/2002/07/owl#annotatedProperty*/ - public static final URI PROPERTY; + public static final IRI PROPERTY; /** http://www.w3.org/2002/07/owl#annotatedTarget*/ - public static final URI TARGET; + public static final IRI TARGET; static { - ValueFactory factory = ValueFactoryImpl.getInstance(); - ANNOTATION = factory.createURI(OWL.NAMESPACE, "Annotation"); - PROPERTY = factory.createURI(OWL.NAMESPACE, "annotatedProperty"); - SOURCE = factory.createURI(OWL.NAMESPACE, "annotatedSource"); - TARGET = factory.createURI(OWL.NAMESPACE, "annotatedTarget"); + ValueFactory factory = SimpleValueFactory.getInstance(); + ANNOTATION = factory.createIRI(OWL.NAMESPACE, "Annotation"); + PROPERTY = factory.createIRI(OWL.NAMESPACE, "annotatedProperty"); + SOURCE = factory.createIRI(OWL.NAMESPACE, "annotatedSource"); + TARGET = factory.createIRI(OWL.NAMESPACE, "annotatedTarget"); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataExternalSetProvider.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataExternalSetProvider.java b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataExternalSetProvider.java index bfa0dfa..6571c83 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataExternalSetProvider.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataExternalSetProvider.java @@ -17,6 +17,7 @@ package org.apache.rya.indexing.statement.metadata.matching; * specific language governing permissions and limitations * under the License. */ + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -30,11 +31,11 @@ import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.indexing.external.matching.ExternalSetProvider; import org.apache.rya.indexing.external.matching.QuerySegment; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -100,8 +101,8 @@ public class StatementMetadataExternalSetProvider implements ExternalSetProvider for (StatementPattern pattern : patterns) { Var var = pattern.getPredicateVar(); - if (var.getValue() != null && var.getValue() instanceof URI) { - RyaURI uri = RdfToRyaConversions.convertURI((URI) var.getValue()); + if (var.getValue() != null && var.getValue() instanceof IRI) { + RyaURI uri = RdfToRyaConversions.convertURI((IRI) var.getValue()); if(expectedURI.contains(uri) || metadataProperties.contains(uri)) { finalPatterns.add(pattern); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataNode.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataNode.java b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataNode.java index 363dba2..3d3b7ba 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataNode.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataNode.java @@ -18,6 +18,7 @@ package org.apache.rya.indexing.statement.metadata.matching; * specific language governing permissions and limitations * under the License. */ + import static java.util.Objects.requireNonNull; import java.io.IOException; @@ -45,24 +46,23 @@ import org.apache.rya.api.persist.query.RyaQueryEngine; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.rdftriplestore.evaluation.ExternalBatchingIterator; -import org.openrdf.model.BNode; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.evaluation.impl.ExternalSet; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.EmptyIteration; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ExternalSet; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.EmptyIteration; - /** * This class provides users with the ability to issue reified queries to Rya. * As opposed to a single triple representing a statement, a reified query @@ -361,13 +361,13 @@ public class StatementMetadataNode<C extends RdfCloudTripleStoreConfiguration> e RyaURI context = null; if (subjValue != null) { - Preconditions.checkArgument(subjValue instanceof URI); - subj = RdfToRyaConversions.convertURI((URI) subjValue); + Preconditions.checkArgument(subjValue instanceof IRI); + subj = RdfToRyaConversions.convertURI((IRI) subjValue); } if (predValue != null) { - Preconditions.checkArgument(predValue instanceof URI); - pred = RdfToRyaConversions.convertURI((URI) predValue); + Preconditions.checkArgument(predValue instanceof IRI); + pred = RdfToRyaConversions.convertURI((IRI) predValue); } if (objValue != null) { @@ -375,7 +375,7 @@ public class StatementMetadataNode<C extends RdfCloudTripleStoreConfiguration> e } if(contextValue != null) { - context = RdfToRyaConversions.convertURI((URI) contextValue); + context = RdfToRyaConversions.convertURI((IRI) contextValue); } return new RyaStatement(subj, pred, obj, context); } @@ -480,7 +480,7 @@ public class StatementMetadataNode<C extends RdfCloudTripleStoreConfiguration> e * This is an {@link CloseableIteration} class that serves a number of * purposes. It's primary purpose is to filter a CloseableIteration over * {@link Map.Entry<RyaStatement,BindingSet>} using a specified property Map - * from {@link RyaURI} to {@link org.openrdf.query.algebra.Var}. This + * from {@link RyaURI} to {@link org.eclipse.rdf4j.query.algebra.Var}. This * Iteration iterates over the Entries in the user specified Iteration, * comparing properties in the {@link StatementMetadata} Map contained in * the RyaStatements with the property Map for this class. If the properties @@ -657,7 +657,7 @@ public class StatementMetadataNode<C extends RdfCloudTripleStoreConfiguration> e * Builds the BindingSet from the specified RyaStatement by using the * StatementPattern for this class. This method checks whether * StatementPattern has a {@link Value} for each position - * {@link org.openrdf.query.algebra.Var} (Subject, Predicate, Object). + * {@link org.eclipse.rdf4j.query.algebra.Var} (Subject, Predicate, Object). * If it doesn't have a Value, a Binding is created from the * RyaStatement using the {@link RyaType} for the corresponding position * (Subject, Predicate, Object). http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataOptimizer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataOptimizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataOptimizer.java index 02c174e..9207e26 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataOptimizer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/statement/metadata/matching/StatementMetadataOptimizer.java @@ -17,6 +17,7 @@ package org.apache.rya.indexing.statement.metadata.matching; * specific language governing permissions and limitations * under the License. */ + import static com.google.common.base.Preconditions.checkNotNull; import org.apache.hadoop.conf.Configurable; @@ -28,9 +29,9 @@ import org.apache.rya.indexing.external.matching.ExternalSetMatcher; import org.apache.rya.indexing.external.matching.ExternalSetProvider; import org.apache.rya.indexing.external.matching.QueryNodeListRater; import org.apache.rya.indexing.external.matching.QuerySegment; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.TupleExpr; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java index 23b6ee7..43af1fb 100644 --- a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java +++ b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java @@ -1,16 +1,3 @@ -package org.apache.rya.sail.config; - -import org.openrdf.model.Graph; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.util.GraphUtil; -import org.openrdf.model.util.GraphUtilException; -import org.openrdf.sail.config.SailConfigException; -import org.openrdf.sail.config.SailImplConfigBase; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -29,30 +16,41 @@ import org.openrdf.sail.config.SailImplConfigBase; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.sail.config; import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.util.GraphUtil; +import org.eclipse.rdf4j.model.util.GraphUtilException; +import org.eclipse.rdf4j.sail.config.AbstractSailImplConfig; +import org.eclipse.rdf4j.sail.config.SailConfigException; /** * @deprecated Use {@link AccumuloRdfConfiguration} instead. */ @Deprecated -public class RyaAccumuloSailConfig extends SailImplConfigBase { +public class RyaAccumuloSailConfig extends AbstractSailImplConfig { public static final String NAMESPACE = "http://rya.apache.org/RyaAccumuloSail/Config#";; - public static final URI INSTANCE; - public static final URI USER; - public static final URI PASSWORD; - public static final URI ZOOKEEPERS; - public static final URI IS_MOCK; + public static final IRI INSTANCE; + public static final IRI USER; + public static final IRI PASSWORD; + public static final IRI ZOOKEEPERS; + public static final IRI IS_MOCK; static { - final ValueFactory factory = ValueFactoryImpl.getInstance(); - USER = factory.createURI(NAMESPACE, "user"); - PASSWORD = factory.createURI(NAMESPACE, "password"); - INSTANCE = factory.createURI(NAMESPACE, "instance"); - ZOOKEEPERS = factory.createURI(NAMESPACE, "zookeepers"); - IS_MOCK = factory.createURI(NAMESPACE, "isMock"); + final ValueFactory factory = SimpleValueFactory.getInstance(); + USER = factory.createIRI(NAMESPACE, "user"); + PASSWORD = factory.createIRI(NAMESPACE, "password"); + INSTANCE = factory.createIRI(NAMESPACE, "instance"); + ZOOKEEPERS = factory.createIRI(NAMESPACE, "zookeepers"); + IS_MOCK = factory.createIRI(NAMESPACE, "isMock"); } private String user = "root"; @@ -116,45 +114,45 @@ public class RyaAccumuloSailConfig extends SailImplConfigBase { } @Override - public Resource export(final Graph graph) { - final Resource implNode = super.export(graph); + public Resource export(final Model model) { + final Resource implNode = super.export(model); @SuppressWarnings("deprecation") final - ValueFactory v = graph.getValueFactory(); + ValueFactory v = model.getValueFactory(); - graph.add(implNode, USER, v.createLiteral(user)); - graph.add(implNode, PASSWORD, v.createLiteral(password)); - graph.add(implNode, INSTANCE, v.createLiteral(instance)); - graph.add(implNode, ZOOKEEPERS, v.createLiteral(zookeepers)); - graph.add(implNode, IS_MOCK, v.createLiteral(isMock)); + model.add(implNode, USER, v.createLiteral(user)); + model.add(implNode, PASSWORD, v.createLiteral(password)); + model.add(implNode, INSTANCE, v.createLiteral(instance)); + model.add(implNode, ZOOKEEPERS, v.createLiteral(zookeepers)); + model.add(implNode, IS_MOCK, v.createLiteral(isMock)); return implNode; } @Override - public void parse(final Graph graph, final Resource implNode) throws SailConfigException { - super.parse(graph, implNode); + public void parse(final Model model, final Resource implNode) throws SailConfigException { + super.parse(model, implNode); System.out.println("parsing"); try { - final Literal userLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, USER); + final Literal userLit = GraphUtil.getOptionalObjectLiteral(model, implNode, USER); if (userLit != null) { setUser(userLit.getLabel()); } - final Literal pwdLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, PASSWORD); + final Literal pwdLit = GraphUtil.getOptionalObjectLiteral(model, implNode, PASSWORD); if (pwdLit != null) { setPassword(pwdLit.getLabel()); } - final Literal instLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, INSTANCE); + final Literal instLit = GraphUtil.getOptionalObjectLiteral(model, implNode, INSTANCE); if (instLit != null) { setInstance(instLit.getLabel()); } - final Literal zooLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, ZOOKEEPERS); + final Literal zooLit = GraphUtil.getOptionalObjectLiteral(model, implNode, ZOOKEEPERS); if (zooLit != null) { setZookeepers(zooLit.getLabel()); } - final Literal mockLit = GraphUtil.getOptionalObjectLiteral(graph, implNode, IS_MOCK); + final Literal mockLit = GraphUtil.getOptionalObjectLiteral(model, implNode, IS_MOCK); if (mockLit != null) { setMock(Boolean.parseBoolean(mockLit.getLabel())); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java index 6f4d6c5..492dcbe 100644 --- a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java +++ b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java @@ -1,17 +1,3 @@ -package org.apache.rya.sail.config; - -import org.apache.accumulo.core.client.AccumuloException; -import org.apache.accumulo.core.client.AccumuloSecurityException; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.Instance; -import org.apache.accumulo.core.client.ZooKeeperInstance; -import org.apache.accumulo.core.client.mock.MockInstance; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.openrdf.sail.Sail; -import org.openrdf.sail.config.SailConfigException; -import org.openrdf.sail.config.SailFactory; -import org.openrdf.sail.config.SailImplConfig; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -30,12 +16,24 @@ import org.openrdf.sail.config.SailImplConfig; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.sail.config; +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.ZooKeeperInstance; +import org.apache.accumulo.core.client.mock.MockInstance; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.config.SailConfigException; +import org.eclipse.rdf4j.sail.config.SailFactory; +import org.eclipse.rdf4j.sail.config.SailImplConfig; /** * @deprecated Use {@link RyaSailFactory} instead. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java index 56af9b4..15c89eb 100644 --- a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java +++ b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java @@ -47,8 +47,8 @@ import org.apache.rya.mongodb.instance.MongoRyaInstanceDetailsRepository; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/resources/META-INF/services/org.eclipse.rdf4j.sail.config.SailFactory ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/resources/META-INF/services/org.eclipse.rdf4j.sail.config.SailFactory b/extras/indexing/src/main/resources/META-INF/services/org.eclipse.rdf4j.sail.config.SailFactory new file mode 100644 index 0000000..df3610d --- /dev/null +++ b/extras/indexing/src/main/resources/META-INF/services/org.eclipse.rdf4j.sail.config.SailFactory @@ -0,0 +1 @@ +org.apache.rya.sail.config.RyaAccumuloSailFactory \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory b/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory deleted file mode 100644 index 56f4407..0000000 --- a/extras/indexing/src/main/resources/META-INF/services/org.openrdf.sail.config.SailFactory +++ /dev/null @@ -1 +0,0 @@ -org.apache.rya.sail.config.RyaAccumuloSailFactory http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/resources/org/eclipse/rdf4j/repository/config/RyaAccumuloSail.ttl ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/resources/org/eclipse/rdf4j/repository/config/RyaAccumuloSail.ttl b/extras/indexing/src/main/resources/org/eclipse/rdf4j/repository/config/RyaAccumuloSail.ttl new file mode 100644 index 0000000..0e9a6f8 --- /dev/null +++ b/extras/indexing/src/main/resources/org/eclipse/rdf4j/repository/config/RyaAccumuloSail.ttl @@ -0,0 +1,20 @@ +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>. +@prefix rep: <http://www.openrdf.org/config/repository#>. +@prefix sr: <http://www.openrdf.org/config/repository/sail#>. +@prefix sail: <http://www.openrdf.org/config/sail#>. +@prefix rac: <http://rya.apache.org/RyaAccumuloSail/Config#>. + +[] a rep:Repository ; + rep:repositoryID "{%Repository ID|RyaAccumuloSail%}" ; + rdfs:label "{%Repository title|RyaAccumuloSail Store%}" ; + rep:repositoryImpl [ + rep:repositoryType "openrdf:SailRepository" ; + sr:sailImpl [ + sail:sailType "rya:RyaAccumuloSail" ; + rac:user "{%Rya Accumulo user|root%}" ; + rac:password "{%Rya Accumulo password|root%}" ; + rac:instance "{%Rya Accumulo instance|dev%}" ; + rac:zookeepers "{%Rya Accumulo zookeepers|zoo1,zoo2,zoo3%}" ; + rac:isMock "{%Rya Accumulo is mock|false|true%}" ; + ] + ]. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/main/resources/org/openrdf/repository/config/RyaAccumuloSail.ttl ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/resources/org/openrdf/repository/config/RyaAccumuloSail.ttl b/extras/indexing/src/main/resources/org/openrdf/repository/config/RyaAccumuloSail.ttl deleted file mode 100644 index 0e9a6f8..0000000 --- a/extras/indexing/src/main/resources/org/openrdf/repository/config/RyaAccumuloSail.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>. -@prefix rep: <http://www.openrdf.org/config/repository#>. -@prefix sr: <http://www.openrdf.org/config/repository/sail#>. -@prefix sail: <http://www.openrdf.org/config/sail#>. -@prefix rac: <http://rya.apache.org/RyaAccumuloSail/Config#>. - -[] a rep:Repository ; - rep:repositoryID "{%Repository ID|RyaAccumuloSail%}" ; - rdfs:label "{%Repository title|RyaAccumuloSail Store%}" ; - rep:repositoryImpl [ - rep:repositoryType "openrdf:SailRepository" ; - sr:sailImpl [ - sail:sailType "rya:RyaAccumuloSail" ; - rac:user "{%Rya Accumulo user|root%}" ; - rac:password "{%Rya Accumulo password|root%}" ; - rac:instance "{%Rya Accumulo instance|dev%}" ; - rac:zookeepers "{%Rya Accumulo zookeepers|zoo1,zoo2,zoo3%}" ; - rac:isMock "{%Rya Accumulo is mock|false|true%}" ; - ] - ].
