You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/28 19:17:37 UTC
[commons-jexl] 03/15: Access field directly
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit 9608dcbd203b55eaf5459681cea8914cdc049043
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:56:30 2022 -0500
Access field directly
---
.../java/org/apache/commons/jexl3/internal/InterpreterBase.java | 4 ++--
src/main/java/org/apache/commons/jexl3/internal/Operators.java | 8 ++++----
.../apache/commons/jexl3/internal/introspection/Introspector.java | 2 +-
.../apache/commons/jexl3/internal/introspection/Uberspect.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
index fd23c7e8..c5f948b5 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
@@ -93,7 +93,7 @@ public abstract class InterpreterBase extends ParserVisitor {
this.jexl = engine;
this.logger = jexl.logger;
this.uberspect = jexl.uberspect;
- this.context = aContext != null ? aContext : Engine.EMPTY_CONTEXT;
+ this.context = aContext != null ? aContext : JexlEngine.EMPTY_CONTEXT;
this.cache = engine.cache != null;
final JexlArithmetic jexla = jexl.arithmetic;
this.options = opts == null? engine.evalOptions(aContext) : opts;
@@ -106,7 +106,7 @@ public abstract class InterpreterBase extends ParserVisitor {
if (this.context instanceof JexlContext.NamespaceResolver) {
ns = ((JexlContext.NamespaceResolver) context);
} else {
- ns = Engine.EMPTY_NS;
+ ns = JexlEngine.EMPTY_NS;
}
AtomicBoolean acancel = null;
if (this.context instanceof JexlContext.CancellationHandle) {
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Operators.java b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
index 831b1ad6..7a66a22a 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Operators.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
@@ -439,10 +439,10 @@ public class Operators {
result = false;
// check if there is an isEmpty method on the object that returns a
// boolean and if so, just use it
- final JexlMethod vm = uberspect.getMethod(object, "isEmpty", Interpreter.EMPTY_PARAMS);
+ final JexlMethod vm = uberspect.getMethod(object, "isEmpty", InterpreterBase.EMPTY_PARAMS);
if (returnsBoolean(vm)) {
try {
- result = vm.invoke(object, Interpreter.EMPTY_PARAMS);
+ result = vm.invoke(object, InterpreterBase.EMPTY_PARAMS);
} catch (final Exception xany) {
interpreter.operatorError(node, JexlOperator.EMPTY, xany);
}
@@ -474,10 +474,10 @@ public class Operators {
final JexlUberspect uberspect = interpreter.uberspect;
// check if there is a size method on the object that returns an
// integer and if so, just use it
- final JexlMethod vm = uberspect.getMethod(object, "size", Interpreter.EMPTY_PARAMS);
+ final JexlMethod vm = uberspect.getMethod(object, "size", InterpreterBase.EMPTY_PARAMS);
if (returnsInteger(vm)) {
try {
- result = vm.invoke(object, Interpreter.EMPTY_PARAMS);
+ result = vm.invoke(object, InterpreterBase.EMPTY_PARAMS);
} catch (final Exception xany) {
interpreter.operatorError(node, JexlOperator.SIZE, xany);
}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
index 761d1af2..0c029968 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
@@ -106,7 +106,7 @@ public final class Introspector {
public Introspector(final Log log, final ClassLoader cloader, final JexlPermissions perms) {
this.logger = log;
this.loader = cloader;
- this.permissions = perms == null? Permissions.RESTRICTED : perms;
+ this.permissions = perms == null? JexlPermissions.RESTRICTED : perms;
}
/**
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
index 768a8bb3..44365262 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
@@ -92,7 +92,7 @@ public class Uberspect implements JexlUberspect {
public Uberspect(final Log runtimeLogger, final JexlUberspect.ResolverStrategy sty, final JexlPermissions perms) {
logger = runtimeLogger == null? LogFactory.getLog(JexlEngine.class) : runtimeLogger;
strategy = sty == null? JexlUberspect.JEXL_STRATEGY : sty;
- permissions = perms == null? Permissions.RESTRICTED : perms;
+ permissions = perms == null? JexlPermissions.RESTRICTED : perms;
ref = new SoftReference<>(null);
loader = new SoftReference<>(getClass().getClassLoader());
operatorMap = new ConcurrentHashMap<>();