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 dd333ac077e489fe12fe422cb314e82600ed42fc
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Dec 26 14:20:56 2024 -0500
Use Objects.requireNonNull()
---
.../java/org/apache/commons/jexl3/JexlEngine.java | 9 +++----
.../org/apache/commons/jexl3/internal/Engine.java | 5 ++--
.../commons/jexl3/internal/FqcnResolver.java | 5 ++--
.../commons/jexl3/internal/TemplateEngine.java | 5 ++--
.../commons/jexl3/internal/TemplateScript.java | 9 +++----
.../internal/introspection/SandboxUberspect.java | 9 +++----
.../commons/jexl3/scripting/JexlScriptEngine.java | 29 ++++++++--------------
7 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlEngine.java
b/src/main/java/org/apache/commons/jexl3/JexlEngine.java
index 9bad1707..cfb669f3 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlEngine.java
@@ -25,6 +25,7 @@ import java.io.InputStreamReader;
import java.math.MathContext;
import java.net.URL;
import java.nio.charset.Charset;
+import java.util.Objects;
import org.apache.commons.jexl3.introspection.JexlUberspect;
@@ -569,9 +570,7 @@ public abstract class JexlEngine {
* @return the source
*/
protected String readSource(final File file) {
- if (file == null) {
- throw new NullPointerException("source file is null");
- }
+ Objects.requireNonNull(file, "file");
try (BufferedReader reader = new BufferedReader(new
InputStreamReader(new FileInputStream(file),
getCharset()))) {
return toString(reader);
@@ -587,9 +586,7 @@ public abstract class JexlEngine {
* @return the source
*/
protected String readSource(final URL url) {
- if (url == null) {
- throw new NullPointerException("source URL is null");
- }
+ Objects.requireNonNull(url, "url");
try (BufferedReader reader = new BufferedReader(new
InputStreamReader(url.openStream(), getCharset()))) {
return toString(reader);
} catch (final IOException xio) {
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 a9671363..2f16eae6 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -28,6 +28,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
@@ -399,9 +400,7 @@ public class Engine extends JexlEngine {
@Override
public Script createScript(final JexlFeatures features, final JexlInfo
info, final String scriptText, final String... names) {
- if (scriptText == null) {
- throw new NullPointerException("source is null");
- }
+ Objects.requireNonNull(scriptText, "scriptText");
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;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/FqcnResolver.java
b/src/main/java/org/apache/commons/jexl3/internal/FqcnResolver.java
index 64e4dde4..d7b707d2 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/FqcnResolver.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/FqcnResolver.java
@@ -19,6 +19,7 @@ package org.apache.commons.jexl3.internal;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -61,9 +62,7 @@ import org.apache.commons.jexl3.introspection.JexlUberspect;
* @throws NullPointerException if parent solver is null
*/
FqcnResolver(final FqcnResolver solver) {
- if (solver == null) {
- throw new NullPointerException("parent solver cannot be null");
- }
+ Objects.requireNonNull(solver, "solver");
this.parent = solver;
this.uberspect = solver.uberspect;
}
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 abc3861e..6c90bf7a 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import org.apache.commons.jexl3.JexlCache;
@@ -223,9 +224,7 @@ public final class TemplateEngine extends JxltEngine {
*/
ConstantExpression(final Object val, final TemplateExpression source) {
super(source);
- if (val == null) {
- throw new NullPointerException("constant cannot be null");
- }
+ Objects.requireNonNull(val, "val");
this.value = val instanceof String
? StringParser.buildTemplate((String) val, false)
: val;
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 4a6d06dc..1763a4d4 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateScript.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateScript.java
@@ -21,6 +21,7 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
@@ -116,9 +117,7 @@ public final class TemplateScript implements
JxltEngine.Template {
final String directive,
final Reader reader,
final String... parms) {
- if (directive == null) {
- throw new NullPointerException("null prefix");
- }
+ Objects.requireNonNull(directive, "directive");
final String engineImmediateCharString =
Character.toString(engine.getImmediateChar());
final String engineDeferredCharString =
Character.toString(engine.getDeferredChar());
@@ -128,9 +127,7 @@ public final class TemplateScript implements
JxltEngine.Template {
|| (engineDeferredCharString + "{").equals(directive)) {
throw new IllegalArgumentException(directive + ": is not a valid
directive pattern");
}
- if (reader == null) {
- throw new NullPointerException("null input");
- }
+ Objects.requireNonNull(reader, "reader");
this.jxlt = engine;
this.prefix = directive;
final List<Block> blocks = jxlt.readTemplate(prefix, reader);
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java
index 86712463..3bab801a 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/SandboxUberspect.java
@@ -18,6 +18,7 @@ package org.apache.commons.jexl3.internal.introspection;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import org.apache.commons.jexl3.JexlArithmetic;
import org.apache.commons.jexl3.JexlOperator;
@@ -54,12 +55,8 @@ public final class SandboxUberspect implements JexlUberspect
{
* @param theSandbox the sandbox which is copied to avoid changes at
runtime
*/
public SandboxUberspect(final JexlUberspect theUberspect, final
JexlSandbox theSandbox) {
- if (theSandbox == null) {
- throw new NullPointerException("sandbox cannot be null");
- }
- if (theUberspect == null) {
- throw new NullPointerException("uberspect cannot be null");
- }
+ Objects.requireNonNull(theSandbox, "theSandbox");
+ Objects.requireNonNull(theUberspect, "theUberspect");
this.uberspect = theUberspect;
this.sandbox = theSandbox.copy();
}
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 86001208..0f7d9d9c 100644
--- a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
@@ -24,6 +24,7 @@ import java.io.Reader;
import java.io.Writer;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
+import java.util.Objects;
import javax.script.AbstractScriptEngine;
import javax.script.Bindings;
@@ -394,14 +395,12 @@ public class JexlScriptEngine extends
AbstractScriptEngine implements Compilable
/**
* Create a scripting engine using the supplied factory.
*
- * @param factory the factory which created this instance.
+ * @param scriptEngineFactory the factory which created this instance.
* @throws NullPointerException if factory is null
*/
- public JexlScriptEngine(final ScriptEngineFactory factory) {
- if (factory == null) {
- throw new NullPointerException("ScriptEngineFactory must not be
null");
- }
- parentFactory = factory;
+ public JexlScriptEngine(final ScriptEngineFactory scriptEngineFactory) {
+ Objects.requireNonNull(scriptEngineFactory, "scriptEngineFactory");
+ parentFactory = scriptEngineFactory;
jexlEngine = getEngine();
jexlObject = new JexlScriptObject();
}
@@ -409,18 +408,14 @@ public class JexlScriptEngine extends
AbstractScriptEngine implements Compilable
@Override
public CompiledScript compile(final Reader script) throws ScriptException {
// This is mandated by JSR-223
- if (script == null) {
- throw new NullPointerException("script must be non-null");
- }
+ Objects.requireNonNull(script, "script");
return compile(readerToString(script));
}
@Override
public CompiledScript compile(final String script) throws ScriptException {
// This is mandated by JSR-223
- if (script == null) {
- throw new NullPointerException("script must be non-null");
- }
+ Objects.requireNonNull(script, "script");
try {
final JexlScript jexlScript = jexlEngine.createScript(script);
return new JexlCompiledScript(jexlScript);
@@ -437,18 +432,16 @@ public class JexlScriptEngine extends
AbstractScriptEngine implements Compilable
@Override
public Object eval(final Reader reader, final ScriptContext context)
throws ScriptException {
// This is mandated by JSR-223 (see SCR.5.5.2 Methods)
- if (reader == null || context == null) {
- throw new NullPointerException("script and context must be
non-null");
- }
+ Objects.requireNonNull(reader, "reader");
+ Objects.requireNonNull(context, "context");
return eval(readerToString(reader), context);
}
@Override
public Object eval(final String script, final ScriptContext context)
throws ScriptException {
// This is mandated by JSR-223 (see SCR.5.5.2 Methods)
- if (script == null || context == null) {
- throw new NullPointerException("script and context must be
non-null");
- }
+ Objects.requireNonNull(script, "context");
+ Objects.requireNonNull(context, "context");
// This is mandated by JSR-223 (end of section SCR.4.3.4.1.2 -
JexlScript Execution)
context.setAttribute(CONTEXT_KEY, context, ScriptContext.ENGINE_SCOPE);
try {
