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 d810ab87af8d0c5bb205bc440f4f3a3cbfcafa49
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 8 08:21:13 2023 -0400
Fix formatting
---
src/main/java/org/apache/commons/jexl3/JexlArithmetic.java | 6 +++---
src/main/java/org/apache/commons/jexl3/JexlBuilder.java | 2 +-
src/main/java/org/apache/commons/jexl3/JexlException.java | 2 +-
src/main/java/org/apache/commons/jexl3/JexlFeatures.java | 2 +-
src/main/java/org/apache/commons/jexl3/JexlInfo.java | 2 +-
src/main/java/org/apache/commons/jexl3/internal/Closure.java | 4 ++--
src/main/java/org/apache/commons/jexl3/internal/Engine.java | 12 ++++++------
.../java/org/apache/commons/jexl3/internal/Interpreter.java | 4 ++--
.../org/apache/commons/jexl3/internal/InterpreterBase.java | 8 ++++----
src/main/java/org/apache/commons/jexl3/internal/Scope.java | 2 +-
src/main/java/org/apache/commons/jexl3/internal/Script.java | 2 +-
.../org/apache/commons/jexl3/internal/TemplateDebugger.java | 2 +-
.../org/apache/commons/jexl3/internal/TemplateEngine.java | 6 +++---
.../org/apache/commons/jexl3/internal/TemplateScript.java | 2 +-
.../jexl3/internal/introspection/AbstractExecutor.java | 2 +-
.../commons/jexl3/internal/introspection/ClassMap.java | 2 +-
.../jexl3/internal/introspection/DuckGetExecutor.java | 2 +-
.../jexl3/internal/introspection/DuckSetExecutor.java | 2 +-
.../commons/jexl3/internal/introspection/Introspector.java | 4 ++--
.../jexl3/internal/introspection/ListSetExecutor.java | 2 +-
.../commons/jexl3/internal/introspection/MethodExecutor.java | 2 +-
.../commons/jexl3/internal/introspection/Permissions.java | 6 +++---
.../jexl3/internal/introspection/PropertyGetExecutor.java | 2 +-
.../jexl3/internal/introspection/PropertySetExecutor.java | 2 +-
.../commons/jexl3/internal/introspection/Uberspect.java | 10 +++++-----
.../org/apache/commons/jexl3/introspection/JexlSandbox.java | 10 +++++-----
.../org/apache/commons/jexl3/parser/ASTIdentifierAccess.java | 2 +-
.../java/org/apache/commons/jexl3/parser/ASTJexlScript.java | 12 ++++++------
.../org/apache/commons/jexl3/parser/JexlLexicalNode.java | 2 +-
src/main/java/org/apache/commons/jexl3/parser/JexlNode.java | 2 +-
.../java/org/apache/commons/jexl3/parser/JexlParser.java | 2 +-
.../org/apache/commons/jexl3/scripting/JexlScriptEngine.java | 4 ++--
src/test/java/org/apache/commons/jexl3/Issues100Test.java | 2 +-
src/test/java/org/apache/commons/jexl3/Issues300Test.java | 4 ++--
src/test/java/org/apache/commons/jexl3/JexlEvalContext.java | 6 +++---
.../java/org/apache/commons/jexl3/PropertyAccessTest.java | 2 +-
.../jexl3/internal/introspection/MiscIntrospectionTest.java | 4 ++--
.../commons/jexl3/jexl342/ReferenceMethodExecutor.java | 6 +++---
.../apache/commons/jexl3/jexl342/ReferenceSetExecutor.java | 2 +-
.../org/apache/commons/jexl3/jexl342/ReferenceUberspect.java | 4 ++--
40 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
b/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
index 8c808a02..e1653260 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
@@ -782,7 +782,7 @@ public class JexlArithmetic {
}
return dval.toString();
}
- return val == null? controlNullOperand(strict, "") : val.toString();
+ return val == null ? controlNullOperand(strict, "") : val.toString();
}
/**
@@ -1270,7 +1270,7 @@ public class JexlArithmetic {
// ignore and continue in sequence
}
}
- return (left == null? "" : toString(left)).concat(right == null ? "" :
toString(right));
+ return (left == null ? "" : toString(left)).concat(right == null ? ""
: toString(right));
}
/**
@@ -1771,7 +1771,7 @@ public class JexlArithmetic {
* @return the <i>size</i> of object, 0 if null, 1 if there is no
<i>better</i> solution
*/
public Integer size(final Object object) {
- return size(object, object == null? 0 : 1);
+ return size(object, object == null ? 0 : 1);
}
/**
diff --git a/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
b/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
index ef201c9d..b27a3e86 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
@@ -93,7 +93,7 @@ public class JexlBuilder {
* @param permissions the permissions
*/
public static void setDefaultPermissions(final JexlPermissions
permissions) {
- PERMISSIONS = permissions == null? JexlPermissions.RESTRICTED :
permissions;
+ PERMISSIONS = permissions == null ? JexlPermissions.RESTRICTED :
permissions;
}
/** The default maximum expression length to hit the expression cache. */
diff --git a/src/main/java/org/apache/commons/jexl3/JexlException.java
b/src/main/java/org/apache/commons/jexl3/JexlException.java
index 3e3862bb..d2f3e6ec 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlException.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlException.java
@@ -121,7 +121,7 @@ public class JexlException extends RuntimeException {
* @return a string builder
*/
static StringBuilder errorAt(final JexlNode node) {
- final JexlInfo info = node != null? detailedInfo(node,
node.jexlInfo()) : null;
+ final JexlInfo info = node != null ? detailedInfo(node,
node.jexlInfo()) : null;
final StringBuilder msg = new StringBuilder();
if (info != null) {
msg.append(info.toString());
diff --git a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
index d8895add..b8d798c4 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
@@ -230,7 +230,7 @@ public final class JexlFeatures {
* @return this features instance
*/
public JexlFeatures namespaceTest(final Predicate<String> names) {
- nameSpaces = names == null? TEST_STR_FALSE : names;
+ nameSpaces = names == null ? TEST_STR_FALSE : names;
return this;
}
diff --git a/src/main/java/org/apache/commons/jexl3/JexlInfo.java
b/src/main/java/org/apache/commons/jexl3/JexlInfo.java
index 6b87e3be..25066093 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlInfo.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlInfo.java
@@ -130,7 +130,7 @@ public class JexlInfo {
*/
@Override
public String toString() {
- final StringBuilder sb = new StringBuilder(name != null? name : "");
+ final StringBuilder sb = new StringBuilder(name != null ? name : "");
sb.append("@");
sb.append(line);
sb.append(":");
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Closure.java
b/src/main/java/org/apache/commons/jexl3/internal/Closure.java
index 72cdd8bc..aeaaac34 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Closure.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Closure.java
@@ -135,14 +135,14 @@ public class Closure extends Script {
@Override
public Object execute(final JexlContext context, final Object... args) {
- final Frame local = frame != null? frame.assign(args) : null;
+ final Frame local = frame != null ? frame.assign(args) : null;
final Interpreter interpreter = createInterpreter(context, local,
options);
return interpreter.runClosure(this);
}
@Override
public Callable callable(final JexlContext context, final Object... args) {
- final Frame local = frame != null? frame.assign(args) : null;
+ final Frame local = frame != null ? frame.assign(args) : null;
return new Callable(createInterpreter(context, local, options)) {
@Override
public Object interpret() {
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
index 1a3e11c7..12cfee5d 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -219,7 +219,7 @@ public class Engine extends JexlEngine {
this.functions = ns == null || ns.isEmpty()? Collections.emptyMap() :
ns; // should we make a copy?
this.classNameSolver = new FqcnResolver(uberspect, conf.imports());
// parsing & features:
- final JexlFeatures features = conf.features() == null?
DEFAULT_FEATURES : conf.features();
+ final JexlFeatures features = conf.features() == null ?
DEFAULT_FEATURES : conf.features();
Predicate<String> nsTest = features.namespaceTest();
final Set<String> nsNames = functions.keySet();
if (!nsNames.isEmpty()) {
@@ -351,7 +351,7 @@ public class Engine extends JexlEngine {
* @return conf or def
*/
private static <T> T option(final T conf, final T def) {
- return conf == null? def : conf;
+ return conf == null ? def : conf;
}
/**
@@ -613,7 +613,7 @@ public class Engine extends JexlEngine {
}
final String source = trimSource(scriptText);
final Scope scope = names == null || names.length == 0? null : new
Scope(null, names);
- final JexlFeatures ftrs = features == null? scriptFeatures : features;
+ final JexlFeatures ftrs = features == null ? scriptFeatures : features;
final ASTJexlScript tree = parse(info, ftrs, source, scope);
return new Script(this, source, tree);
}
@@ -645,7 +645,7 @@ public class Engine extends JexlEngine {
final ASTJexlScript script = parse(null, PROPERTY_FEATURES, src,
scope);
final JexlNode node = script.jjtGetChild(0);
final Frame frame = script.createFrame(bean);
- final Interpreter interpreter = createInterpreter(context == null?
EMPTY_CONTEXT : context, frame, options);
+ final Interpreter interpreter = createInterpreter(context == null
? EMPTY_CONTEXT : context, frame, options);
return interpreter.visitLexicalNode(node, null);
} catch (final JexlException xjexl) {
if (silent) {
@@ -673,7 +673,7 @@ public class Engine extends JexlEngine {
final ASTJexlScript script = parse(null, PROPERTY_FEATURES, src,
scope);
final JexlNode node = script.jjtGetChild(0);
final Frame frame = script.createFrame(bean, value);
- final Interpreter interpreter = createInterpreter(context != null?
context : EMPTY_CONTEXT, frame, options);
+ final Interpreter interpreter = createInterpreter(context != null
? context : EMPTY_CONTEXT, frame, options);
interpreter.visitLexicalNode(node, null);
} catch (final JexlException xjexl) {
if (silent) {
@@ -986,7 +986,7 @@ public class Engine extends JexlEngine {
*/
protected ASTJexlScript parse(final JexlInfo info, final JexlFeatures
parsingf, final String src, final Scope scope) {
final boolean cached = src.length() < cacheThreshold && cache != null;
- final JexlFeatures features = parsingf != null? parsingf :
DEFAULT_FEATURES;
+ final JexlFeatures features = parsingf != null ? parsingf :
DEFAULT_FEATURES;
// if (features.getNameSpaces().isEmpty() && !functions.isEmpty()) {
// features = new
JexlFeatures(features).nameSpaces(functions.keySet());
// }
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
index 6bc25b60..0ce648f7 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
@@ -75,7 +75,7 @@ public class Interpreter extends InterpreterBase {
protected Interpreter(final Interpreter ii, final JexlArithmetic jexla) {
super(ii, jexla);
frame = ii.frame;
- block = ii.block != null? new LexicalFrame(ii.block) : null;
+ block = ii.block != null ? new LexicalFrame(ii.block) : null;
}
/**
@@ -995,7 +995,7 @@ public class Interpreter extends InterpreterBase {
lhs = null;
}
// null elision as in "x ?? z"
- return lhs != null? lhs : node.jjtGetChild(1).jjtAccept(this, data);
+ return lhs != null ? lhs : node.jjtGetChild(1).jjtAccept(this, data);
}
@Override
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 42153ced..950bee0f 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
@@ -97,7 +97,7 @@ public abstract class InterpreterBase extends ParserVisitor {
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;
+ this.options = opts == null ? engine.evalOptions(aContext) : opts;
this.arithmetic = jexla.options(options);
if (arithmetic != jexla &&
!arithmetic.getClass().equals(jexla.getClass()) && logger.isWarnEnabled()) {
logger.warn("expected arithmetic to be " +
jexla.getClass().getSimpleName()
@@ -113,7 +113,7 @@ public abstract class InterpreterBase extends ParserVisitor
{
if (this.context instanceof JexlContext.CancellationHandle) {
acancel = ((JexlContext.CancellationHandle)
context).getCancellation();
}
- this.cancelled = acancel != null? acancel : new AtomicBoolean(false);
+ this.cancelled = acancel != null ? acancel : new AtomicBoolean(false);
this.functions = options.getNamespaces();
this.functors = null;
this.operators = new Operators(this);
@@ -315,7 +315,7 @@ public abstract class InterpreterBase extends ParserVisitor
{
protected boolean isVariableDefined(final Frame frame, final LexicalScope
block, final String name) {
if (frame != null && block != null) {
final Integer ref = frame.getScope().getSymbol(name);
- final int symbol = ref != null? ref : -1;
+ final int symbol = ref != null ? ref : -1;
if (symbol >= 0 && block.hasSymbol(symbol)) {
final Object value = frame.get(symbol);
return value != Scope.UNDEFINED && value != Scope.UNDECLARED;
@@ -593,7 +593,7 @@ public abstract class InterpreterBase extends ParserVisitor
{
* @return the (pretty) string value
*/
protected static String stringifyPropertyValue(final JexlNode node) {
- return node != null? new Debugger().depth(1).data(node) : "???";
+ return node != null ? new Debugger().depth(1).data(node) : "???";
}
/**
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Scope.java
b/src/main/java/org/apache/commons/jexl3/internal/Scope.java
index b49d0f37..3f71c888 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Scope.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Scope.java
@@ -261,7 +261,7 @@ public final class Scope {
* @return the source symbol index or -1 if the symbol is not captured
*/
public int getCaptureDeclaration(final int symbol) {
- Integer declared = capturedVariables != null?
capturedVariables.get(symbol) : null;
+ Integer declared = capturedVariables != null ?
capturedVariables.get(symbol) : null;
return declared != null ? declared.intValue() : -1;
}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Script.java
b/src/main/java/org/apache/commons/jexl3/internal/Script.java
index 2895c771..642a9f81 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Script.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Script.java
@@ -118,7 +118,7 @@ public class Script implements JexlScript, JexlExpression {
* @return the interpreter
*/
protected Interpreter createInterpreter(final JexlContext context, final
Frame frame, final JexlOptions options) {
- return jexl.createInterpreter(context, frame, options != null? options
: jexl.evalOptions(script, context));
+ return jexl.createInterpreter(context, frame, options != null ?
options : jexl.evalOptions(script, context));
}
/**
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java
b/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java
index 2f7fd2d0..ffcd1946 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java
@@ -80,7 +80,7 @@ public class TemplateDebugger extends Debugger {
}
final TemplateScript ts = (TemplateScript) jt;
// ensure expr is not null for templates
- this.exprs = ts.getExpressions() == null? new TemplateExpression[0] :
ts.getExpressions();
+ this.exprs = ts.getExpressions() == null ? new TemplateExpression[0] :
ts.getExpressions();
this.script = ts.getScript();
start = 0;
end = 0;
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
index 6dd7793a..5bd196f0 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
@@ -308,7 +308,7 @@ public final class TemplateEngine extends JxltEngine {
*/
protected final TemplateExpression prepare(final JexlContext context,
final Frame frame, final JexlOptions opts) {
try {
- final JexlOptions interOptions = opts != null? opts :
jexl.evalOptions(context);
+ final JexlOptions interOptions = opts != null ? opts :
jexl.evalOptions(context);
final Interpreter interpreter =
jexl.createInterpreter(context, frame, interOptions);
return prepare(interpreter);
} catch (final JexlException xjexl) {
@@ -359,7 +359,7 @@ public final class TemplateEngine extends JxltEngine {
final TemplateInterpreter.Arguments args = new
TemplateInterpreter
.Arguments(jexl)
.context(context)
- .options(options != null? options : options(context))
+ .options(options != null ? options : options(context))
.frame(frame);
final Interpreter interpreter =
jexl.createTemplateInterpreter(args);
return evaluate(interpreter);
@@ -691,7 +691,7 @@ public final class TemplateEngine extends JxltEngine {
@Override
public JxltEngine.Expression createExpression(final JexlInfo jexlInfo,
final String expression) {
- final JexlInfo info = jexlInfo == null? jexl.createInfo() : jexlInfo;
+ final JexlInfo info = jexlInfo == null ? jexl.createInfo() : jexlInfo;
Exception xuel = null;
TemplateExpression stmt = null;
try {
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/TemplateScript.java
b/src/main/java/org/apache/commons/jexl3/internal/TemplateScript.java
index 537dc555..8f0625e6 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateScript.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateScript.java
@@ -120,7 +120,7 @@ public final class TemplateScript implements
JxltEngine.Template {
}
}
// create the script
- final JexlInfo info = jexlInfo == null? jxlt.getEngine().createInfo()
: jexlInfo;
+ final JexlInfo info = jexlInfo == null ? jxlt.getEngine().createInfo()
: jexlInfo;
// allow lambda defining params
final Scope scope = parms == null ? null : new Scope(null, parms);
script = jxlt.getEngine().parse(info.at(1, 1), false, strb.toString(),
scope).script();
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/AbstractExecutor.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/AbstractExecutor.java
index 46bd725a..cc045312 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/AbstractExecutor.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/AbstractExecutor.java
@@ -80,7 +80,7 @@ abstract class AbstractExecutor {
* @return the class
*/
static Class<?> classOf(final Object instance) {
- return instance == null? Object.class : instance.getClass();
+ return instance == null ? Object.class : instance.getClass();
}
/** The class this executor applies to. */
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
index 3d91bc3f..57102a23 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
@@ -221,7 +221,7 @@ final class ClassMap {
if (methodList != null) {
cacheEntry = methodKey.getMostSpecificMethod(methodList);
}
- byKey.put(methodKey, cacheEntry == null? CACHE_MISS :
cacheEntry);
+ byKey.put(methodKey, cacheEntry == null ? CACHE_MISS :
cacheEntry);
} catch (final MethodKey.AmbiguousException ae) {
// that's a miss :-)
byKey.put(methodKey, CACHE_MISS);
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckGetExecutor.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckGetExecutor.java
index 409bb1b6..f86f6b00 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckGetExecutor.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckGetExecutor.java
@@ -43,7 +43,7 @@ public final class DuckGetExecutor extends
AbstractExecutor.Get {
*/
public static DuckGetExecutor discover(final Introspector is, final
Class<?> clazz, final Object identifier) {
final java.lang.reflect.Method method = is.getMethod(clazz, "get",
identifier);
- return method == null? null : new DuckGetExecutor(clazz, method,
identifier);
+ return method == null ? null : new DuckGetExecutor(clazz, method,
identifier);
}
/**
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckSetExecutor.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckSetExecutor.java
index d8e5d9d2..dd8de496 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckSetExecutor.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/DuckSetExecutor.java
@@ -56,7 +56,7 @@ public final class DuckSetExecutor extends
AbstractExecutor.Set {
if (method == null) {
method = is.getMethod(clazz, "put", makeArgs(key, value));
}
- return method == null? null : new DuckSetExecutor(clazz, method, key,
value);
+ return method == null ? null : new DuckSetExecutor(clazz, method, key,
value);
}
/**
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 1e2e417a..fd003d98 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? JexlPermissions.RESTRICTED : perms;
+ this.permissions = perms == null ? JexlPermissions.RESTRICTED : perms;
}
/**
@@ -333,7 +333,7 @@ public final class Introspector {
*/
public void setLoader(final ClassLoader classLoader) {
final ClassLoader previous = loader;
- final ClassLoader current = classLoader == null?
getClass().getClassLoader() : classLoader;
+ final ClassLoader current = classLoader == null ?
getClass().getClassLoader() : classLoader;
if (!current.equals(loader)) {
lock.writeLock().lock();
try {
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/ListSetExecutor.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/ListSetExecutor.java
index 105b467a..4938a447 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/ListSetExecutor.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/ListSetExecutor.java
@@ -52,7 +52,7 @@ public final class ListSetExecutor extends
AbstractExecutor.Set {
// we could verify if the call can be performed but it does
not change
// the fact we would fail...
// Class<?> formal = clazz.getComponentType();
- // Class<?> actual = value == null? Object.class :
value.getClass();
+ // Class<?> actual = value == null ? Object.class :
value.getClass();
// if
(IntrospectionUtils.isMethodInvocationConvertible(formal, actual, false)) {
return new ListSetExecutor(clazz, ARRAY_SET, index);
// }
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java
index 61b80775..be6f4ee5 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java
@@ -58,7 +58,7 @@ public final class MethodExecutor extends
AbstractExecutor.Method {
if (m == null && obj instanceof Class<?>) {
m = is.getMethod((Class<?>) obj, key);
}
- return m == null? null : new MethodExecutor(clazz, m, key);
+ return m == null ? null : new MethodExecutor(clazz, m, key);
}
/**
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
index 983f9699..5d64429d 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
@@ -243,14 +243,14 @@ public class Permissions implements JexlPermissions {
* @return the packages
*/
Map<String, NoJexlPackage> getPackages() {
- return packages == null? Collections.emptyMap() :
Collections.unmodifiableMap(packages);
+ return packages == null ? Collections.emptyMap() :
Collections.unmodifiableMap(packages);
}
/**
* @return the wilcards
*/
Set<String> getWildcards() {
- return allowed == null? Collections.emptySet() :
Collections.unmodifiableSet(allowed);
+ return allowed == null ? Collections.emptySet() :
Collections.unmodifiableSet(allowed);
}
/**
@@ -260,7 +260,7 @@ public class Permissions implements JexlPermissions {
*/
private NoJexlPackage getNoJexlPackage(final String packageName) {
final NoJexlPackage njp = packages.get(packageName);
- return njp != null? njp : JEXL_PACKAGE;
+ return njp != null ? njp : JEXL_PACKAGE;
}
/**
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertyGetExecutor.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertyGetExecutor.java
index 925f0b89..0a4daabc 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertyGetExecutor.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertyGetExecutor.java
@@ -40,7 +40,7 @@ public final class PropertyGetExecutor extends
AbstractExecutor.Get {
*/
public static PropertyGetExecutor discover(final Introspector is, final
Class<?> clazz, final String property) {
final java.lang.reflect.Method method = discoverGet(is, "get", clazz,
property);
- return method == null? null : new PropertyGetExecutor(clazz, method,
property);
+ return method == null ? null : new PropertyGetExecutor(clazz, method,
property);
}
/**
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java
index 0943d49e..addbf7c3 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java
@@ -50,7 +50,7 @@ public class PropertySetExecutor extends AbstractExecutor.Set
{
return null;
}
final java.lang.reflect.Method method = discoverSet(is, clazz,
property, value);
- return method != null? new PropertySetExecutor(clazz, method,
property, value) : null;
+ return method != null ? new PropertySetExecutor(clazz, method,
property, value) : null;
}
/**
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 cb077b04..c349a59d 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
@@ -90,9 +90,9 @@ public class Uberspect implements JexlUberspect {
* @param perms the introspector permissions
*/
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? JexlPermissions.RESTRICTED : perms;
+ logger = runtimeLogger == null ? LogFactory.getLog(JexlEngine.class) :
runtimeLogger;
+ strategy = sty == null ? JexlUberspect.JEXL_STRATEGY : sty;
+ permissions = perms == null ? JexlPermissions.RESTRICTED : perms;
ref = new SoftReference<>(null);
loader = new SoftReference<>(getClass().getClassLoader());
operatorMap = new ConcurrentHashMap<>();
@@ -255,7 +255,7 @@ public class Uberspect implements JexlUberspect {
final Class<?> claz = obj.getClass();
final String property = AbstractExecutor.castString(identifier);
final Introspector is = base();
- final List<PropertyResolver> r = resolvers == null?
strategy.apply(null, obj) : resolvers;
+ final List<PropertyResolver> r = resolvers == null ?
strategy.apply(null, obj) : resolvers;
JexlPropertyGet executor = null;
for (final PropertyResolver resolver : r) {
if (resolver instanceof JexlResolver) {
@@ -323,7 +323,7 @@ public class Uberspect implements JexlUberspect {
final Class<?> claz = obj.getClass();
final String property = AbstractExecutor.castString(identifier);
final Introspector is = base();
- final List<PropertyResolver> actual = resolvers == null?
strategy.apply(null, obj) : resolvers;
+ final List<PropertyResolver> actual = resolvers == null ?
strategy.apply(null, obj) : resolvers;
JexlPropertySet executor = null;
for (final PropertyResolver resolver : actual) {
if (resolver instanceof JexlResolver) {
diff --git
a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
index 7fb4b836..11150b34 100644
--- a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
+++ b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
@@ -144,7 +144,7 @@ public final class JexlSandbox {
protected JexlSandbox(final boolean ab, final boolean inh, final
Map<String, Permissions> map) {
allow = ab;
inherit = inh;
- sandbox = map != null? map : new HashMap<>();
+ sandbox = map != null ? map : new HashMap<>();
}
/**
@@ -227,7 +227,7 @@ public final class JexlSandbox {
*/
public String execute(final Class<?> clazz, final String name) {
final String m = get(clazz).execute().get(name);
- return "".equals(name) && m != null? clazz.getName() : m;
+ return "".equals(name) && m != null ? clazz.getName() : m;
}
/**
@@ -240,7 +240,7 @@ public final class JexlSandbox {
@Deprecated
public String execute(final String clazz, final String name) {
final String m = get(clazz).execute().get(name);
- return "".equals(name) && m != null? clazz : m;
+ return "".equals(name) && m != null ? clazz : m;
}
/**
@@ -317,7 +317,7 @@ public final class JexlSandbox {
@Override
public String get(final String name) {
- return name == null? NULL : null;
+ return name == null ? NULL : null;
}
};
@@ -390,7 +390,7 @@ public final class JexlSandbox {
@Override
public String get(final String name) {
// if name is null and contained in set, explicit null aka NULL
- return names != null && !names.contains(name) ? name : name !=
null? null : NULL;
+ return names != null && !names.contains(name) ? name : name !=
null ? null : NULL;
}
}
diff --git
a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
index ed12f035..c9a41e4a 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
@@ -96,7 +96,7 @@ public class ASTIdentifierAccess extends JexlNode {
}
public Object getIdentifier() {
- return identifier != null? identifier : name;
+ return identifier != null ? identifier : name;
}
public String getName() {
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
index d7d30469..d4a2da62 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
@@ -117,7 +117,7 @@ public class ASTJexlScript extends JexlLexicalNode {
* @return the arguments array
*/
public Frame createFrame(final Frame caller, final Object... values) {
- return scope != null? scope.createFrame(caller, values) : null;
+ return scope != null ? scope.createFrame(caller, values) : null;
}
/**
@@ -134,7 +134,7 @@ public class ASTJexlScript extends JexlLexicalNode {
* @return the number of parameters
*/
public int getArgCount() {
- return scope != null? scope.getArgCount() : 0;
+ return scope != null ? scope.getArgCount() : 0;
}
/**
@@ -142,7 +142,7 @@ public class ASTJexlScript extends JexlLexicalNode {
* @return the symbol names
*/
public String[] getSymbols() {
- return scope != null? scope.getSymbols() : null;
+ return scope != null ? scope.getSymbols() : null;
}
/**
@@ -150,7 +150,7 @@ public class ASTJexlScript extends JexlLexicalNode {
* @return the parameter names
*/
public String[] getParameters() {
- return scope != null? scope.getParameters() : null;
+ return scope != null ? scope.getParameters() : null;
}
/**
@@ -158,7 +158,7 @@ public class ASTJexlScript extends JexlLexicalNode {
* @return the local variable names
*/
public String[] getLocalVariables() {
- return scope != null? scope.getLocalVariables() : null;
+ return scope != null ? scope.getLocalVariables() : null;
}
/**
@@ -175,6 +175,6 @@ public class ASTJexlScript extends JexlLexicalNode {
* @return the captured variable names
*/
public String[] getCapturedVariables() {
- return scope != null? scope.getCapturedVariables() : null;
+ return scope != null ? scope.getCapturedVariables() : null;
}
}
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
b/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
index da82733e..037f0a0c 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
@@ -55,7 +55,7 @@ public abstract class JexlLexicalNode extends JexlNode
implements JexlParser.Lex
@Override
public int getSymbolCount() {
- return lexicalScope == null? 0 : lexicalScope.getSymbolCount();
+ return lexicalScope == null ? 0 : lexicalScope.getSymbolCount();
}
@Override
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
b/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
index fe0dbb0a..96be271b 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
@@ -88,7 +88,7 @@ public abstract class JexlNode extends SimpleNode {
final int c = lc & 0xfff;
final int l = lc >> 0xc;
// at least an info with line/column number
- return info != null? info.at(info.getLine() + l - 1, c) : new
JexlInfo(null, l, c);
+ return info != null ? info.at(info.getLine() + l - 1, c) : new
JexlInfo(null, l, c);
}
// weird though; no jjSetFirstToken(...) ever called?
return info;
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
index 6dd134f4..ba5f8504 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
@@ -754,7 +754,7 @@ public abstract class JexlParser extends StringParser {
* @throws JexlException.Feature in all cases
*/
protected void throwFeatureException(final int feature, final JexlInfo
info) {
- final String msg = info != null? readSourceLine(source,
info.getLine()) : null;
+ final String msg = info != null ? readSourceLine(source,
info.getLine()) : null;
throw new JexlException.Feature(info, feature, msg).clean();
}
diff --git
a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
index ab2fa8d6..c0dc06eb 100644
--- a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
@@ -114,10 +114,10 @@ public class JexlScriptEngine extends
AbstractScriptEngine implements Compilable
* @return the shared JexlEngine instance, create it if necessary
*/
private static JexlEngine getEngine() {
- JexlEngine engine = ENGINE != null? ENGINE.get() : null;
+ JexlEngine engine = ENGINE != null ? ENGINE.get() : null;
if (engine == null) {
synchronized (JexlScriptEngineFactory.class) {
- engine = ENGINE != null? ENGINE.get() : null;
+ engine = ENGINE != null ? ENGINE.get() : null;
if (engine == null) {
final JexlBuilder builder = new JexlBuilder()
.strict(true)
diff --git a/src/test/java/org/apache/commons/jexl3/Issues100Test.java
b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
index eaceaca6..9fbff9f1 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues100Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
@@ -579,7 +579,7 @@ public class Issues100Test extends JexlTestCase {
final String[] scripts = {"var x = new ('java.util.HashMap'); x.one =
1; x.two = 2; x.one", // results to 1
"x = new ('java.util.HashMap'); x.one = 1; x.two = 2; x.one",//
results to 1
"x = new ('java.util.HashMap'); x.one = 1; x.two = 2;
x['one']",//results to 1
- "var x = new ('java.util.HashMap'); x.one = 1; x.two = 2;
x['one']"// result to null?
+ "var x = new ('java.util.HashMap'); x.one = 1; x.two = 2;
x['one']"// result to null ?
};
final JexlEngine jexl = new Engine();
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index b1aa8277..2d1aea3c 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -312,12 +312,12 @@ public class Issues300Test {
Assert.assertEquals(44, result);
vars.put("TVALOGAR", null);
- String jexlExp = "TVALOGAR==null?'SIMON':'SIMONAZO'";
+ String jexlExp = "TVALOGAR==null ?'SIMON':'SIMONAZO'";
script = jexl.createScript(jexlExp);
result = script.execute(ctxt);
Assert.assertEquals("SIMON", result);
- jexlExp = "TVALOGAR.PEPITO==null?'SIMON':'SIMONAZO'";
+ jexlExp = "TVALOGAR.PEPITO==null ?'SIMON':'SIMONAZO'";
script = jexl.createScript(jexlExp);
final Map<String, Object> tva = new LinkedHashMap<>();
diff --git a/src/test/java/org/apache/commons/jexl3/JexlEvalContext.java
b/src/test/java/org/apache/commons/jexl3/JexlEvalContext.java
index 0a39dc74..5055e1e3 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlEvalContext.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlEvalContext.java
@@ -72,8 +72,8 @@ public class JexlEvalContext implements
*/
@NoJexl
public JexlEvalContext(final JexlContext context, final
JexlContext.NamespaceResolver namespace) {
- this.vars = context != null? context : JexlEngine.EMPTY_CONTEXT;
- this.ns = namespace != null? namespace : JexlEngine.EMPTY_NS;
+ this.vars = context != null ? context : JexlEngine.EMPTY_CONTEXT;
+ this.ns = namespace != null ? namespace : JexlEngine.EMPTY_NS;
}
@Override
@@ -97,7 +97,7 @@ public class JexlEvalContext implements
@Override
@NoJexl
public Object resolveNamespace(final String name) {
- return ns != null? ns.resolveNamespace(name) : null;
+ return ns != null ? ns.resolveNamespace(name) : null;
}
@Override
diff --git a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
index 4b2a638c..77c9e2c0 100644
--- a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
@@ -445,7 +445,7 @@ public class PropertyAccessTest extends JexlTestCase {
public Object get(final String name) {
final PromptValue v = values.get(name);
- return v != null? v.getValue() : null;
+ return v != null ? v.getValue() : null;
}
public void set(final String name, final Object value) {
diff --git
a/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
b/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
index e7485ae4..cf808e8c 100644
---
a/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
+++
b/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
@@ -45,7 +45,7 @@ public class MiscIntrospectionTest {
} catch (IllegalArgumentException xill) {
Assert.assertNotNull(xill);
}
- // wih null?
+ // wih null ?
ArrayIterator ai0 = new ArrayIterator(null);
Assert.assertFalse(ai0.hasNext());
try {
@@ -61,7 +61,7 @@ public class MiscIntrospectionTest {
Assert.assertFalse(ai0.hasNext());
try {
ai0.next();
- Assert.fail("iterator on null?");
+ Assert.fail("iterator on null ?");
} catch (NoSuchElementException no) {
Assert.assertNotNull(no);
}
diff --git
a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java
b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java
index bc5bfb5f..31e80adc 100644
---
a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java
+++
b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java
@@ -55,14 +55,14 @@ public class ReferenceMethodExecutor implements JexlMethod {
@Override
public Object invoke(Object ref, Object... args) throws Exception {
Object obj = getReference(ref);
- return obj == null? null : method.invoke(obj, args);
+ return obj == null ? null : method.invoke(obj, args);
}
@Override
public Object tryInvoke(String name, Object ref, Object... args) throws
JexlException.TryFailed {
Object obj = getReference(ref);
if (method == null) {
- return obj == null? null : JexlEngine.TRY_FAILED;
+ return obj == null ? null : JexlEngine.TRY_FAILED;
}
if (obj == ref) {
return JexlEngine.TRY_FAILED;
@@ -82,6 +82,6 @@ public class ReferenceMethodExecutor implements JexlMethod {
@Override
public Class<?> getReturnType() {
- return method != null? method.getReturnType() : null;
+ return method != null ? method.getReturnType() : null;
}
}
diff --git
a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java
b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java
index e1eb0c32..642f0d6e 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java
@@ -61,7 +61,7 @@ public class ReferenceSetExecutor implements JexlPropertySet {
@Override
public Object tryInvoke(final Object opt, final Object key, final Object
arg) throws JexlException.TryFailed {
Object obj = getReference(opt);
- return obj == opt? JexlEngine.TRY_FAILED : obj == null? null :
setter.tryInvoke(key, obj, arg);
+ return obj == opt? JexlEngine.TRY_FAILED : obj == null ? null :
setter.tryInvoke(key, obj, arg);
}
@Override
diff --git
a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java
b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java
index 944b783b..40b33b6f 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java
@@ -161,7 +161,7 @@ public class ReferenceUberspect implements JexlUberspect {
*/
static Object handleAtomic(Object ref) {
Object obj = ((AtomicReference<?>) ref).get();
- return obj == null? ref : obj;
+ return obj == null ? ref : obj;
}
/**
@@ -171,7 +171,7 @@ public class ReferenceUberspect implements JexlUberspect {
*/
static Object handleReference(Object ref) {
Object obj = ((Reference<?>) ref).get();
- return obj == null? ref : obj;
+ return obj == null ? ref : obj;
}
@Override
