This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 219cac2b753e2de9b406b85aec68852e46f7da3d Author: Andy Seaborne <[email protected]> AuthorDate: Thu Oct 1 19:01:24 2026 +0100 GH-4283: Use VarUtils, deprecate Vars --- .../algebra/optimize/VariableUsageVisitor.java | 26 ++++---------------- .../java/org/apache/jena/sparql/core/Vars.java | 28 ++++++++++------------ .../java/org/apache/jena/sparql/util/VarUtils.java | 1 - 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java index db3a505fb4..1c723d78ee 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java @@ -28,28 +28,12 @@ import org.apache.jena.graph.Node; import org.apache.jena.graph.Triple; import org.apache.jena.query.SortCondition; import org.apache.jena.sparql.algebra.OpVisitorBase; -import org.apache.jena.sparql.algebra.op.OpAssign; -import org.apache.jena.sparql.algebra.op.OpBGP; -import org.apache.jena.sparql.algebra.op.OpDatasetNames; -import org.apache.jena.sparql.algebra.op.OpExtend; -import org.apache.jena.sparql.algebra.op.OpFilter; -import org.apache.jena.sparql.algebra.op.OpGraph; -import org.apache.jena.sparql.algebra.op.OpGroup; -import org.apache.jena.sparql.algebra.op.OpLeftJoin; -import org.apache.jena.sparql.algebra.op.OpOrder; -import org.apache.jena.sparql.algebra.op.OpPath; -import org.apache.jena.sparql.algebra.op.OpProject; -import org.apache.jena.sparql.algebra.op.OpPropFunc; -import org.apache.jena.sparql.algebra.op.OpQuadBlock; -import org.apache.jena.sparql.algebra.op.OpQuadPattern; -import org.apache.jena.sparql.algebra.op.OpTable; -import org.apache.jena.sparql.algebra.op.OpTopN; -import org.apache.jena.sparql.algebra.op.OpUnfold; +import org.apache.jena.sparql.algebra.op.*; import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.core.Var; -import org.apache.jena.sparql.core.Vars; import org.apache.jena.sparql.expr.Expr; import org.apache.jena.sparql.expr.ExprVars; +import org.apache.jena.sparql.util.VarUtils; /** * A visitor which tracks variable usage @@ -73,7 +57,7 @@ public abstract class VariableUsageVisitor extends OpVisitorBase { public void visit(OpBGP opBGP) { Collection<Var> vars = new ArrayList<>(); for (Triple t : opBGP.getPattern().getList()) { - Vars.addVarsFromTriple(vars, t); + VarUtils.addVarsFromTriple(vars, t); } action(vars); } @@ -82,7 +66,7 @@ public abstract class VariableUsageVisitor extends OpVisitorBase { public void visit(OpQuadPattern quadPattern) { Collection<Var> vars = new ArrayList<>(); for (Quad q : quadPattern.getPattern().getList()) { - Vars.addVarsFromQuad(vars, q); + VarUtils.addVarsFromQuad(vars, q); } action(vars); } @@ -91,7 +75,7 @@ public abstract class VariableUsageVisitor extends OpVisitorBase { public void visit(OpQuadBlock quadBlock) { Collection<Var> vars = new ArrayList<>(); for (Quad q : quadBlock.getPattern().getList()) { - Vars.addVarsFromQuad(vars, q); + VarUtils.addVarsFromQuad(vars, q); } action(vars); } 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 31d6495ee9..0c846a05a9 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 @@ -25,29 +25,25 @@ import java.util.Collection ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; +import org.apache.jena.sparql.util.VarUtils; -/** Useful operations involving Var */ +/** + * Useful operations involving Var + * @deprecated use {@link VarUtils}. + */ +@Deprecated(forRemoval = true) public class Vars { - - public static void addVarsFromTriple(Collection<Var> acc, Triple t) { - addVar(acc, t.getSubject()) ; - addVar(acc, t.getPredicate()) ; - addVar(acc, t.getObject()) ; + + public static void addVarsFromTriple(Collection<Var> acc, Triple triple) { + VarUtils.addVarsFromTriple(acc, triple); } - public static void addVarsFromQuad(Collection<Var> acc, Quad q) { - addVar(acc, q.getSubject()) ; - addVar(acc, q.getPredicate()) ; - addVar(acc, q.getObject()) ; - addVar(acc, q.getGraph()) ; + public static void addVarsFromQuad(Collection<Var> acc, Quad quad) { + VarUtils.addVarsFromQuad(acc, quad); } public static void addVar(Collection<Var> acc, Node n) { - if (n == null) - return ; - - if (n.isVariable()) - acc.add(Var.alloc(n)) ; + VarUtils.addVar(acc, n); } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java index 559b39d8fa..41b61050fd 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java @@ -58,7 +58,6 @@ public class VarUtils { public static void addVar(Collection<Var> acc, Node n) { if ( n == null ) return; - if ( n.isVariable() ) acc.add(Var.alloc(n)); else if ( n.isTripleTerm() ) {
