This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 4a6e6b3f530035b54cd1c89352eccd09024c6f85 Author: Andy Seaborne <[email protected]> AuthorDate: Thu Sep 4 10:01:59 2025 +0100 Reformat --- .../org/apache/jena/sparql/expr/E_Conditional.java | 57 ++++++++++---------- .../org/apache/jena/sparql/expr/E_LogicalAnd.java | 60 ++++++++++------------ .../org/apache/jena/sparql/expr/E_LogicalNot.java | 10 ++-- .../org/apache/jena/sparql/expr/E_LogicalOr.java | 51 +++++++++--------- 4 files changed, 80 insertions(+), 98 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Conditional.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Conditional.java index 4b18648bd6..2461a65a3c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Conditional.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Conditional.java @@ -18,51 +18,46 @@ package org.apache.jena.sparql.expr; -import org.apache.jena.sparql.ARQInternalErrorException ; -import org.apache.jena.sparql.engine.binding.Binding ; -import org.apache.jena.sparql.function.FunctionEnv ; -import org.apache.jena.sparql.sse.Tags ; +import org.apache.jena.sparql.ARQInternalErrorException; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.function.FunctionEnv; +import org.apache.jena.sparql.sse.Tags; -/** IF(expr, expr, expr) */ +/** IF(expr, expr, expr) */ -public class E_Conditional extends ExprFunction3 -{ - private static final String functionName = Tags.tagIf ; - - private final Expr condition ; - private final Expr thenExpr ; - private final Expr elseExpr ; - - public E_Conditional(Expr condition, Expr thenExpr, Expr elseExpr) - { +public class E_Conditional extends ExprFunction3 { + private static final String functionName = Tags.tagIf; + + private final Expr condition; + private final Expr thenExpr; + private final Expr elseExpr; + + public E_Conditional(Expr condition, Expr thenExpr, Expr elseExpr) { // Don't let the parent eval the theEpxr or ifExpr. - super(condition, thenExpr, elseExpr, functionName) ; + super(condition, thenExpr, elseExpr, functionName); // Better names, - this.condition = condition ; - this.thenExpr = thenExpr ; - this.elseExpr = elseExpr ; + this.condition = condition; + this.thenExpr = thenExpr; + this.elseExpr = elseExpr; } @Override - public Expr copy(Expr arg1, Expr arg2, Expr arg3) - { - return new E_Conditional(arg1, arg2, arg3) ; + public Expr copy(Expr arg1, Expr arg2, Expr arg3) { + return new E_Conditional(arg1, arg2, arg3); } /** Special form evaluation (example, don't eval the arguments first) */ @Override - protected NodeValue evalSpecial(Binding binding, FunctionEnv env) - { - NodeValue nv = condition.eval(binding, env) ; + protected NodeValue evalSpecial(Binding binding, FunctionEnv env) { + NodeValue nv = condition.eval(binding, env); if ( condition.isSatisfied(binding, env) ) - return thenExpr.eval(binding, env) ; + return thenExpr.eval(binding, env); else - return elseExpr.eval(binding, env) ; + return elseExpr.eval(binding, env); } - + @Override - public NodeValue eval(NodeValue x, NodeValue y, NodeValue z) - { - throw new ARQInternalErrorException() ; + public NodeValue eval(NodeValue x, NodeValue y, NodeValue z) { + throw new ARQInternalErrorException(); } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalAnd.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalAnd.java index 51cabe4ef8..eacc49a773 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalAnd.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalAnd.java @@ -26,45 +26,41 @@ import org.apache.jena.sparql.sse.Tags ; public class E_LogicalAnd extends ExprFunction2 { // See logical OR - private static final String functionName = Tags.tagAnd ; - private static final String symbol = Tags.symAnd ; - - public E_LogicalAnd(Expr left, Expr right) - { - super(left, right, functionName, symbol) ; + private static final String functionName = Tags.tagAnd; + private static final String symbol = Tags.symAnd; + + public E_LogicalAnd(Expr left, Expr right) { + super(left, right, functionName, symbol); } - - // Special : does not evaluate RHS if LHS means it is unnecessary. + + // Special : does not evaluate RHS if LHS means it is unnecessary. @Override - public NodeValue evalSpecial(Binding binding, FunctionEnv env) - { - ExprEvalException error = null ; + public NodeValue evalSpecial(Binding binding, FunctionEnv env) { + ExprEvalException error = null; try { - NodeValue x = getArg1().eval(binding, env) ; - - if ( ! XSDFuncOp.effectiveBooleanValue(x) ) - return NodeValue.FALSE ; - } catch (ExprEvalException eee) - { + NodeValue x = getArg1().eval(binding, env); + + if ( !XSDFuncOp.effectiveBooleanValue(x) ) + return NodeValue.FALSE; + } catch (ExprEvalException eee) { // RHS Must be true else error. - error = eee ; + error = eee; } - + // LHS was false or error. - + try { NodeValue y = getArg2().eval(binding, env) ; - + if ( ! XSDFuncOp.effectiveBooleanValue(y) ) return NodeValue.FALSE ; - + // RHS is true but was there an error earlier? - if ( error != null ) + if ( error != null ) throw error ; - + return NodeValue.TRUE ; - } catch (ExprEvalException eee) - { + } catch (ExprEvalException eee) { // LHS an error, RHS was not false => error // Throw the first if ( error != null ) @@ -75,21 +71,19 @@ public class E_LogicalAnd extends ExprFunction2 } @Override - public NodeValue eval(NodeValue x, NodeValue y) - { + public NodeValue eval(NodeValue x, NodeValue y) { // Evaluation only happens as part of copySubstitute. // Proper evaluation is a special form as above. - if ( ! x.isBoolean() ) - throw new ExprEvalException("Not a boolean: "+x) ; + throw new ExprEvalException("Not a boolean: "+x) ; if ( ! y.isBoolean() ) - throw new ExprEvalException("Not a boolean: "+y) ; - + throw new ExprEvalException("Not a boolean: "+y) ; + boolean boolX = x.getBoolean() ; boolean boolY = y.getBoolean() ; return NodeValue.makeBoolean( boolX && boolY ) ; } - + @Override public Expr copy(Expr e1, Expr e2) { return new E_LogicalAnd(e1 , e2 ) ; } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalNot.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalNot.java index 153eb31dbc..ffe4e857a9 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalNot.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalNot.java @@ -29,15 +29,13 @@ public class E_LogicalNot extends ExprFunction1 private static final String functionName = Tags.tagNot ; private static final String symbol = Tags.symNot ; - public E_LogicalNot(Expr expr) - { - super(expr, functionName, symbol) ; + public E_LogicalNot(Expr expr) { + super(expr, functionName, symbol); } @Override - public NodeValue eval(NodeValue v) - { - return XSDFuncOp.not(v) ; + public NodeValue eval(NodeValue v) { + return XSDFuncOp.not(v); } @Override diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalOr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalOr.java index f81637863b..534f3bf86f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalOr.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LogicalOr.java @@ -23,9 +23,9 @@ import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp ; import org.apache.jena.sparql.function.FunctionEnv ; import org.apache.jena.sparql.sse.Tags ; -/* +/* Logical OR and AND is special with respect to handling errors truth table. - + A B | NOT A A && B A || B ------------------------------------- E E | E E E @@ -41,45 +41,41 @@ import org.apache.jena.sparql.sse.Tags ; public class E_LogicalOr extends ExprFunction2 { - + private static final String functionName = Tags.tagOr ; private static final String symbol = Tags.symOr ; - - public E_LogicalOr(Expr left, Expr right) - { - super(left, right, functionName, symbol) ; + + public E_LogicalOr(Expr left, Expr right) { + super(left, right, functionName, symbol); } - + @Override public NodeValue evalSpecial(Binding binding, FunctionEnv env) { ExprEvalException error = null ; try { NodeValue x = getArg1().eval(binding, env) ; - if ( XSDFuncOp.effectiveBooleanValue(x) ) - return NodeValue.TRUE ; - } catch (ExprEvalException eee) - { + return NodeValue.TRUE ; + } catch (ExprEvalException eee) { // RHS Must be true else error. error = eee ; } - + // LHS was false or error. - + try { NodeValue y = getArg2().eval(binding, env) ; - + if ( XSDFuncOp.effectiveBooleanValue(y) ) return NodeValue.TRUE ; - + // RHS is false but was there an error earlier? - if ( error != null ) + if ( error != null ) throw error ; - + return NodeValue.FALSE ; - } catch (ExprEvalException eee) - { + } catch (ExprEvalException eee) { // LHS an error, RHS was not true => error // Throw the first if ( error != null ) @@ -88,23 +84,22 @@ public class E_LogicalOr extends ExprFunction2 throw eee ; } } - + @Override - public NodeValue eval(NodeValue x, NodeValue y) - { + public NodeValue eval(NodeValue x, NodeValue y) { // Evaluation only happens as part of copySubstitute. // Proper evaluation is a special form as above. - + if ( ! x.isBoolean() ) - throw new ExprEvalException("Not a boolean: "+x) ; + throw new ExprEvalException("Not a boolean: "+x) ; if ( ! y.isBoolean() ) - throw new ExprEvalException("Not a boolean: "+y) ; - + throw new ExprEvalException("Not a boolean: "+y) ; + boolean boolX = x.getBoolean() ; boolean boolY = y.getBoolean() ; return NodeValue.makeBoolean( boolX || boolY ) ; } - + @Override public Expr copy(Expr e1, Expr e2) { return new E_LogicalOr(e1 , e2 ) ; } }
