Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 2 additions & 3 deletions jena-arq/src/main/java/org/apache/jena/sparql/core/Vars.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -45,6 +45,5 @@ public static void addVarsFromQuad(Collection<Var> acc, Quad quad) {
public static void addVar(Collection<Var> acc, Node n) {
VarUtils.addVar(acc, n);
}

}

Loading