You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/07/08 21:05:04 UTC
[tomcat] 01/03: ELSupport is a utility class. Refactor so it is
accessed as one.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c57c3619f75f5ddc21d79f58bdda1d0866da46cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 8 20:55:20 2021 +0100
ELSupport is a utility class. Refactor so it is accessed as one.
---
java/org/apache/el/lang/ELSupport.java | 9 +++------
java/org/apache/el/parser/AstAnd.java | 5 +++--
java/org/apache/el/parser/AstChoice.java | 3 ++-
java/org/apache/el/parser/AstConcatenation.java | 5 +++--
java/org/apache/el/parser/AstEqual.java | 3 ++-
java/org/apache/el/parser/AstFunction.java | 5 +++--
java/org/apache/el/parser/AstGreaterThan.java | 3 ++-
java/org/apache/el/parser/AstGreaterThanEqual.java | 3 ++-
java/org/apache/el/parser/AstLessThan.java | 3 ++-
java/org/apache/el/parser/AstLessThanEqual.java | 3 ++-
java/org/apache/el/parser/AstNegative.java | 5 +++--
java/org/apache/el/parser/AstNot.java | 3 ++-
java/org/apache/el/parser/AstNotEqual.java | 3 ++-
java/org/apache/el/parser/AstOr.java | 5 +++--
java/org/apache/el/parser/SimpleNode.java | 3 +--
15 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java
index 7a81015..808ad79 100644
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -660,11 +660,8 @@ public class ELSupport {
return false;
}
- /**
- *
- */
- public ELSupport() {
- super();
- }
+ private ELSupport() {
+ // Uility class - hide default constructor;
+ }
}
diff --git a/java/org/apache/el/parser/AstAnd.java b/java/org/apache/el/parser/AstAnd.java
index b65c731..85d268e 100644
--- a/java/org/apache/el/parser/AstAnd.java
+++ b/java/org/apache/el/parser/AstAnd.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -34,12 +35,12 @@ public final class AstAnd extends BooleanNode {
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = children[0].getValue(ctx);
- Boolean b = coerceToBoolean(ctx, obj, true);
+ Boolean b = ELSupport.coerceToBoolean(ctx, obj, true);
if (!b.booleanValue()) {
return b;
}
obj = children[1].getValue(ctx);
- b = coerceToBoolean(ctx, obj, true);
+ b = ELSupport.coerceToBoolean(ctx, obj, true);
return b;
}
}
diff --git a/java/org/apache/el/parser/AstChoice.java b/java/org/apache/el/parser/AstChoice.java
index 5819ead..173ea22 100644
--- a/java/org/apache/el/parser/AstChoice.java
+++ b/java/org/apache/el/parser/AstChoice.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -41,7 +42,7 @@ public final class AstChoice extends SimpleNode {
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
- Boolean b0 = coerceToBoolean(ctx, obj0, true);
+ Boolean b0 = ELSupport.coerceToBoolean(ctx, obj0, true);
return this.children[((b0.booleanValue() ? 1 : 2))].getValue(ctx);
}
}
diff --git a/java/org/apache/el/parser/AstConcatenation.java b/java/org/apache/el/parser/AstConcatenation.java
index f26e0a3..ae83893 100644
--- a/java/org/apache/el/parser/AstConcatenation.java
+++ b/java/org/apache/el/parser/AstConcatenation.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
public class AstConcatenation extends SimpleNode {
@@ -31,8 +32,8 @@ public class AstConcatenation extends SimpleNode {
@Override
public Object getValue(EvaluationContext ctx) throws ELException {
// Coerce the two child nodes to string and then concatenate
- String s1 = coerceToString(ctx, children[0].getValue(ctx));
- String s2 = coerceToString(ctx, children[1].getValue(ctx));
+ String s1 = ELSupport.coerceToString(ctx, children[0].getValue(ctx));
+ String s2 = ELSupport.coerceToString(ctx, children[1].getValue(ctx));
return s1 + s2;
}
diff --git a/java/org/apache/el/parser/AstEqual.java b/java/org/apache/el/parser/AstEqual.java
index a5a45cf..4a9b53e 100644
--- a/java/org/apache/el/parser/AstEqual.java
+++ b/java/org/apache/el/parser/AstEqual.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -35,6 +36,6 @@ public final class AstEqual extends BooleanNode {
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Object obj1 = this.children[1].getValue(ctx);
- return Boolean.valueOf(equals(ctx, obj0, obj1));
+ return Boolean.valueOf(ELSupport.equals(ctx, obj0, obj1));
}
}
diff --git a/java/org/apache/el/parser/AstFunction.java b/java/org/apache/el/parser/AstFunction.java
index 9c58d96..3ce652f 100644
--- a/java/org/apache/el/parser/AstFunction.java
+++ b/java/org/apache/el/parser/AstFunction.java
@@ -27,6 +27,7 @@ import jakarta.el.LambdaExpression;
import jakarta.el.ValueExpression;
import jakarta.el.VariableMapper;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
import org.apache.el.util.MessageFactory;
@@ -180,14 +181,14 @@ public final class AstFunction extends SimpleNode {
Class<?> target = paramTypes[i].getComponentType();
for (int j = i; j < inputParameterCount; j++) {
varargs[j-i] = parameters.jjtGetChild(j).getValue(ctx);
- varargs[j-i] = coerceToType(ctx, varargs[j-i], target);
+ varargs[j-i] = ELSupport.coerceToType(ctx, varargs[j-i], target);
}
params[i] = varargs;
}
} else {
params[i] = parameters.jjtGetChild(i).getValue(ctx);
}
- params[i] = coerceToType(ctx, params[i], paramTypes[i]);
+ params[i] = ELSupport.coerceToType(ctx, params[i], paramTypes[i]);
}
} catch (ELException ele) {
throw new ELException(MessageFactory.get("error.function", this
diff --git a/java/org/apache/el/parser/AstGreaterThan.java b/java/org/apache/el/parser/AstGreaterThan.java
index 2ba8f78..953947c 100644
--- a/java/org/apache/el/parser/AstGreaterThan.java
+++ b/java/org/apache/el/parser/AstGreaterThan.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -41,6 +42,6 @@ public final class AstGreaterThan extends BooleanNode {
if (obj1 == null) {
return Boolean.FALSE;
}
- return (compare(ctx, obj0, obj1) > 0) ? Boolean.TRUE : Boolean.FALSE;
+ return (ELSupport.compare(ctx, obj0, obj1) > 0) ? Boolean.TRUE : Boolean.FALSE;
}
}
diff --git a/java/org/apache/el/parser/AstGreaterThanEqual.java b/java/org/apache/el/parser/AstGreaterThanEqual.java
index 624fc5e..3095546 100644
--- a/java/org/apache/el/parser/AstGreaterThanEqual.java
+++ b/java/org/apache/el/parser/AstGreaterThanEqual.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -41,6 +42,6 @@ public final class AstGreaterThanEqual extends BooleanNode {
if (obj0 == null || obj1 == null) {
return Boolean.FALSE;
}
- return (compare(ctx, obj0, obj1) >= 0) ? Boolean.TRUE : Boolean.FALSE;
+ return (ELSupport.compare(ctx, obj0, obj1) >= 0) ? Boolean.TRUE : Boolean.FALSE;
}
}
diff --git a/java/org/apache/el/parser/AstLessThan.java b/java/org/apache/el/parser/AstLessThan.java
index 7c20e53..f7882dd 100644
--- a/java/org/apache/el/parser/AstLessThan.java
+++ b/java/org/apache/el/parser/AstLessThan.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -41,6 +42,6 @@ public final class AstLessThan extends BooleanNode {
if (obj1 == null) {
return Boolean.FALSE;
}
- return (compare(ctx, obj0, obj1) < 0) ? Boolean.TRUE : Boolean.FALSE;
+ return (ELSupport.compare(ctx, obj0, obj1) < 0) ? Boolean.TRUE : Boolean.FALSE;
}
}
diff --git a/java/org/apache/el/parser/AstLessThanEqual.java b/java/org/apache/el/parser/AstLessThanEqual.java
index 4b1463b..2baadb6 100644
--- a/java/org/apache/el/parser/AstLessThanEqual.java
+++ b/java/org/apache/el/parser/AstLessThanEqual.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -41,6 +42,6 @@ public final class AstLessThanEqual extends BooleanNode {
if (obj0 == null || obj1 == null) {
return Boolean.FALSE;
}
- return (compare(ctx, obj0, obj1) <= 0) ? Boolean.TRUE : Boolean.FALSE;
+ return (ELSupport.compare(ctx, obj0, obj1) <= 0) ? Boolean.TRUE : Boolean.FALSE;
}
}
diff --git a/java/org/apache/el/parser/AstNegative.java b/java/org/apache/el/parser/AstNegative.java
index 9a24415..c2a540c 100644
--- a/java/org/apache/el/parser/AstNegative.java
+++ b/java/org/apache/el/parser/AstNegative.java
@@ -22,6 +22,7 @@ import java.math.BigInteger;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -54,7 +55,7 @@ public final class AstNegative extends SimpleNode {
return ((BigInteger) obj).negate();
}
if (obj instanceof String) {
- if (isStringFloat((String) obj)) {
+ if (ELSupport.isStringFloat((String) obj)) {
return Double.valueOf(-Double.parseDouble((String) obj));
}
return Long.valueOf(-Long.parseLong((String) obj));
@@ -77,7 +78,7 @@ public final class AstNegative extends SimpleNode {
if (obj instanceof Byte) {
return Byte.valueOf((byte) -((Byte) obj).byteValue());
}
- Long num = (Long) coerceToNumber(ctx, obj, Long.class);
+ Long num = (Long) ELSupport.coerceToNumber(ctx, obj, Long.class);
return Long.valueOf(-num.longValue());
}
}
diff --git a/java/org/apache/el/parser/AstNot.java b/java/org/apache/el/parser/AstNot.java
index 75178d3..1a16180 100644
--- a/java/org/apache/el/parser/AstNot.java
+++ b/java/org/apache/el/parser/AstNot.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -40,7 +41,7 @@ public final class AstNot extends SimpleNode {
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = this.children[0].getValue(ctx);
- Boolean b = coerceToBoolean(ctx, obj, true);
+ Boolean b = ELSupport.coerceToBoolean(ctx, obj, true);
return Boolean.valueOf(!b.booleanValue());
}
}
diff --git a/java/org/apache/el/parser/AstNotEqual.java b/java/org/apache/el/parser/AstNotEqual.java
index e484d60..5f19904 100644
--- a/java/org/apache/el/parser/AstNotEqual.java
+++ b/java/org/apache/el/parser/AstNotEqual.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -35,6 +36,6 @@ public final class AstNotEqual extends BooleanNode {
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Object obj1 = this.children[1].getValue(ctx);
- return Boolean.valueOf(!equals(ctx, obj0, obj1));
+ return Boolean.valueOf(!ELSupport.equals(ctx, obj0, obj1));
}
}
diff --git a/java/org/apache/el/parser/AstOr.java b/java/org/apache/el/parser/AstOr.java
index 618cd0b..a16a04c 100644
--- a/java/org/apache/el/parser/AstOr.java
+++ b/java/org/apache/el/parser/AstOr.java
@@ -19,6 +19,7 @@ package org.apache.el.parser;
import jakarta.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -34,12 +35,12 @@ public final class AstOr extends BooleanNode {
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = this.children[0].getValue(ctx);
- Boolean b = coerceToBoolean(ctx, obj, true);
+ Boolean b = ELSupport.coerceToBoolean(ctx, obj, true);
if (b.booleanValue()) {
return b;
}
obj = this.children[1].getValue(ctx);
- b = coerceToBoolean(ctx, obj, true);
+ b = ELSupport.coerceToBoolean(ctx, obj, true);
return b;
}
}
diff --git a/java/org/apache/el/parser/SimpleNode.java b/java/org/apache/el/parser/SimpleNode.java
index ad3375b..b50645a 100644
--- a/java/org/apache/el/parser/SimpleNode.java
+++ b/java/org/apache/el/parser/SimpleNode.java
@@ -24,7 +24,6 @@ import jakarta.el.MethodInfo;
import jakarta.el.PropertyNotWritableException;
import jakarta.el.ValueReference;
-import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
import org.apache.el.util.MessageFactory;
@@ -32,7 +31,7 @@ import org.apache.el.util.MessageFactory;
/**
* @author Jacob Hookom [jacob@hookom.net]
*/
-public abstract class SimpleNode extends ELSupport implements Node {
+public abstract class SimpleNode implements Node {
protected Node parent;
protected Node[] children;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org