http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/kafka/KryoVisibilityBindingSetSerializer.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/kafka/KryoVisibilityBindingSetSerializer.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/kafka/KryoVisibilityBindingSetSerializer.java index f4182e0..ee79e4a 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/kafka/KryoVisibilityBindingSetSerializer.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/export/kafka/KryoVisibilityBindingSetSerializer.java @@ -28,15 +28,14 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.resolver.RdfToRyaConversions; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.ListBindingSet; +import org.eclipse.rdf4j.model.IRI; +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; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.ListBindingSet; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; @@ -54,6 +53,7 @@ public class KryoVisibilityBindingSetSerializer implements Serializer<Visibility return kryo; }; }; + private static final ValueFactory VF = SimpleValueFactory.getInstance(); /** * Deserialize a VisibilityBindingSet using Kyro lib. Exporting results of queries. @@ -111,13 +111,12 @@ public class KryoVisibilityBindingSetSerializer implements Serializer<Visibility // Do nothing. } - private static Value makeValue(final String valueString, final URI typeURI) { + private static Value makeValue(final String valueString, final IRI typeURI) { // Convert the String Value into a Value. - final ValueFactory valueFactory = ValueFactoryImpl.getInstance(); if (typeURI.equals(XMLSchema.ANYURI)) { - return valueFactory.createURI(valueString); + return VF.createIRI(valueString); } else { - return valueFactory.createLiteral(valueString, typeURI); + return VF.createLiteral(valueString, typeURI); } } @@ -135,7 +134,7 @@ public class KryoVisibilityBindingSetSerializer implements Serializer<Visibility output.writeString(binding.getName()); final RyaType ryaValue = RdfToRyaConversions.convertValue(binding.getValue()); final String valueString = ryaValue.getData(); - final URI type = ryaValue.getDataType(); + final IRI type = ryaValue.getDataType(); output.writeString(valueString); output.writeString(type.toString()); } @@ -150,7 +149,7 @@ public class KryoVisibilityBindingSetSerializer implements Serializer<Visibility for (int i = bindingCount; i > 0; i--) { namesList.add(input.readString()); final String valueString = input.readString(); - final URI type = new URIImpl(input.readString()); + final IRI type = VF.createIRI(input.readString()); valuesList.add(makeValue(valueString, type)); } final BindingSet bindingSet = new ListBindingSet(namesList, valuesList);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/AggregationObserver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/AggregationObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/AggregationObserver.java index e806b15..0823b70 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/AggregationObserver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/AggregationObserver.java @@ -30,7 +30,7 @@ import org.apache.rya.indexing.pcj.fluo.app.AggregationResultUpdater.ObjectSeria import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow; import org.apache.rya.indexing.pcj.fluo.app.query.AggregationMetadata; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java index e4c30e8..ee727ce 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/FilterObserver.java @@ -28,7 +28,7 @@ import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow; import org.apache.rya.indexing.pcj.fluo.app.query.FilterMetadata; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetSerDe; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * Notified when the results of a Filter have been updated to include a new http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java index 4e5511f..63f3eb8 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/JoinObserver.java @@ -28,7 +28,7 @@ import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata; import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetSerDe; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * Notified when the results of a Join have been updated to include a new http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java index 4db1840..d59d64b 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/StatementPatternObserver.java @@ -28,7 +28,7 @@ import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.fluo.app.query.StatementPatternMetadata; import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSetSerDe; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * Notified when the results of a Statement Pattern have been updated to include http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java index a6ee325..751cc6e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/TripleObserver.java @@ -28,6 +28,7 @@ import org.apache.fluo.api.data.Bytes; import org.apache.fluo.api.data.Column; import org.apache.fluo.api.observer.AbstractObserver; import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.indexing.pcj.fluo.app.IncUpdateDAO; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; @@ -140,7 +141,7 @@ public class TripleObserver extends AbstractObserver { // Extract the binding names and values. for(int i = 0; i < 3; i ++) { - if(patternArray[i].startsWith("-const-")) { + if(VarNameUtils.isConstant(patternArray[i])) { // If a constant value does not match, then the triple does not match the pattern. if(!patternArray[i].substring(7).equals(tripleArray[i])) { return ""; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/ConstructQueryMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/ConstructQueryMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/ConstructQueryMetadata.java index 6bf968e..ea0499b 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/ConstructQueryMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/ConstructQueryMetadata.java @@ -1,5 +1,3 @@ -package org.apache.rya.indexing.pcj.fluo.app.query; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,10 +16,12 @@ package org.apache.rya.indexing.pcj.fluo.app.query; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing.pcj.fluo.app.query; + import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.fluo.app.ConstructGraph; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryNode.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryNode.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryNode.java index f1ade59..61ebcc6 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryNode.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryNode.java @@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.rya.indexing.pcj.fluo.app.util.PeriodicQueryUtil; -import org.openrdf.query.algebra.QueryModelVisitor; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.UnaryTupleOperator; -import org.openrdf.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.query.algebra.QueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.UnaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; /** * This is a {@link UnaryTupleOperator} that gets placed in the parsed query http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java index 57ae9d2..e311846 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java @@ -31,6 +31,7 @@ import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.SP import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -42,6 +43,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.rya.api.client.CreatePCJ.ExportStrategy; import org.apache.rya.api.client.CreatePCJ.QueryType; +import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.api.function.aggregation.AggregationElement; import org.apache.rya.api.function.aggregation.AggregationType; import org.apache.rya.indexing.pcj.fluo.app.ConstructGraph; @@ -56,33 +58,34 @@ import org.apache.rya.indexing.pcj.fluo.app.util.FluoQueryUtils; import org.apache.rya.indexing.pcj.fluo.app.util.PeriodicQueryUtil; import org.apache.rya.indexing.pcj.fluo.app.util.VariableOrderUpdateVisitor.UpdateAction; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.model.Value; -import org.openrdf.model.impl.BNodeImpl; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.AggregateOperator; -import org.openrdf.query.algebra.BNodeGenerator; -import org.openrdf.query.algebra.Extension; -import org.openrdf.query.algebra.ExtensionElem; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Group; -import org.openrdf.query.algebra.GroupElem; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.LeftJoin; -import org.openrdf.query.algebra.MultiProjection; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.ProjectionElem; -import org.openrdf.query.algebra.ProjectionElemList; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.Reduced; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.UnaryTupleOperator; -import org.openrdf.query.algebra.ValueConstant; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.AggregateOperator; +import org.eclipse.rdf4j.query.algebra.BNodeGenerator; +import org.eclipse.rdf4j.query.algebra.Extension; +import org.eclipse.rdf4j.query.algebra.ExtensionElem; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Group; +import org.eclipse.rdf4j.query.algebra.GroupElem; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.MultiProjection; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.ProjectionElem; +import org.eclipse.rdf4j.query.algebra.ProjectionElemList; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.Reduced; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.UnaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.ValueConstant; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -103,6 +106,7 @@ public class SparqlFluoQueryBuilder { private String queryId; private NodeIds nodeIds; private Optional<Integer> joinBatchSize = Optional.empty(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); //Default behavior is to export to Kafka - subject to change when user can //specify their own export strategy @@ -283,7 +287,7 @@ public class SparqlFluoQueryBuilder { * the node to a {@link FluoQuery.Builder}. This information is used by the * application's observers to incrementally update a PCJ. */ - public static class NewQueryVisitor extends QueryModelVisitorBase<RuntimeException> { + public static class NewQueryVisitor extends AbstractQueryModelVisitor<RuntimeException> { private final NodeIds nodeIds; private final FluoQuery.Builder fluoQueryBuilder; @@ -291,8 +295,6 @@ public class SparqlFluoQueryBuilder { /** * Constructs an instance of {@link NewQueryVisitor}. * - * @param sparql - The SPARQL query whose structure will be represented - * within a Fluo application. (not null) * @param fluoQueryBuilder - The builder that will be updated by this * vistior to include metadata about each of the query nodes. (not null) * @param nodeIds - The NodeIds object is passed in so that other parts @@ -341,7 +343,7 @@ public class SparqlFluoQueryBuilder { final String resultBindingName = groupElem.getName(); final AtomicReference<String> aggregatedBindingName = new AtomicReference<>(); - groupElem.visitChildren(new QueryModelVisitorBase<RuntimeException>() { + groupElem.visitChildren(new AbstractQueryModelVisitor<RuntimeException>() { @Override public void meet(final Var node) { aggregatedBindingName.set( node.getName() ); @@ -529,7 +531,8 @@ public class SparqlFluoQueryBuilder { // update variable order of this node and all ancestors to // include BIN_ID binding as // first variable in the ordering - FluoQueryUtils.updateVarOrders(fluoQueryBuilder, UpdateAction.AddVariable, Arrays.asList(IncrementalUpdateConstants.PERIODIC_BIN_ID), periodicId); + FluoQueryUtils.updateVarOrders(fluoQueryBuilder, UpdateAction.AddVariable, + Collections.singletonList(IncrementalUpdateConstants.PERIODIC_BIN_ID), periodicId); // Walk to the next node. node.getArg().visit(this); } @@ -633,7 +636,7 @@ public class SparqlFluoQueryBuilder { final Value value = ((ValueConstant) expr).getValue(); valueMap.put(name, value); } else if(expr instanceof BNodeGenerator) { - valueMap.put(name, new BNodeImpl(UUID.randomUUID().toString())); + valueMap.put(name, VF.createBNode(UUID.randomUUID().toString())); } } @@ -683,7 +686,7 @@ public class SparqlFluoQueryBuilder { final Set<String> vars = Sets.newHashSet(); for(final String bindingName : node.getBindingNames()) { - if(!bindingName.startsWith("-const-")) { + if (!VarNameUtils.isConstant(bindingName)) { vars.add(bindingName); } } @@ -784,7 +787,7 @@ public class SparqlFluoQueryBuilder { builder.setQueryType(locator.getQueryType()); } - public static class QueryMetadataLocator extends QueryModelVisitorBase<Exception> { + public static class QueryMetadataLocator extends AbstractQueryModelVisitor<Exception> { private VariableOrder varOrder; private QueryType queryType; @@ -850,13 +853,13 @@ public class SparqlFluoQueryBuilder { return getConstructGraphVarOrder(projections); } - private static VariableOrder getConstructGraphVarOrder(final List<ProjectionElemList> projections) { + private static VariableOrder getConstructGraphVarOrder(List<ProjectionElemList> projections) { final Set<String> varOrders = new HashSet<>(); for(final ProjectionElemList elems: projections) { for(final ProjectionElem elem: elems.getElements()) { final String name = elem.getSourceName(); - if(!name.startsWith("-const-") && !name.startsWith("-anon-")) { + if (!VarNameUtils.isConstant(name) && !VarNameUtils.isAnonymous(name)) { varOrders.add(name); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunction.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunction.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunction.java index e4485e0..1e3b250 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunction.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunction.java @@ -30,7 +30,7 @@ import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetStringConverter; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.google.common.base.Preconditions; import com.google.common.base.Strings; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingSetUtil.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingSetUtil.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingSetUtil.java index 30f026c..9321c1e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingSetUtil.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingSetUtil.java @@ -21,9 +21,9 @@ package org.apache.rya.indexing.pcj.fluo.app.util; import static java.util.Objects.requireNonNull; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; /** * A utility class that defines functions that make it easier to work with {@link BindingSet} objects. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializer.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializer.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializer.java index 6c99809..2a59315 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializer.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializer.java @@ -21,15 +21,15 @@ package org.apache.rya.indexing.pcj.fluo.app.util; import java.util.HashSet; import java.util.Set; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.SingletonSet; -import org.openrdf.query.algebra.evaluation.function.Function; -import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.ParsedTupleQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.queryrender.sparql.SPARQLQueryRenderer; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.SingletonSet; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.query.algebra.evaluation.function.FunctionRegistry; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.ParsedTupleQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.queryrender.sparql.SPARQLQueryRenderer; /** * Class for creating a String representation a given Filter, and for @@ -85,7 +85,7 @@ public class FilterSerializer { } } - public static class FilterVisitor extends QueryModelVisitorBase<RuntimeException> { + public static class FilterVisitor extends AbstractQueryModelVisitor<RuntimeException> { private Set<Filter> filters; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/PeriodicQueryUtil.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/PeriodicQueryUtil.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/PeriodicQueryUtil.java index 406ba4c..17fedf7 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/PeriodicQueryUtil.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/PeriodicQueryUtil.java @@ -31,26 +31,26 @@ import org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants; import org.apache.rya.indexing.pcj.fluo.app.NodeType; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.fluo.app.query.PeriodicQueryNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.FunctionCall; -import org.openrdf.query.algebra.Group; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.Reduced; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.UnaryTupleOperator; -import org.openrdf.query.algebra.ValueConstant; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.sparql.SPARQLParser; +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.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.FunctionCall; +import org.eclipse.rdf4j.query.algebra.Group; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.Reduced; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.UnaryTupleOperator; +import org.eclipse.rdf4j.query.algebra.ValueConstant; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.base.Preconditions; @@ -60,12 +60,12 @@ import com.google.common.base.Preconditions; */ public class PeriodicQueryUtil { - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); public static final String PeriodicQueryURI = "http://org.apache.rya/function#periodic";; public static final String temporalNameSpace = "http://www.w3.org/2006/time#";; - public static final URI DAYS = vf.createURI("http://www.w3.org/2006/time#days";); - public static final URI HOURS = vf.createURI("http://www.w3.org/2006/time#hours";); - public static final URI MINUTES = vf.createURI("http://www.w3.org/2006/time#minutes";); + public static final IRI DAYS = VF.createIRI("http://www.w3.org/2006/time#days";); + public static final IRI HOURS = VF.createIRI("http://www.w3.org/2006/time#hours";); + public static final IRI MINUTES = VF.createIRI("http://www.w3.org/2006/time#minutes";); /** * Returns a PeriodicQueryNode for all {@link FunctionCall}s that represent PeriodicQueryNodes, otherwise @@ -105,7 +105,7 @@ public class PeriodicQueryUtil { * Locates Filter containing FunctionCall with PeriodicQuery info and * replaces that Filter with a PeriodicQueryNode. */ - public static class PeriodicQueryNodeVisitor extends QueryModelVisitorBase<RuntimeException> { + public static class PeriodicQueryNodeVisitor extends AbstractQueryModelVisitor<RuntimeException> { private int count = 0; private PeriodicQueryNode periodicNode; @@ -145,7 +145,7 @@ public class PeriodicQueryUtil { * whose variable order needs to be changed when the PeriodicQueryMetadata * is added. */ - public static class PeriodicQueryNodeRelocator extends QueryModelVisitorBase<RuntimeException> { + public static class PeriodicQueryNodeRelocator extends AbstractQueryModelVisitor<RuntimeException> { private UnaryTupleOperator relocationParent; @@ -261,8 +261,8 @@ public class PeriodicQueryUtil { } private static TimeUnit getTimeUnit(ValueConstant val) { - Preconditions.checkArgument(val.getValue() instanceof URI); - URI uri = (URI) val.getValue(); + Preconditions.checkArgument(val.getValue() instanceof IRI); + IRI uri = (IRI) val.getValue(); Preconditions.checkArgument(uri.getNamespace().equals(temporalNameSpace)); switch (uri.getLocalName()) { @@ -282,7 +282,7 @@ public class PeriodicQueryUtil { Preconditions.checkArgument(val instanceof Literal); Literal literal = (Literal) val; String stringVal = literal.getLabel(); - URI dataType = literal.getDatatype(); + IRI dataType = literal.getDatatype(); Preconditions.checkArgument(dataType.equals(XMLSchema.DECIMAL) || dataType.equals(XMLSchema.DOUBLE) || dataType.equals(XMLSchema.FLOAT) || dataType.equals(XMLSchema.INTEGER) || dataType.equals(XMLSchema.INT)); return Double.parseDouble(stringVal); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/RowKeyUtil.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/RowKeyUtil.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/RowKeyUtil.java index ffb2320..d7fa626 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/RowKeyUtil.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/RowKeyUtil.java @@ -24,7 +24,7 @@ import org.apache.fluo.api.data.Bytes; import org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetStringConverter; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java index bab8cde..c52a72a 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTest.java @@ -17,6 +17,7 @@ package org.apache.rya.indexing.pcj.fluo.app; * specific language governing permissions and limitations * under the License. */ + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -28,21 +29,21 @@ import java.util.Set; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.model.VisibilityBindingSet; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Sets; public class ConstructGraphTest { - private ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void testConstructGraph() throws MalformedQueryException, UnsupportedEncodingException { @@ -54,9 +55,9 @@ public class ConstructGraphTest { ConstructGraph graph = new ConstructGraph(patterns); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("x", vf.createURI("uri:Joe")); - bs.addBinding("y", vf.createURI("uri:Bob")); - bs.addBinding("z", vf.createURI("uri:BurgerShack")); + bs.addBinding("x", VF.createIRI("uri:Joe")); + bs.addBinding("y", VF.createIRI("uri:Bob")); + bs.addBinding("z", VF.createIRI("uri:BurgerShack")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs,"FOUO"); Set<RyaStatement> statements = graph.createGraphFromBindingSet(vBs); @@ -77,8 +78,8 @@ public class ConstructGraphTest { ConstructGraph graph = new ConstructGraph(patterns); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("x", vf.createURI("uri:Joe")); - bs.addBinding("z", vf.createURI("uri:BurgerShack")); + bs.addBinding("x", VF.createIRI("uri:Joe")); + bs.addBinding("z", VF.createIRI("uri:BurgerShack")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs, "FOUO"); Set<RyaStatement> statements = graph.createGraphFromBindingSet(vBs); Set<RyaStatement> statements2 = graph.createGraphFromBindingSet(vBs); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java index a12b6de..d505b33 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructGraphTestUtils.java @@ -17,6 +17,7 @@ package org.apache.rya.indexing.pcj.fluo.app; * specific language governing permissions and limitations * under the License. */ + import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -26,8 +27,8 @@ import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaSubGraph; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.eclipse.rdf4j.model.Statement; import org.junit.Assert; -import org.openrdf.model.Statement; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java index 975c527..f884b7b 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/ConstructProjectionTest.java @@ -1,4 +1,5 @@ package org.apache.rya.indexing.pcj.fluo.app; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,6 +18,7 @@ package org.apache.rya.indexing.pcj.fluo.app; * specific language governing permissions and limitations * under the License. */ + import static org.junit.Assert.assertEquals; import java.io.UnsupportedEncodingException; @@ -26,22 +28,23 @@ import java.util.Map; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.VarNameUtils; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.model.BNode; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class ConstructProjectionTest { - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void testConstructProjectionProjectSubj() throws MalformedQueryException, UnsupportedEncodingException { @@ -53,7 +56,7 @@ public class ConstructProjectionTest { ConstructProjection projection = new ConstructProjection(patterns.get(0)); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("x", vf.createURI("uri:Joe")); + bs.addBinding("x", VF.createIRI("uri:Joe")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs, "FOUO"); RyaStatement statement = projection.projectBindingSet(vBs, new HashMap<>()); @@ -74,7 +77,7 @@ public class ConstructProjectionTest { ConstructProjection projection = new ConstructProjection(patterns.get(0)); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("p", vf.createURI("uri:worksWith")); + bs.addBinding("p", VF.createIRI("uri:worksWith")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs); RyaStatement statement = projection.projectBindingSet(vBs, new HashMap<>()); @@ -95,11 +98,11 @@ public class ConstructProjectionTest { ConstructProjection projection = new ConstructProjection(patterns.get(0)); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("o", vf.createURI("uri:Bob")); + bs.addBinding("o", VF.createIRI("uri:Bob")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs); - BNode bNode = vf.createBNode(); + BNode bNode = VF.createBNode(); Map<String, BNode> bNodeMap = new HashMap<>(); - bNodeMap.put("-anon-1", bNode); + bNodeMap.put(VarNameUtils.prependAnonymous("1"), bNode); RyaStatement statement = projection.projectBindingSet(vBs,bNodeMap); RyaStatement expected = new RyaStatement(RdfToRyaConversions.convertResource(bNode), new RyaURI("uri:talksTo"), new RyaURI("uri:Bob")); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverterTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverterTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverterTest.java index 60e1bc1..c49a06c 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverterTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverterTest.java @@ -18,28 +18,31 @@ */ package org.apache.rya.indexing.pcj.fluo.app; +import static org.apache.rya.api.domain.VarNameUtils.prependConstant; +import static org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants.TYPE_DELIM; import static org.junit.Assert.assertEquals; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; import org.junit.Test; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; /** * Tests the methods of {@link FluoStringConverterTest}. */ public class FluoStringConverterTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void statementPatternToString() throws MalformedQueryException { // Setup a StatementPattern that represents "?x <http://worksAt> <http://Chipotle>." final Var subject = new Var("x"); - final Var predicate = new Var("-const-http://worksAt";, new URIImpl("http://worksAt";)); + final Var predicate = new Var(prependConstant("http://worksAt";), VF.createIRI("http://worksAt";)); predicate.setConstant(true); - final Var object = new Var("-const-http://Chipotle";, new URIImpl("http://Chipotle";)); + final Var object = new Var(prependConstant("http://Chipotle";), VF.createIRI("http://Chipotle";)); object.setConstant(true); final StatementPattern pattern = new StatementPattern(subject, predicate, object); @@ -48,8 +51,8 @@ public class FluoStringConverterTest { // Ensure it converted to the expected result. final String expected = "x:::" + - "-const-http://worksAt<<~>>http://www.w3.org/2001/XMLSchema#anyURI:::"; + - "-const-http://Chipotle<<~>>http://www.w3.org/2001/XMLSchema#anyURI";; + prependConstant("http://worksAt<<~>>http://www.w3.org/2001/XMLSchema#anyURI:::";) + + prependConstant("http://Chipotle<<~>>http://www.w3.org/2001/XMLSchema#anyURI";); assertEquals(spString, expected); } @@ -58,17 +61,17 @@ public class FluoStringConverterTest { public void stringToStatementPattern() { // Setup the String representation of a statement pattern. final String patternString = "x:::" + - "-const-http://worksAt<<~>>http://www.w3.org/2001/XMLSchema#anyURI:::"; + - "-const-http://Chipotle<<~>>http://www.w3.org/2001/XMLSchema#anyURI";; + prependConstant("http://worksAt<<~>>http://www.w3.org/2001/XMLSchema#anyURI:::";) + + prependConstant("http://Chipotle<<~>>http://www.w3.org/2001/XMLSchema#anyURI";); // Convert it to a StatementPattern. final StatementPattern statementPattern = FluoStringConverter.toStatementPattern(patternString); // Enusre it converted to the expected result. final Var subject = new Var("x"); - final Var predicate = new Var("-const-http://worksAt";, new URIImpl("http://worksAt";)); + final Var predicate = new Var(prependConstant("http://worksAt";), VF.createIRI("http://worksAt";)); predicate.setConstant(true); - final Var object = new Var("-const-http://Chipotle";, new URIImpl("http://Chipotle";)); + final Var object = new Var(prependConstant("http://Chipotle";), VF.createIRI("http://Chipotle";)); object.setConstant(true); final StatementPattern expected = new StatementPattern(subject, predicate, object); @@ -78,13 +81,13 @@ public class FluoStringConverterTest { @Test public void toVar_uri() { // Setup the string representation of the variable. - final String varString = "-const-http://Chipotle<<~>>http://www.w3.org/2001/XMLSchema#anyURI";; + final String varString = String.format(prependConstant("http://Chipotle%s%s";),TYPE_DELIM,XMLSchema.ANYURI ); // Convert it to a Var object. final Var var = FluoStringConverter.toVar(varString); // Ensure it converted to the expected result. - final Var expected = new Var("-const-http://Chipotle";, new URIImpl("http://Chipotle";)); + final Var expected = new Var(prependConstant("http://Chipotle";), VF.createIRI("http://Chipotle";)); expected.setConstant(true); assertEquals(expected, var); @@ -93,13 +96,13 @@ public class FluoStringConverterTest { @Test public void toVar_int() throws MalformedQueryException { // Setup the string representation of the variable. - final String varString = "-const-5<<~>>http://www.w3.org/2001/XMLSchema#integer";; + final String varString = prependConstant("5<<~>>http://www.w3.org/2001/XMLSchema#integer";); // Convert it to a Var object. final Var result = FluoStringConverter.toVar(varString); // Ensure it converted to the expected result. - final Var expected = new Var("-const-5", new LiteralImpl("5", XMLSchema.INTEGER)); + final Var expected = new Var(prependConstant("5"), VF.createLiteral("5", XMLSchema.INTEGER)); expected.setConstant(true); assertEquals(expected, result); @@ -108,13 +111,13 @@ public class FluoStringConverterTest { @Test public void toVar_string() { // Setup the string representation of the variable. - final String varString = "-const-Chipotle<<~>>http://www.w3.org/2001/XMLSchema#string";; + final String varString = prependConstant("Chipotle<<~>>http://www.w3.org/2001/XMLSchema#string";); // Convert it to a Var object. final Var result = FluoStringConverter.toVar(varString); // Ensure it converted to the expected result. - final Var expected = new Var("-const-Chipotle", new LiteralImpl("Chipotle", XMLSchema.STRING)); + final Var expected = new Var(prependConstant("Chipotle"), VF.createLiteral("Chipotle", XMLSchema.STRING)); expected.setConstant(true); assertEquals(expected, result); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java index 8b9feaf..9a9feef 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/RyaSubGraphKafkaSerDeTest.java @@ -17,17 +17,18 @@ package org.apache.rya.indexing.pcj.fluo.app; * specific language governing permissions and limitations * under the License. */ + import static org.junit.Assert.assertEquals; import java.util.UUID; -import org.apache.rya.api.domain.RyaSubGraph; import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaSubGraph; import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.indexing.pcj.fluo.app.export.kafka.RyaSubGraphKafkaSerDe; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.junit.Test; -import org.openrdf.model.vocabulary.XMLSchema; public class RyaSubGraphKafkaSerDeTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/batch/serializer/BatchInformationSerializerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/batch/serializer/BatchInformationSerializerTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/batch/serializer/BatchInformationSerializerTest.java index 2c37462..cc9c825 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/batch/serializer/BatchInformationSerializerTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/batch/serializer/BatchInformationSerializerTest.java @@ -32,11 +32,13 @@ import org.apache.rya.indexing.pcj.fluo.app.batch.JoinBatchInformation; import org.apache.rya.indexing.pcj.fluo.app.batch.SpanBatchDeleteInformation; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.Test; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; public class BatchInformationSerializerTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void testSpanBatchInformationSerialization() { @@ -54,8 +56,8 @@ public class BatchInformationSerializerTest { public void testJoinBatchInformationSerialization() { QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("a", new URIImpl("urn:123")); - bs.addBinding("b", new URIImpl("urn:456")); + bs.addBinding("a", VF.createIRI("urn:123")); + bs.addBinding("b", VF.createIRI("urn:456")); VisibilityBindingSet vBis = new VisibilityBindingSet(bs, "FOUO"); JoinBatchInformation batch = JoinBatchInformation.builder().setBatchSize(1000).setTask(Task.Update) http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryUtilTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryUtilTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryUtilTest.java index 55455a7..3482e0d 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryUtilTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/PeriodicQueryUtilTest.java @@ -31,34 +31,34 @@ import org.apache.rya.indexing.pcj.fluo.app.util.PeriodicQueryUtil; import org.apache.rya.indexing.pcj.fluo.app.util.PeriodicQueryUtil.PeriodicQueryNodeRelocator; import org.apache.rya.indexing.pcj.fluo.app.util.PeriodicQueryUtil.PeriodicQueryNodeVisitor; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.FunctionCall; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.ValueConstant; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.FunctionCall; -import org.openrdf.query.algebra.Join; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.ValueConstant; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class PeriodicQueryUtilTest { - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void periodicNodeNotPresentTest() throws Exception { - List<ValueExpr> values = Arrays.asList(new Var("time"), new ValueConstant(vf.createLiteral(12.0)), new ValueConstant(vf.createLiteral(6.0)), new ValueConstant(vf.createURI(PeriodicQueryUtil.temporalNameSpace + "hours"))); + List<ValueExpr> values = Arrays.asList(new Var("time"), new ValueConstant(VF.createLiteral(12.0)), new ValueConstant(VF.createLiteral(6.0)), new ValueConstant(VF.createIRI(PeriodicQueryUtil.temporalNameSpace + "hours"))); FunctionCall func = new FunctionCall("uri:func", values); Optional<PeriodicQueryNode> node1 = PeriodicQueryUtil.getPeriodicQueryNode(func, new Join()); Assert.assertEquals(false, node1.isPresent()); @@ -69,7 +69,7 @@ public class PeriodicQueryUtilTest { @Test public void periodicNodePresentTest() throws Exception { - List<ValueExpr> values = Arrays.asList(new Var("time"), new ValueConstant(vf.createLiteral(12.0)), new ValueConstant(vf.createLiteral(6.0)), new ValueConstant(vf.createURI(PeriodicQueryUtil.temporalNameSpace + "hours"))); + List<ValueExpr> values = Arrays.asList(new Var("time"), new ValueConstant(VF.createLiteral(12.0)), new ValueConstant(VF.createLiteral(6.0)), new ValueConstant(VF.createIRI(PeriodicQueryUtil.temporalNameSpace + "hours"))); FunctionCall func = new FunctionCall(PeriodicQueryUtil.PeriodicQueryURI, values); Optional<PeriodicQueryNode> node1 = PeriodicQueryUtil.getPeriodicQueryNode(func, new Join()); Assert.assertEquals(true, node1.isPresent()); @@ -83,7 +83,7 @@ public class PeriodicQueryUtilTest { @Test public void periodicNodeFractionalDurationTest() throws Exception { - List<ValueExpr> values = Arrays.asList(new Var("time"), new ValueConstant(vf.createLiteral(1)), new ValueConstant(vf.createLiteral(.5)), new ValueConstant(vf.createURI(PeriodicQueryUtil.temporalNameSpace + "hours"))); + List<ValueExpr> values = Arrays.asList(new Var("time"), new ValueConstant(VF.createLiteral(1)), new ValueConstant(VF.createLiteral(.5)), new ValueConstant(VF.createIRI(PeriodicQueryUtil.temporalNameSpace + "hours"))); FunctionCall func = new FunctionCall(PeriodicQueryUtil.PeriodicQueryURI, values); Optional<PeriodicQueryNode> node1 = PeriodicQueryUtil.getPeriodicQueryNode(func, new Join()); Assert.assertEquals(true, node1.isPresent()); @@ -190,7 +190,7 @@ public class PeriodicQueryUtilTest { .append(node1.getTemporalVariable(), node2.getTemporalVariable()).append(node1.getUnit(), node2.getUnit()).build(); } - private static class PeriodicNodeCollector extends QueryModelVisitorBase<RuntimeException>{ + private static class PeriodicNodeCollector extends AbstractQueryModelVisitor<RuntimeException> { private PeriodicQueryNode periodicNode; int count = 0; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunctionTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunctionTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunctionTest.java index 2e09e4e..00f6433 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunctionTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/BindingHashShardingFunctionTest.java @@ -25,22 +25,22 @@ import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.indexing.pcj.fluo.app.BindingSetRow; import org.apache.rya.indexing.pcj.fluo.app.NodeType; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; public class BindingHashShardingFunctionTest { - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void shardAddAndRemoveTest() { String nodeId = NodeType.generateNewFluoIdForType(NodeType.STATEMENT_PATTERN); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("entity", vf.createURI("urn:entity")); - bs.addBinding("location", vf.createLiteral("location_1")); + bs.addBinding("entity", VF.createIRI("urn:entity")); + bs.addBinding("location", VF.createLiteral("location_1")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs); VariableOrder varOrder = new VariableOrder("entity","location"); Bytes row = RowKeyUtil.makeRowKey(nodeId, varOrder, vBs); @@ -53,8 +53,8 @@ public class BindingHashShardingFunctionTest { public void bindingSetRowTest() { String nodeId = NodeType.generateNewFluoIdForType(NodeType.STATEMENT_PATTERN); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("entity", vf.createURI("urn:entity")); - bs.addBinding("location", vf.createLiteral("location_1")); + bs.addBinding("entity", VF.createIRI("urn:entity")); + bs.addBinding("location", VF.createLiteral("location_1")); VisibilityBindingSet vBs = new VisibilityBindingSet(bs); VariableOrder varOrder = new VariableOrder("entity","location"); Bytes row = RowKeyUtil.makeRowKey(nodeId, varOrder, vBs); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializerTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializerTest.java index b2efa96..561a7cd 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializerTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/util/FilterSerializerTest.java @@ -20,11 +20,11 @@ package org.apache.rya.indexing.pcj.fluo.app.util; import static org.junit.Assert.assertEquals; +import org.eclipse.rdf4j.query.algebra.Filter; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Test; -import org.openrdf.query.algebra.Filter; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; public class FilterSerializerTest { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml index 418c195..403b4eb 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml +++ b/extras/rya.pcj.fluo/pcj.fluo.client/pom.xml @@ -60,21 +60,21 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryrender</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryrender</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-ntriples</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-ntriples</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-trig</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-trig</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-turtle</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-turtle</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <!-- Log4j 2 bridge, api, and core. --> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java index cc74f6b..99957bc 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java @@ -32,17 +32,19 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import edu.umd.cs.findbugs.annotations.DefaultAnnotation; -import edu.umd.cs.findbugs.annotations.NonNull; - 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.security.tokens.PasswordToken; +import org.apache.fluo.api.client.FluoClient; +import org.apache.fluo.api.client.FluoFactory; +import org.apache.fluo.api.config.FluoConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.indexing.pcj.fluo.app.query.UnsupportedQueryException; import org.apache.rya.indexing.pcj.fluo.client.PcjAdminClientCommand.ArgumentsException; import org.apache.rya.indexing.pcj.fluo.client.PcjAdminClientCommand.ExecutionException; @@ -51,18 +53,15 @@ import org.apache.rya.indexing.pcj.fluo.client.command.ListQueriesCommand; import org.apache.rya.indexing.pcj.fluo.client.command.LoadTriplesCommand; import org.apache.rya.indexing.pcj.fluo.client.command.NewQueryCommand; import org.apache.rya.indexing.pcj.fluo.client.command.QueryReportCommand; -import org.openrdf.repository.RepositoryException; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.eclipse.rdf4j.repository.RepositoryException; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import org.apache.fluo.api.client.FluoClient; -import org.apache.fluo.api.client.FluoFactory; -import org.apache.fluo.api.config.FluoConfiguration; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.accumulo.AccumuloRyaDAO; -import org.apache.rya.rdftriplestore.RdfCloudTripleStore; -import org.apache.rya.rdftriplestore.RyaSailRepository; +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; /** * An application that helps Rya PCJ administrators interact with the cluster. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java index 42ac427..8913039 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java @@ -32,9 +32,9 @@ import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; import org.apache.rya.indexing.pcj.fluo.client.PcjAdminClientCommand; import org.apache.rya.indexing.pcj.fluo.client.util.FluoLoader; import org.apache.rya.rdftriplestore.RyaSailRepository; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.Rio; +import org.apache.rya.rdftriplestore.utils.RdfFormatUtils; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.Rio; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; @@ -98,7 +98,7 @@ public class LoadTriplesCommand implements PcjAdminClientCommand { final Path triplesPath = Paths.get( params.nTriplesFile ); try { - final RDFParser parser = Rio.createParser(RDFFormat.forFileName(triplesPath.getFileName().toString())); + final RDFParser parser = Rio.createParser(RdfFormatUtils.forFileName(triplesPath.getFileName().toString())); final FluoLoader loader = new FluoLoader(fluo, new InsertTriples()); parser.setRDFHandler(loader); parser.parse(Files.newInputStream(triplesPath), triplesPath.toUri().toString()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java index 78515d9..806aa98 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java @@ -21,25 +21,15 @@ package org.apache.rya.indexing.pcj.fluo.client.command; import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.List; -import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.DefaultAnnotation; -import edu.umd.cs.findbugs.annotations.NonNull; - -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.security.Authorizations; import org.apache.commons.io.IOUtils; +import org.apache.fluo.api.client.FluoClient; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.indexing.pcj.fluo.api.CreateFluoPcj; import org.apache.rya.indexing.pcj.fluo.app.query.UnsupportedQueryException; @@ -48,16 +38,15 @@ import org.apache.rya.indexing.pcj.fluo.client.util.ParsedQueryRequest; import org.apache.rya.indexing.pcj.storage.PcjException; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.sail.SailException; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; -import org.apache.fluo.api.client.FluoClient; -import org.apache.rya.rdftriplestore.RyaSailRepository; +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull; /** * A command that creates a creates a new PCJ in the Fluo app and loads historic http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java index 206cf9d..4b55608 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java @@ -22,25 +22,24 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.ArrayList; +import org.apache.fluo.api.client.FluoClient; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.helpers.AbstractRDFHandler; import com.google.common.base.Optional; -import org.apache.fluo.api.client.FluoClient; -import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.resolver.RdfToRyaConversions; - /** * When used as the handler of an {@link RDFParser}, instances of this class * will batch load {@link Statement}s into the Fluo app 1000 statements at a time. */ -public class FluoLoader extends RDFHandlerBase { +public class FluoLoader extends AbstractRDFHandler { private static final Logger log = LogManager.getLogger(FluoLoader.class); private static final int FLUSH_SIZE = 1000; @@ -70,7 +69,7 @@ public class FluoLoader extends RDFHandlerBase { // If the buffer is full, flush it to the Fluo table. if(buff.size() == FLUSH_SIZE) { log.trace("Flushing " + buff.size() + " Statements from the buffer to Fluo."); - insertTriples.insert(fluoClient, buff, Optional.<String>absent()); + insertTriples.insert(fluoClient, buff, Optional.absent()); buff.clear(); } @@ -85,7 +84,7 @@ public class FluoLoader extends RDFHandlerBase { if(!buff.isEmpty()) { log.trace("Flushing the last " + buff.size() + " Statements from the buffer to Fluo."); - insertTriples.insert(fluoClient, buff, Optional.<String>absent()); + insertTriples.insert(fluoClient, buff, Optional.absent()); buff.clear(); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java index 93570ea..42169ad 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java @@ -28,9 +28,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.rya.indexing.pcj.fluo.client.util.Report.ReportItem; import org.apache.rya.indexing.pcj.storage.PcjMetadata; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.queryrender.sparql.SPARQLQueryRenderer; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.queryrender.sparql.SPARQLQueryRenderer; /** * Pretty renders the state of a query's {@link PcjMetadata}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java index d1b3e25..eaedd64 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/QueryReportRenderer.java @@ -31,9 +31,9 @@ import org.apache.rya.indexing.pcj.fluo.app.query.ProjectionMetadata; import org.apache.rya.indexing.pcj.fluo.app.query.QueryMetadata; import org.apache.rya.indexing.pcj.fluo.app.query.StatementPatternMetadata; import org.apache.rya.indexing.pcj.fluo.client.util.Report.ReportItem; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.queryrender.sparql.SPARQLQueryRenderer; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.queryrender.sparql.SPARQLQueryRenderer; import edu.umd.cs.findbugs.annotations.DefaultAnnotation; import edu.umd.cs.findbugs.annotations.NonNull; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml index 3019c37..98cbdf2 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/pom.xml @@ -47,8 +47,8 @@ under the License. <!-- 3rd Party Runtime Dependencies. --> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryrender</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryrender</artifactId> </dependency> <dependency> <groupId>org.apache.fluo</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java index 1bc5f1b..dc0d90e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java @@ -20,11 +20,10 @@ package org.apache.rya.indexing.pcj.fluo.demo; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.minicluster.MiniAccumuloCluster; -import org.openrdf.repository.RepositoryConnection; - import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.mini.MiniFluo; import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.eclipse.rdf4j.repository.RepositoryConnection; /** * Represents a demonstration that uses Rya and Fluo on top of Accumulo. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java index 1ae02dd..e194407 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; @@ -34,6 +33,7 @@ import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.minicluster.MiniAccumuloCluster; +import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.client.FluoFactory; import org.apache.fluo.api.config.FluoConfiguration; @@ -56,7 +56,6 @@ import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails; import org.apache.rya.api.instance.RyaDetails.ProspectorDetails; import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails; import org.apache.rya.api.instance.RyaDetailsRepository; -import org.apache.rya.api.instance.RyaDetailsRepository.AlreadyInitializedException; import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException; import org.apache.rya.indexing.pcj.fluo.app.export.rya.RyaExportParameters; import org.apache.rya.indexing.pcj.fluo.app.observers.FilterObserver; @@ -67,8 +66,8 @@ import org.apache.rya.indexing.pcj.fluo.app.observers.TripleObserver; import org.apache.rya.indexing.pcj.fluo.demo.Demo.DemoExecutionException; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.RyaSailRepository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; import com.google.common.base.Optional; import com.google.common.io.Files; @@ -277,8 +276,8 @@ public class DemoDriver { .setPCJIndexDetails( PCJIndexDetails.builder() .setEnabled(true) ) - .setJoinSelectivityDetails( new JoinSelectivityDetails( Optional.<Date>absent() ) ) - .setProspectorDetails( new ProspectorDetails( Optional.<Date>absent() )) + .setJoinSelectivityDetails( new JoinSelectivityDetails( Optional.absent() ) ) + .setProspectorDetails( new ProspectorDetails( Optional.absent() )) .build(); detailsRepo.initialize(details); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java index 181f322..8ef6db3 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java @@ -41,14 +41,14 @@ import org.apache.rya.indexing.pcj.storage.PcjException; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.rdftriplestore.RyaSailRepository; -import org.openrdf.model.Statement; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.queryrender.sparql.SPARQLQueryRenderer; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.queryrender.sparql.SPARQLQueryRenderer; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; import com.google.common.base.Optional; import com.google.common.collect.Sets; @@ -287,7 +287,7 @@ public class FluoAndHistoricPcjsDemo implements Demo { private static void loadDataIntoFluo(final FluoClient fluoClient, final Set<RyaStatement> statements) { final InsertTriples insertTriples = new InsertTriples(); for(final RyaStatement statement : statements) { - insertTriples.insert(fluoClient, statement, Optional.<String>absent()); + insertTriples.insert(fluoClient, statement, Optional.absent()); } }
