This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch gh2518-cdt
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 94f0a79054acb8bf986e129493e7452c123375c7
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Wed Aug 28 13:57:58 2024 +0100
Code tidy
---
.../apache/jena/sparql/algebra/op/OpUnfold.java | 66 ++++++++++-----------
.../sparql/engine/iterator/QueryIterUnfold.java | 20 +++----
.../apache/jena/sparql/syntax/ElementUnfold.java | 69 ++++++++++------------
3 files changed, 68 insertions(+), 87 deletions(-)
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpUnfold.java
b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpUnfold.java
index 55a193e133..3a43f26c00 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpUnfold.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpUnfold.java
@@ -28,75 +28,69 @@ import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.sse.Tags;
import org.apache.jena.sparql.util.NodeIsomorphismMap;
-public class OpUnfold extends Op1
-{
- protected final Expr expr ;
- protected final Var var1 ;
- protected final Var var2 ;
+public class OpUnfold extends Op1 {
+ protected final Expr expr;
+ protected final Var var1;
+ protected final Var var2;
public OpUnfold(Op subOp, Expr expr, Var var1, Var var2) {
- super(subOp) ;
- this.expr = expr ;
- this.var1 = var1 ;
- this.var2 = var2 ;
+ super(subOp);
+ this.expr = expr;
+ this.var1 = var1;
+ this.var2 = var2;
}
- public Expr getExpr()
- {
- return expr ;
+ public Expr getExpr() {
+ return expr;
}
- public Var getVar1()
- {
- return var1 ;
+ public Var getVar1() {
+ return var1;
}
- public Var getVar2()
- {
- return var2 ;
+ public Var getVar2() {
+ return var2;
}
@Override
public String getName() {
- return Tags.tagUnfold ;
+ return Tags.tagUnfold;
}
@Override
public void visit(OpVisitor opVisitor) {
- opVisitor.visit(this) ;
+ opVisitor.visit(this);
}
@Override
public Op1 copy(Op subOp) {
- OpUnfold op = new OpUnfold(subOp, expr, var1, var2) ;
- return op ;
+ OpUnfold op = new OpUnfold(subOp, expr, var1, var2);
+ return op;
}
@Override
public boolean equalTo(Op other, NodeIsomorphismMap labelMap) {
- if ( !(other instanceof OpUnfold) )
- return false ;
- OpUnfold unfold = (OpUnfold)other ;
-
- if ( !Objects.equals(var1, unfold.var1) )
- return false ;
- if ( !Objects.equals(var2, unfold.var2) )
- return false ;
- if ( !Objects.equals(expr, unfold.expr) )
- return false ;
- return getSubOp().equalTo(unfold.getSubOp(), labelMap) ;
+ if ( !(other instanceof OpUnfold unfold) )
+ return false;
+ if ( !Objects.equals(var1, unfold.var1) )
+ return false;
+ if ( !Objects.equals(var2, unfold.var2) )
+ return false;
+ if ( !Objects.equals(expr, unfold.expr) )
+ return false;
+ return getSubOp().equalTo(unfold.getSubOp(), labelMap);
}
@Override
public Op apply(Transform transform, Op subOp) {
- return transform.transform(this, subOp) ;
+ return transform.transform(this, subOp);
}
@Override
public int hashCode() {
if ( var2 == null )
- return getName().hashCode() ^ expr.hashCode() ^ var1.hashCode() ^
getSubOp().hashCode() ;
+ return getName().hashCode() ^ expr.hashCode() ^ var1.hashCode() ^
getSubOp().hashCode();
else
- return getName().hashCode() ^ expr.hashCode() ^ var1.hashCode() ^
var2.hashCode() ^ getSubOp().hashCode() ;
+ return getName().hashCode() ^ expr.hashCode() ^ var1.hashCode() ^
var2.hashCode() ^ getSubOp().hashCode();
}
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterUnfold.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterUnfold.java
index 6de9f31fc8..500aefa3d3 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterUnfold.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterUnfold.java
@@ -43,16 +43,16 @@ import
org.apache.jena.sparql.serializer.SerializationContext;
public class QueryIterUnfold extends QueryIterRepeatApply
{
- protected final Expr expr ;
- protected final Var var1 ;
- protected final Var var2 ;
+ protected final Expr expr;
+ protected final Var var1;
+ protected final Var var2;
public QueryIterUnfold(QueryIterator qIter, Expr expr, Var var1, Var var2,
ExecutionContext execCxt) {
- super(qIter, execCxt) ;
+ super(qIter, execCxt);
- this.expr = expr ;
- this.var1 = var1 ;
- this.var2 = var2 ;
+ this.expr = expr;
+ this.var1 = var1;
+ this.var2 = var2;
}
@Override
@@ -65,7 +65,6 @@ public class QueryIterUnfold extends QueryIterRepeatApply
// If the expression failed to evaluate, we create no
// no assignment (exactly as in the case of BIND, see
// the 'accept' method in 'QueryIterAssign')
-
return QueryIterSingleton.create( inputBinding, getExecContext() );
}
@@ -140,7 +139,7 @@ public class QueryIterUnfold extends QueryIterRepeatApply
final Node indexNode;
if ( var2 != null ) {
final String indexStr = Integer.toString(nextIndex);
- indexNode = NodeFactory.createLiteral(indexStr,
XSDDatatype.XSDinteger);
+ indexNode = NodeFactory.createLiteralDT(indexStr,
XSDDatatype.XSDinteger);
}
else {
indexNode = null;
@@ -273,7 +272,6 @@ public class QueryIterUnfold extends QueryIterRepeatApply
}
}
-
protected static class ListElementExtractor extends
ElementExtractorBase<String> {
public ListElementExtractor( final String listAsString ) {
super(listAsString);
@@ -300,7 +298,6 @@ public class QueryIterUnfold extends QueryIterRepeatApply
}
}
-
protected static class MapElementExtractor extends
ElementExtractorBase<Map.Entry<String,String>> {
public MapElementExtractor( final String mapAsString ) {
super(mapAsString);
@@ -342,5 +339,4 @@ public class QueryIterUnfold extends QueryIterRepeatApply
cursor++;
}
}
-
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementUnfold.java
b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementUnfold.java
index 0ad0280762..1121ac9de7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementUnfold.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementUnfold.java
@@ -22,64 +22,55 @@ import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.util.NodeIsomorphismMap;
-public class ElementUnfold extends Element
-{
- private Expr expr ;
- private Var var1 ;
- private Var var2 ;
+public class ElementUnfold extends Element {
+ private Expr expr;
+ private Var var1;
+ private Var var2;
- public ElementUnfold(Expr expr, Var v1, Var v2)
- {
- this.expr = expr ;
- this.var1 = v1 ;
- this.var2 = v2 ;
+ public ElementUnfold(Expr expr, Var v1, Var v2) {
+ this.expr = expr;
+ this.var1 = v1;
+ this.var2 = v2;
}
- public Expr getExpr()
- {
- return expr ;
+ public Expr getExpr() {
+ return expr;
}
- public Var getVar1()
- {
- return var1 ;
+ public Var getVar1() {
+ return var1;
}
- public Var getVar2()
- {
- return var2 ;
+ public Var getVar2() {
+ return var2;
}
@Override
- public boolean equalTo(Element el2, NodeIsomorphismMap isoMap)
- {
- if ( ! ( el2 instanceof ElementUnfold ) )
- return false ;
- ElementUnfold f2 = (ElementUnfold)el2 ;
- if ( ! this.getVar1().equals(f2.getVar1()) )
- return false ;
+ public boolean equalTo(Element el2, NodeIsomorphismMap isoMap) {
+ if ( !(el2 instanceof ElementUnfold) )
+ return false;
+ ElementUnfold f2 = (ElementUnfold)el2;
+ if ( !this.getVar1().equals(f2.getVar1()) )
+ return false;
if ( this.getVar2() == null && f2.getVar2() != null )
- return false ;
+ return false;
if ( this.getVar2() != null && this.getVar2().equals(f2.getVar2()) )
- return false ;
- if ( ! this.getExpr().equals(f2.getExpr()) )
- return false ;
- return true ;
+ return false;
+ if ( !this.getExpr().equals(f2.getExpr()) )
+ return false;
+ return true;
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
if ( var2 == null )
- return var1.hashCode()^expr.hashCode();
+ return var1.hashCode() ^ expr.hashCode();
else
- return var1.hashCode()^var2.hashCode()^expr.hashCode();
+ return var1.hashCode() ^ var2.hashCode() ^ expr.hashCode();
}
@Override
- public void visit(ElementVisitor v)
- {
- v.visit(this) ;
+ public void visit(ElementVisitor v) {
+ v.visit(this);
}
-
}
