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 2023/04/18 14:48:36 UTC
[commons-jexl] branch master updated: Format: "catch(" -> "catch ("
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
The following commit(s) were added to refs/heads/master by this push:
new 95b5b6a6 Format: "catch(" -> "catch ("
95b5b6a6 is described below
commit 95b5b6a61c10a6f8be5b83d1fc94a50cd1d5e4f9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Apr 18 10:48:30 2023 -0400
Format: "catch(" -> "catch ("
---
.../apache/commons/jexl3/internal/Interpreter.java | 10 +++++-----
.../commons/jexl3/introspection/JexlSandbox.java | 2 +-
.../org/apache/commons/jexl3/AnnotationTest.java | 2 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 18 +++++++++---------
.../apache/commons/jexl3/ArithmeticOperatorTest.java | 2 +-
.../org/apache/commons/jexl3/ArithmeticTest.java | 6 +++---
.../java/org/apache/commons/jexl3/AssignTest.java | 2 +-
.../apache/commons/jexl3/ContextNamespaceTest.java | 6 +++---
.../java/org/apache/commons/jexl3/ExceptionTest.java | 2 +-
.../java/org/apache/commons/jexl3/Issues200Test.java | 18 +++++++++---------
.../java/org/apache/commons/jexl3/Issues300Test.java | 20 ++++++++++----------
.../java/org/apache/commons/jexl3/JexlTestCase.java | 10 +++++-----
.../java/org/apache/commons/jexl3/LambdaTest.java | 8 ++++----
.../java/org/apache/commons/jexl3/LexicalTest.java | 8 ++++----
.../java/org/apache/commons/jexl3/PragmaTest.java | 6 +++---
.../org/apache/commons/jexl3/PublicFieldsTest.java | 4 ++--
.../org/apache/commons/jexl3/ScriptCallableTest.java | 2 +-
.../java/org/apache/commons/jexl3/ScriptTest.java | 6 +++---
.../org/apache/commons/jexl3/SideEffectTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/VarTest.java | 6 +++---
.../org/apache/commons/jexl3/internal/RangeTest.java | 8 ++++----
.../introspection/MiscIntrospectionTest.java | 12 ++++++------
.../internal/introspection/PermissionsTest.java | 8 ++++----
.../apache/commons/jexl3/jexl342/OptionalTest.java | 4 ++--
.../org/apache/commons/jexl3/parser/ParserTest.java | 2 +-
.../jexl3/scripting/JexlScriptEngineTest.java | 18 +++++++++---------
26 files changed, 96 insertions(+), 96 deletions(-)
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 d243a816..817d1f1e 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
@@ -116,7 +116,7 @@ public class Interpreter extends InterpreterBase {
}
cancelCheck(node);
return arithmetic.controlReturn(node.jjtAccept(this, null));
- } catch(final StackOverflowError xstack) {
+ } catch (final StackOverflowError xstack) {
final JexlException xjexl = new JexlException.StackOverflow(node.jexlInfo(), "jvm", xstack);
if (!isSilent()) {
throw xjexl.clean();
@@ -979,7 +979,7 @@ public class Interpreter extends InterpreterBase {
Object condition;
try {
condition = node.jjtGetChild(0).jjtAccept(this, data);
- } catch(final JexlException xany) {
+ } catch (final JexlException xany) {
if (!(xany.getCause() instanceof JexlArithmetic.NullOperand)) {
throw xany;
}
@@ -1004,7 +1004,7 @@ public class Interpreter extends InterpreterBase {
Object lhs;
try {
lhs = node.jjtGetChild(0).jjtAccept(this, data);
- } catch(final JexlException xany) {
+ } catch (final JexlException xany) {
if (!(xany.getCause() instanceof JexlArithmetic.NullOperand)) {
throw xany;
}
@@ -1019,7 +1019,7 @@ public class Interpreter extends InterpreterBase {
try {
final Object val = node.jjtGetChild(0).jjtAccept(this, data);
return operators.size(node, val);
- } catch(final JexlException xany) {
+ } catch (final JexlException xany) {
return 0;
}
}
@@ -1029,7 +1029,7 @@ public class Interpreter extends InterpreterBase {
try {
final Object value = node.jjtGetChild(0).jjtAccept(this, data);
return operators.empty(node, value);
- } catch(final JexlException xany) {
+ } catch (final JexlException xany) {
return true;
}
}
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 b2ef75f6..7fb4b836 100644
--- a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
+++ b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
@@ -167,7 +167,7 @@ public final class JexlSandbox {
static Class<?> forName(final String cname) {
try {
return Class.forName(cname);
- } catch(final Exception xany) {
+ } catch (final Exception xany) {
return null;
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
index 4ff9ef24..9bde8c47 100644
--- a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
@@ -122,7 +122,7 @@ public class AnnotationTest extends JexlTestCase {
final boolean b = options.isSilent();
try {
return statement.call();
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
return null;
} finally {
options.setSilent(b);
diff --git a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
index e2ced601..73af9226 100644
--- a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
@@ -98,7 +98,7 @@ public class AntishCallTest extends JexlTestCase {
if (!super.has(str)) {
try {
return CallSupportContext.class.getClassLoader().loadClass(str);
- } catch(final Exception xany) {
+ } catch (final Exception xany) {
return null;
}
}
@@ -109,7 +109,7 @@ public class AntishCallTest extends JexlTestCase {
if (!super.has(str)){
try {
return CallSupportContext.class.getClassLoader().loadClass(str) != null;
- } catch(final Exception xany) {
+ } catch (final Exception xany) {
return false;
}
}
@@ -155,7 +155,7 @@ public class AntishCallTest extends JexlTestCase {
try {
runTestCall(jexl, jc);
Assert.fail("should have failed");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
//
}
}
@@ -189,9 +189,9 @@ public class AntishCallTest extends JexlTestCase {
try {
result = script.execute(ctxt);
Assert.fail("antish var shall not be resolved");
- } catch(final JexlException.Variable xvar) {
+ } catch (final JexlException.Variable xvar) {
Assert.assertEquals("x", xvar.getVariable());
- } catch(final JexlException xother) {
+ } catch (final JexlException xother) {
Assert.assertNotNull(xother);
} finally {
options.setAntish(true);
@@ -207,7 +207,7 @@ public class AntishCallTest extends JexlTestCase {
try {
result = script.execute(ctxt);
Assert.fail("not antish assign");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
Assert.assertNull(result);
}
@@ -216,7 +216,7 @@ public class AntishCallTest extends JexlTestCase {
try {
result = script.execute(ctxt);
Assert.fail("x not defined");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
Assert.assertNull(result);
}
@@ -225,7 +225,7 @@ public class AntishCallTest extends JexlTestCase {
try {
result = script.execute(ctxt);
Assert.fail("not antish assign");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
Assert.assertNull(result);
}
@@ -234,7 +234,7 @@ public class AntishCallTest extends JexlTestCase {
try {
result = script.execute(ctxt);
Assert.fail("not antish assign");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
Assert.assertNull(result);
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
index c4e48c70..6d1d65e9 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
@@ -484,7 +484,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
} else {
Assert.assertEquals(1, log.count("warn"));
}
- } catch(final JexlException.Operator xop) {
+ } catch (final JexlException.Operator xop) {
Assert.assertEquals("*", xop.getSymbol());
}
if (!silent) {
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
index 7f24ee0c..9aece300 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
@@ -66,7 +66,7 @@ public class ArithmeticTest extends JexlTestCase {
static private void assertNullOperand(java.util.function.Supplier<Object> fun) {
try {
Assert.assertNull(fun.get());
- } catch(JexlArithmetic.NullOperand xany) {
+ } catch (JexlArithmetic.NullOperand xany) {
Assert.assertNotNull(xany);
}
}
@@ -74,7 +74,7 @@ public class ArithmeticTest extends JexlTestCase {
static private void assertArithmeticException(java.util.function.Supplier<Object> fun) {
try {
Assert.assertNull(fun.get());
- } catch(ArithmeticException xany) {
+ } catch (ArithmeticException xany) {
Assert.assertNotNull(xany);
}
}
@@ -1653,7 +1653,7 @@ public class ArithmeticTest extends JexlTestCase {
info = (Attr) nnm.getNamedItem("info");
Assert.assertEquals(y, r);
Assert.assertEquals(y, info.getValue());
- } catch(JexlException.Property xprop) {
+ } catch (JexlException.Property xprop) {
// test fails in java > 11 because modules, etc; need investigation
Assert.assertTrue(xprop.getMessage().contains("info"));
Assert.assertTrue(getJavaVersion() > 11);
diff --git a/src/test/java/org/apache/commons/jexl3/AssignTest.java b/src/test/java/org/apache/commons/jexl3/AssignTest.java
index 82c40ba1..ed510174 100644
--- a/src/test/java/org/apache/commons/jexl3/AssignTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AssignTest.java
@@ -120,7 +120,7 @@ public class AssignTest extends JexlTestCase {
try {
o = assign.evaluate(jc);
}
- catch(final RuntimeException xrt) {
+ catch (final RuntimeException xrt) {
final String str = xrt.toString();
Assert.assertTrue(str.contains("nosuchbean"));
}
diff --git a/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java b/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
index 5b73cf77..a6c86866 100644
--- a/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
@@ -251,7 +251,7 @@ public class ContextNamespaceTest extends JexlTestCase {
JexlScript script = null;
try {
script = jexl.createScript(src);
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.fail(src);
}
ctxt.set("x", null);
@@ -313,14 +313,14 @@ public class ContextNamespaceTest extends JexlTestCase {
try {
ctxt.get("vat");
Assert.fail("should have failed");
- } catch(final JexlException.Property xprop) {
+ } catch (final JexlException.Property xprop) {
//
}
try {
ctxt.set("vat", 33.0d);
Assert.fail("should have failed");
- } catch(final JexlException.Property xprop) {
+ } catch (final JexlException.Property xprop) {
//
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
index d913070f..badbc8c7 100644
--- a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
@@ -263,7 +263,7 @@ public class ExceptionTest extends JexlTestCase {
if (strict && !silent) {
Assert.fail("should have thrown an exception");
}
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
if (!strict || silent) {
Assert.fail(src + ": should not have thrown an exception");
}
diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index 268255df..fe537909 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -124,7 +124,7 @@ public class Issues200Test extends JexlTestCase {
try {
e.execute(jc);
Assert.fail("should have thrown an exception");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
final Throwable th = xjexl.getCause();
Assert.assertEquals("NPE210", th.getMessage());
}
@@ -150,7 +150,7 @@ public class Issues200Test extends JexlTestCase {
try {
r = e.execute(jc);
Assert.fail("should have thrown an exception");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
final Throwable th = xjexl.getCause();
Assert.assertEquals(ArrayIndexOutOfBoundsException.class, th.getClass());
}
@@ -336,14 +336,14 @@ public class Issues200Test extends JexlTestCase {
try {
foobaz.evaluate(ctx);
Assert.fail("foo.baz is not solvable, exception expected");
- } catch(final JexlException xp) {
+ } catch (final JexlException xp) {
Assert.assertTrue(xp instanceof JexlException.Property);
}
// fail level 2
try {
foobarbaz.evaluate(ctx);
Assert.fail("foo.bar.baz is not solvable, exception expected");
- } catch(final JexlException xp) {
+ } catch (final JexlException xp) {
Assert.assertTrue(xp instanceof JexlException.Property);
}
}
@@ -378,7 +378,7 @@ public class Issues200Test extends JexlTestCase {
try {
script.execute(ctx);
Assert.fail("should have failed!");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
// expected
}
script = engine.createScript("java.version");
@@ -578,7 +578,7 @@ public class Issues200Test extends JexlTestCase {
try {
result = script.execute(ctxt, 32);
Assert.fail("should have overflown");
- } catch(final JexlException.StackOverflow xstack) {
+ } catch (final JexlException.StackOverflow xstack) {
// expected
final String sxs = xstack.toString();
Assert.assertTrue(sxs.contains("jexl"));
@@ -588,7 +588,7 @@ public class Issues200Test extends JexlTestCase {
try {
result = script.execute(ctxt, 32);
Assert.fail("should have overflown");
- } catch(final JexlException.StackOverflow xstack) {
+ } catch (final JexlException.StackOverflow xstack) {
// expected
final String sxs = xstack.toString();
Assert.assertTrue(sxs.contains("jvm"));
@@ -680,7 +680,7 @@ public class Issues200Test extends JexlTestCase {
try {
jc = jexl.createScript(src);
Assert.fail("should have failed, " + (jc != null));
- } catch(final JexlException.Ambiguous xa) {
+ } catch (final JexlException.Ambiguous xa) {
final String str = xa.toString();
Assert.assertTrue(str.contains("143"));
src = xa.tryCleanSource(src);
@@ -791,7 +791,7 @@ public class Issues200Test extends JexlTestCase {
result = null;
try {
result = script.execute(ctxt, (Object) null);
- } catch(final JexlException xany) {
+ } catch (final JexlException xany) {
Assert.assertNotNull(xany.getMessage());
}
Assert.assertNull(result);
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index a63239d4..34b4d008 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -694,7 +694,7 @@ public class Issues300Test {
try {
Object result = run361a(jexl);
Assert.fail("null arg should fail");
- } catch(JexlException xany) {
+ } catch (JexlException xany) {
Assert.assertNotNull(xany);
}
}
@@ -713,7 +713,7 @@ public class Issues300Test {
try {
Object result = run361b(jexl);
Assert.fail("null arg should fail");
- } catch(JexlException xany) {
+ } catch (JexlException xany) {
Assert.assertNotNull(xany);
}
}
@@ -746,7 +746,7 @@ public class Issues300Test {
try {
run361c(jexl);
Assert.fail("null arg should fail");
- } catch(JexlException xany) {
+ } catch (JexlException xany) {
Assert.assertNotNull(xany);
}
}
@@ -788,7 +788,7 @@ public class Issues300Test {
try {
Object result = run361d(jexl);
Assert.fail("null arg should fail");
- } catch(JexlException xany) {
+ } catch (JexlException xany) {
Assert.assertNotNull(xany);
}
}
@@ -841,7 +841,7 @@ public class Issues300Test {
try {
get.evaluate(ctxt);
Assert.fail("phone should be undefined!");
- } catch(JexlException.Variable xvar) {
+ } catch (JexlException.Variable xvar) {
Assert.assertEquals("phone", xvar.getVariable());
}
}
@@ -935,7 +935,7 @@ public class Issues300Test {
try {
JexlScript script = jexl.createScript(info, src);
Assert.fail("should not parse");
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
String msg = xparse.getMessage();
Assert.assertTrue(msg.contains("badscript"));
}
@@ -1045,12 +1045,12 @@ public class Issues300Test {
s1 = jexl.createScript(src1);
try {
Assert.assertEquals(2, s0.execute(null, (Object) null));
- } catch(JexlException.Variable xvar) {
+ } catch (JexlException.Variable xvar) {
Assert.assertEquals("a", xvar.getVariable());
}
try {
Assert.assertEquals(1, s1.execute(null, (Object) null));
- } catch(JexlException.Variable xvar) {
+ } catch (JexlException.Variable xvar) {
Assert.assertEquals("a", xvar.getVariable());
}
// global var null
@@ -1166,7 +1166,7 @@ public class Issues300Test {
try {
script = jexl.createScript(src);
Assert.fail("should have failed parsing");
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getDetail().contains("pragma"));
}
src = "if (true) { #pragma one 42 }";
@@ -1250,7 +1250,7 @@ public class Issues300Test {
try {
JexlScript script = jexl.createScript(src);
Assert.fail("should fail on const total assignment");
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getMessage().contains("total"));
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
index 4ab80535..4b59af4e 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
@@ -171,7 +171,7 @@ public class JexlTestCase {
try {
method = this.getClass().getDeclaredMethod(name, NO_PARMS);
}
- catch(final Exception xany) {
+ catch (final Exception xany) {
Assert.fail("no such test: " + name);
return;
}
@@ -203,7 +203,7 @@ public class JexlTestCase {
try {
clazz = (Class<JexlTestCase>) Class.forName(testClassName);
}
- catch(final ClassNotFoundException xclass) {
+ catch (final ClassNotFoundException xclass) {
Assert.fail("no such class: " + testClassName);
return;
}
@@ -213,17 +213,17 @@ public class JexlTestCase {
ctor = clazz.getConstructor(STRING_PARM);
test = ctor.newInstance("debug");
}
- catch(final NoSuchMethodException xctor) {
+ catch (final NoSuchMethodException xctor) {
// instantiate default class ctor
try {
test = clazz.newInstance();
}
- catch(final Exception xany) {
+ catch (final Exception xany) {
Assert.fail("cant instantiate test: " + xany);
return;
}
}
- catch(final Exception xany) {
+ catch (final Exception xany) {
Assert.fail("cant instantiate test: " + xany);
return;
}
diff --git a/src/test/java/org/apache/commons/jexl3/LambdaTest.java b/src/test/java/org/apache/commons/jexl3/LambdaTest.java
index 9f07b980..756dfb91 100644
--- a/src/test/java/org/apache/commons/jexl3/LambdaTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LambdaTest.java
@@ -441,7 +441,7 @@ public class LambdaTest extends JexlTestCase {
jexl = createEngine(features);
try {
script = jexl.createScript(src);
- } catch(JexlException.Feature xfeature) {
+ } catch (JexlException.Feature xfeature) {
Assert.assertTrue(xfeature.getMessage().contains("fat-arrow"));
}
}
@@ -462,7 +462,7 @@ public class LambdaTest extends JexlTestCase {
try {
JexlScript script = jexl.createScript(src);
Assert.fail("should fail, foo is already defined");
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getMessage().contains("foo"));
}
}
@@ -472,7 +472,7 @@ public class LambdaTest extends JexlTestCase {
JexlEngine jexl = createEngine();
try {
JexlScript script = jexl.createScript(src);
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getMessage().contains("function"));
}
}
@@ -483,7 +483,7 @@ public class LambdaTest extends JexlTestCase {
JexlEngine jexl = createEngine();
try {
JexlScript script = jexl.createScript(src);
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getMessage().contains("let"));
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/LexicalTest.java b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
index 35462764..3bacc8ee 100644
--- a/src/test/java/org/apache/commons/jexl3/LexicalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
@@ -440,7 +440,7 @@ public class LexicalTest {
try {
final Object result = script.execute(ctxt);
Assert.fail("setting options.lexical should have no effect during execution");
- } catch(final JexlException xf) {
+ } catch (final JexlException xf) {
Assert.assertNotNull(xf);
}
}
@@ -948,7 +948,7 @@ public class LexicalTest {
final JexlScript script = jexl.createScript(
"const foo; foo");
Assert.fail("should fail, const foo must be followed by assign.");
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getMessage().contains("const"));
}
}
@@ -1011,7 +1011,7 @@ public class LexicalTest {
try {
final JexlScript script = jexl.createScript("{ const foo = 42; } { let foo = 0; foo " + op + " 1; }");
Assert.assertNotNull(script);
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.fail(xparse.toString());
}
}
@@ -1045,7 +1045,7 @@ public class LexicalTest {
JexlScript script = jexl.createScript(src);
Object result = script.execute(null);
Assert.fail(src);
- } catch(JexlException.Assignment xassign) {
+ } catch (JexlException.Assignment xassign) {
Assert.assertNotNull(src, xassign); // debug breakpoint
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/PragmaTest.java b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
index e8519fb5..2c6fd2fb 100644
--- a/src/test/java/org/apache/commons/jexl3/PragmaTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
@@ -191,7 +191,7 @@ public class PragmaTest extends JexlTestCase {
script = JEXL.createScript("#pragma jexl.module.m0 ''\n#pragma jexl.module.m0 \"fubar('module0')\"\n m0:f43(10);");
result = script.execute(ctxt);
Assert.fail("fubar sshoud fail");
- } catch(JexlException.Method xmethod) {
+ } catch (JexlException.Method xmethod) {
Assert.assertEquals("fubar", xmethod.getMethod());
}
}
@@ -265,7 +265,7 @@ public class PragmaTest extends JexlTestCase {
final JexlEngine jexl = new JexlBuilder().features(features).create();
try {
final JexlScript script = jexl.createScript(src);
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getMessage().contains("import pragma"));
}
}
@@ -280,7 +280,7 @@ public class PragmaTest extends JexlTestCase {
+ "sleeper:sleep(100);"
+ "42");
Assert.fail("should have thrown syntax exception");
- } catch(JexlException.Parsing xparse) {
+ } catch (JexlException.Parsing xparse) {
Assert.assertTrue(xparse.getMessage().contains("namespace pragma"));
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java b/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java
index 470b70c2..0c600141 100644
--- a/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java
@@ -83,7 +83,7 @@ public class PublicFieldsTest extends JexlTestCase {
ctxt.set("value", UPPER42);
Assert.assertNull(set.evaluate(ctxt));
Assert.fail("should have thrown");
- } catch(final JexlException xjexl) {}
+ } catch (final JexlException xjexl) {}
}
@Test
@@ -126,7 +126,7 @@ public class PublicFieldsTest extends JexlTestCase {
ctxt.set("value", UPPER42);
Assert.assertNull(set.evaluate(ctxt));
Assert.fail("should have thrown");
- } catch(final JexlException xjexl) {}
+ } catch (final JexlException xjexl) {}
}
public enum Gender { MALE, FEMALE }
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
index 829246d0..d0745f72 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
@@ -518,7 +518,7 @@ public class ScriptCallableTest extends JexlTestCase {
final Future<?> future = executor.submit(c);
final Object t = future.get(1, TimeUnit.SECONDS);
Assert.fail("hangs should not be solved");
- } catch(final ExecutionException xexec) {
+ } catch (final ExecutionException xexec) {
Assert.assertTrue(xexec.getCause() instanceof JexlException.Method);
} finally {
executor.shutdown();
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptTest.java b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
index 15b4a343..6c62e0fd 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
@@ -109,7 +109,7 @@ public class ScriptTest extends JexlTestCase {
Object result = s.execute(jc, httpr,url);
Assert.assertNotNull(result);
Assert.assertEquals(response, result);
- } catch(IOException xio) {
+ } catch (IOException xio) {
Assert.fail(xio.getMessage());
} finally {
if (server != null) {
@@ -132,7 +132,7 @@ public class ScriptTest extends JexlTestCase {
Object result = s.execute(jc);
Assert.assertNotNull(result);
Assert.assertEquals(response, result);
- } catch(IOException xio) {
+ } catch (IOException xio) {
Assert.fail(xio.getMessage());
} finally {
if (server != null) {
@@ -199,7 +199,7 @@ public class ScriptTest extends JexlTestCase {
for(int port = 8001; server == null && port < 8127; ++port) {
try {
server = HttpServer.create(new InetSocketAddress("localhost", port), 0);
- } catch(java.net.BindException xbind) {
+ } catch (java.net.BindException xbind) {
xlatest = xbind;
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
index ccd9b4ff..aa5854fd 100644
--- a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
@@ -752,7 +752,7 @@ public class SideEffectTest extends JexlTestCase {
Assert.assertTrue(zz instanceof List<?>);
z = (List<String>) zz;
Assert.assertEquals(1, z.size());
- } catch(JexlException | ArithmeticException xjexl) {
+ } catch (JexlException | ArithmeticException xjexl) {
t246 = true;
Assert.assertEquals(j246.getClass(), Arithmetic246.class);
}
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java b/src/test/java/org/apache/commons/jexl3/VarTest.java
index 27bdf5e6..ef134902 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -63,14 +63,14 @@ public class VarTest extends JexlTestCase {
try {
final Object o = e.execute(ctxt);
Assert.fail("should have thrown an unknown var exception");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
// ok since we are strict and x does not exist
}
e = JEXL.createScript("x = 42");
try {
final Object o = e.execute(ctxt);
Assert.fail("should have thrown a readonly context exception");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
// ok since we are strict and context is readonly
}
@@ -79,7 +79,7 @@ public class VarTest extends JexlTestCase {
try {
final Object o = e.execute(ctxt);
Assert.fail("should have thrown an unknown method exception");
- } catch(final JexlException xjexl) {
+ } catch (final JexlException xjexl) {
// ok since we are strict and method does not exist
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java b/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java
index e9386495..f016d932 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java
@@ -129,7 +129,7 @@ public class RangeTest extends JexlTestCase {
case 14: lr1.removeAll(Collections.singletonList(v0)); Assert.fail(); break;
case 15: lr1.retainAll(Collections.singletonList(v0)); Assert.fail(); break;
}
- } catch(final UnsupportedOperationException xuo) {
+ } catch (final UnsupportedOperationException xuo) {
// ok
}
lc0 -= 1;
@@ -138,7 +138,7 @@ public class RangeTest extends JexlTestCase {
try {
il0.next();
Assert.fail();
- } catch(final NoSuchElementException xns) {
+ } catch (final NoSuchElementException xns) {
// ok
}
@@ -156,7 +156,7 @@ public class RangeTest extends JexlTestCase {
case 14: ir1.removeAll(Collections.singletonList(v0)); Assert.fail(); break;
case 15: ir1.retainAll(Collections.singletonList(v0)); Assert.fail(); break;
}
- } catch(final UnsupportedOperationException xuo) {
+ } catch (final UnsupportedOperationException xuo) {
// ok
}
ic0 -= 1;
@@ -165,7 +165,7 @@ public class RangeTest extends JexlTestCase {
try {
ii0.next();
Assert.fail();
- } catch(final NoSuchElementException xns) {
+ } catch (final NoSuchElementException xns) {
// ok
}
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 68cf08b3..e7485ae4 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
@@ -33,7 +33,7 @@ public class MiscIntrospectionTest {
try {
JexlEngine.EMPTY_CONTEXT.set("nope", 42);
Assert.fail("empty context should be readonly");
- } catch(UnsupportedOperationException xun) {
+ } catch (UnsupportedOperationException xun) {
Assert.assertNotNull(xun);
}
}
@@ -42,7 +42,7 @@ public class MiscIntrospectionTest {
// not on lists
try {
new ArrayIterator(new ArrayList<>());
- } catch(IllegalArgumentException xill) {
+ } catch (IllegalArgumentException xill) {
Assert.assertNotNull(xill);
}
// wih null?
@@ -51,7 +51,7 @@ public class MiscIntrospectionTest {
try {
ai0.next();
Assert.fail("should have failed");
- } catch(NoSuchElementException no) {
+ } catch (NoSuchElementException no) {
Assert.assertNotNull(no);
}
// an array
@@ -62,14 +62,14 @@ public class MiscIntrospectionTest {
try {
ai0.next();
Assert.fail("iterator on null?");
- } catch(NoSuchElementException no) {
+ } catch (NoSuchElementException no) {
Assert.assertNotNull(no);
}
// no remove
try {
ai0.remove();
Assert.fail("should have failed");
- } catch(UnsupportedOperationException no) {
+ } catch (UnsupportedOperationException no) {
Assert.assertNotNull(no);
}
}
@@ -80,7 +80,7 @@ public class MiscIntrospectionTest {
try {
new ArrayListWrapper(1);
Assert.fail("non-array wrap?");
- } catch(IllegalArgumentException xil) {
+ } catch (IllegalArgumentException xil) {
Assert.assertNotNull(xil);
}
Integer[] ai = new Integer[]{1, 2};
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
index d8564735..ff178062 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
@@ -271,7 +271,7 @@ public class PermissionsTest {
try {
Object result = script.execute(null, new Outer.Inner());
Assert.fail("callMeNot should be uncallable");
- } catch(JexlException.Method xany) {
+ } catch (JexlException.Method xany) {
Assert.assertEquals("callMeNot", xany.getMethod());
}
Method uncallable = getMethod(Invisible.class, "uncallable");
@@ -282,7 +282,7 @@ public class PermissionsTest {
try {
Object result = script.execute(null, new Invisible());
Assert.fail("uncallable should be uncallable");
- } catch(JexlException.Method xany) {
+ } catch (JexlException.Method xany) {
Assert.assertEquals("uncallable", xany.getMethod());
}
}
@@ -341,7 +341,7 @@ public class PermissionsTest {
try {
Permissions p = (Permissions) JexlPermissions.parse(src);
Assert.fail(src);
- } catch(IllegalStateException xill) {
+ } catch (IllegalStateException xill) {
Assert.assertNotNull(xill);
}
}
@@ -376,7 +376,7 @@ public class PermissionsTest {
try {
r = script.execute(null, foo2);
Assert.fail("protectedMethod() is not public through superclass Foo2");
- } catch(JexlException xjexl) {
+ } catch (JexlException xjexl) {
Assert.assertNotNull(xjexl);
}
// call public override, ok
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
index 152deda7..33c6d909 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
@@ -128,7 +128,7 @@ public class OptionalTest {
script = jexl.createScript(info.at(62, 1), "thing.name.size()", "thing");
result = script.execute(null, thing);
Assert.fail("should have thrown");
- } catch(JexlException.Method xmethod) {
+ } catch (JexlException.Method xmethod) {
Assert.assertEquals("size", xmethod.getDetail());
Assert.assertEquals("test352@62:11 unsolvable function/method 'size'", xmethod.getMessage());
}
@@ -136,7 +136,7 @@ public class OptionalTest {
try {
script = jexl.createScript(info.at(71, 1), "thing.name?.size()", "thing");
result = script.execute(null, thing);
- } catch(JexlException.Method xmethod) {
+ } catch (JexlException.Method xmethod) {
Assert.fail("should not have thrown");
}
diff --git a/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java b/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java
index be5928e2..7e7b8651 100644
--- a/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java
+++ b/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java
@@ -69,7 +69,7 @@ public class ParserTest {
Assert.fail("should have failed on ambiguous statement");
} catch (final JexlException.Ambiguous xambiguous) {
// ok
- } catch(final JexlException xother) {
+ } catch (final JexlException xother) {
Assert.fail(xother.toString());
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
index d329dee2..ef28999e 100644
--- a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
+++ b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
@@ -105,7 +105,7 @@ public class JexlScriptEngineTest {
+ "now=sys.currentTimeMillis();"
);
Assert.fail("default engine no longer accesses System classes");
- } catch(ScriptException xscript) {
+ } catch (ScriptException xscript) {
JexlException.Method xjexl = (JexlException.Method) xscript.getCause();
Assert.assertEquals("forName", xjexl.getMethod());
}
@@ -219,24 +219,24 @@ public class JexlScriptEngineTest {
engine.put("errors", new Errors());
try {
engine.eval("errors.npe()");
- } catch(ScriptException xscript) {
+ } catch (ScriptException xscript) {
Assert.assertTrue(xscript.getCause() instanceof NullPointerException);
}
try {
engine.eval("errors.illegal()", ctxt);
- } catch(ScriptException xscript) {
+ } catch (ScriptException xscript) {
Assert.assertTrue(xscript.getCause() instanceof IllegalArgumentException);
}
CompiledScript script0 = engine.compile("errors.npe()");
try {
script0.eval();
- } catch(ScriptException xscript) {
+ } catch (ScriptException xscript) {
Assert.assertTrue(xscript.getCause() instanceof NullPointerException);
}
CompiledScript script1 = engine.compile("errors.illegal()");
try {
script1.eval(ctxt);
- } catch(ScriptException xscript) {
+ } catch (ScriptException xscript) {
Assert.assertTrue(xscript.getCause() instanceof IllegalArgumentException);
}
}
@@ -252,13 +252,13 @@ public class JexlScriptEngineTest {
try {
CompiledScript script0 = engine.compile(str);
Assert.fail("should have thrown npe");
- } catch(NullPointerException npe) {
+ } catch (NullPointerException npe) {
Assert.assertNotNull(npe);
}
try {
CompiledScript script0 = engine.compile(reader);
Assert.fail("should have thrown npe");
- } catch(NullPointerException npe) {
+ } catch (NullPointerException npe) {
Assert.assertNotNull(npe);
}
try {
@@ -268,7 +268,7 @@ public class JexlScriptEngineTest {
Assert.assertEquals(7, result);
result = script0.eval();
Assert.assertEquals(7, result);
- } catch(ScriptException xscript) {
+ } catch (ScriptException xscript) {
Assert.assertTrue(xscript.getCause() instanceof NullPointerException);
}
try {
@@ -281,7 +281,7 @@ public class JexlScriptEngineTest {
ctxt.setAttribute("y", -22, ScriptContext.ENGINE_SCOPE);
result = script0.eval();
Assert.assertEquals(-42, result);
- } catch(ScriptException xscript) {
+ } catch (ScriptException xscript) {
Assert.assertTrue(xscript.getCause() instanceof NullPointerException);
}