diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVars.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVars.java index fa3e2d2aee5..656da558382 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVars.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVars.java @@ -21,7 +21,8 @@ package org.apache.jena.sparql.algebra; -import static org.apache.jena.sparql.core.Vars.addVar; +import static org.apache.jena.sparql.util.VarUtils.addVar; +import static org.apache.jena.sparql.util.VarUtils.addVars; import java.util.*; @@ -244,7 +245,7 @@ private static class OpVarsPattern extends OpVisitorBase { @Override public void visit(OpBGP opBGP) { - VarUtils.addVars(acc, opBGP.getPattern()); + addVars(acc, opBGP.getPattern()); } @Override @@ -256,12 +257,12 @@ public void visit(OpPath opPath) { @Override public void visit(OpQuadPattern quadPattern) { addVar(acc, quadPattern.getGraphNode()); - VarUtils.addVars(acc, quadPattern.getBasicPattern()); + addVars(acc, quadPattern.getBasicPattern()); } @Override public void visit(OpQuadBlock quadBlock) { - VarUtils.addVars(acc, quadBlock.getPattern()); + addVars(acc, quadBlock.getPattern()); } @Override diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Vars.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Vars.java index 0c846a05a93..941525a30f5 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Vars.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Vars.java @@ -27,9 +27,9 @@ import org.apache.jena.graph.Triple ; import org.apache.jena.sparql.util.VarUtils; -/** +/** * Useful operations involving Var - * @deprecated use {@link VarUtils}. + * @deprecated use {@link VarUtils}. */ @Deprecated(forRemoval = true) public class Vars { @@ -45,6 +45,5 @@ public static void addVarsFromQuad(Collection acc, Quad quad) { public static void addVar(Collection acc, Node n) { VarUtils.addVar(acc, n); } - }