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 5ca6d50625590e6fb83a59e408d8766011628b90
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Jan 21 14:37:04 2025 -0500
Fix ParenPad
---
src/main/java/org/apache/commons/jexl3/JexlFeatures.java | 4 ++--
src/main/java/org/apache/commons/jexl3/internal/Debugger.java | 2 +-
src/main/java/org/apache/commons/jexl3/internal/Engine32.java | 4 ++--
.../java/org/apache/commons/jexl3/internal/LexicalFrame.java | 2 +-
src/main/java/org/apache/commons/jexl3/internal/SoftCache.java | 2 +-
.../org/apache/commons/jexl3/scripting/JexlScriptEngine.java | 2 +-
.../java/org/apache/commons/jexl3/ArithmeticOperatorTest.java | 7 ++++---
src/test/java/org/apache/commons/jexl3/ArithmeticTest.java | 6 +++---
src/test/java/org/apache/commons/jexl3/AssignTest.java | 2 +-
.../java/org/apache/commons/jexl3/CollectionLiteralTest.java | 4 ++--
src/test/java/org/apache/commons/jexl3/JexlTestCase.java | 2 +-
src/test/java/org/apache/commons/jexl3/ScriptTest.java | 4 ++--
src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java | 9 +++++----
src/test/java/org/apache/commons/jexl3/StrategyTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/examples/StreamTest.java | 2 +-
15 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
index 17c7289b..70236c11 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
@@ -157,10 +157,10 @@ public final class JexlFeatures {
* <p>Adds lexical, lexical-shade and const-capture but removes
comparator-names and pragma-anywhere</p>
*/
private static final long SCRIPT_FEATURES = // MUST REMAIN PRIVATE
- ( DEFAULT_FEATURES
+ (DEFAULT_FEATURES
| 1L << LEXICAL
| 1L << LEXICAL_SHADE
- | 1L << CONST_CAPTURE ) // these parentheses are necessary :-)
+ | 1L << CONST_CAPTURE) // these parentheses are necessary :-)
& ~(1L << COMPARATOR_NAMES)
& ~(1L << PRAGMA_ANYWHERE);
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
index 92f2f76c..a55b8a96 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
@@ -1041,7 +1041,7 @@ public class Debugger extends ParserVisitor implements
JexlInfo.Detail {
}
builder.append('(');
final String[] params = lambda.getParameters();
- if (params != null ) {
+ if (params != null) {
final Scope scope = lambda.getScope();
final LexicalScope lexicalScope = lambda.getLexicalScope();
for (int p = 0; p < params.length; ++p) {
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine32.java
b/src/main/java/org/apache/commons/jexl3/internal/Engine32.java
index ed4d3e2e..65748b0b 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine32.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine32.java
@@ -112,7 +112,7 @@ public class Engine32 extends Engine {
}
@Override
- protected boolean isTernaryProtected( final JexlNode node) {
+ protected boolean isTernaryProtected(final JexlNode node) {
return Engine32.isTernaryProtected(this, node);
}
};
@@ -132,7 +132,7 @@ public class Engine32 extends Engine {
}
@Override
- protected boolean isTernaryProtected( final JexlNode node) {
+ protected boolean isTernaryProtected(final JexlNode node) {
return Engine32.isTernaryProtected(this, node);
}
};
diff --git a/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
b/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
index 822c0dc2..bb082003 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
@@ -108,7 +108,7 @@ public class LexicalFrame extends LexicalScope {
*/
public LexicalFrame pop() {
// undefine all symbols
- clearSymbols(s -> frame.set(s, Scope.UNDEFINED) );
+ clearSymbols(s -> frame.set(s, Scope.UNDEFINED));
// restore values of captured symbols that were overwritten
if (stack != null) {
while (!stack.isEmpty()) {
diff --git a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
index ab0acea6..e29f4658 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
@@ -101,7 +101,7 @@ public class SoftCache<K, V> implements JexlCache<K, V> {
@Override
public void clear() {
final SoftReference<Map<K, V>> ref = reference;
- if (ref != null ) {
+ if (ref != null) {
reference = null;
final Map<K, V> map = ref.get();
if (map != null) {
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 0f7d9d9c..1996515e 100644
--- a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
@@ -289,7 +289,7 @@ public class JexlScriptEngine extends AbstractScriptEngine
implements Compilable
.safe(false)
.logger(JexlScriptEngine.LOG)
.cache(JexlScriptEngine.CACHE_SIZE);
- if (PERMISSIONS != null ) {
+ if (PERMISSIONS != null) {
builder.permissions(PERMISSIONS);
}
engine = builder.create();
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
index f81ff804..dff86ac0 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
@@ -688,7 +688,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
public static class SortingArithmetic extends JexlArithmetic {
public SortingArithmetic(boolean strict) {
- this( strict, null, Integer.MIN_VALUE);
+ this(strict, null, Integer.MIN_VALUE);
}
private SortingArithmetic(boolean strict, MathContext context, int
scale) {
@@ -705,8 +705,9 @@ public class ArithmeticOperatorTest extends JexlTestCase {
/**
* Sorts an array using a script to evaluate the property used to
compare elements.
+ *
* @param array the elements array
- * @param expr the property evaluation lambda
+ * @param expr the property evaluation lambda
*/
public void sort(final Object[] array, final JexlScript expr) {
Arrays.sort(array, new PropertyComparator(this, expr));
@@ -760,7 +761,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
public static class Arithmetic428 extends JexlArithmetic {
public Arithmetic428(boolean strict) {
- this( strict, null, Integer.MIN_VALUE);
+ this(strict, null, Integer.MIN_VALUE);
}
private Arithmetic428(boolean strict, MathContext context, int scale) {
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
index ba3aec53..6e2550cd 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
@@ -1638,10 +1638,10 @@ public class ArithmeticTest extends JexlTestCase {
final JexlEngine jexl = new JexlBuilder().create();
final JexlContext jc = new MapContext();
final Callable173 c173 = new Callable173();
- JexlScript e = jexl.createScript( "c173(9, 6)", "c173" );
+ JexlScript e = jexl.createScript("c173(9, 6)", "c173");
Object result = e.execute(jc, c173);
assertEquals(54, result);
- e = jexl.createScript( "c173('fourty', 'two')", "c173" );
+ e = jexl.createScript("c173('fourty', 'two')", "c173");
result = e.execute(jc, c173);
assertEquals(42, result);
@@ -2035,7 +2035,7 @@ public class ArithmeticTest extends JexlTestCase {
assertEquals(BigDecimal.ZERO, jexla.toBigDecimal(""));
assertEquals(BigDecimal.ZERO, jexla.toBigDecimal((char) 0));
- final Double d64d3 = new Double( 6.4 / 3 );
+ final Double d64d3 = new Double(6.4 / 3);
assertEquals(d64d3, ((Number) JEXL.createExpression("6.4 /
3").evaluate(null)).doubleValue(), EPSILON);
asserter.assertExpression("6.4 / 3", d64d3);
assertEquals(d64d3, ((Number) JEXL.createExpression("6.4 /
3d").evaluate(null)).doubleValue(), EPSILON);
diff --git a/src/test/java/org/apache/commons/jexl3/AssignTest.java
b/src/test/java/org/apache/commons/jexl3/AssignTest.java
index b5538e86..b72e79e1 100644
--- a/src/test/java/org/apache/commons/jexl3/AssignTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AssignTest.java
@@ -92,7 +92,7 @@ public class AssignTest extends JexlTestCase {
final JexlExpression check = JEXL.createExpression("froboz.value");
final JexlContext jc = new MapContext();
Object o = assign.evaluate(jc);
- assertEquals( Integer.valueOf(10), o);
+ assertEquals(Integer.valueOf(10), o);
o = check.evaluate(jc);
assertEquals(Integer.valueOf(10), o);
}
diff --git a/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
b/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
index aa689d83..7895ece0 100644
--- a/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
@@ -113,12 +113,12 @@ public class CollectionLiteralTest extends JexlTestCase {
script = jexl.createScript("[ (x)->{ 1 + x; }, (y)->{ y - 1; } ]");
Object previous = null;
- for(int i = 0; i < 4; ++i) {
+ for (int i = 0; i < 4; ++i) {
result = script.execute(null);
assertNotNull(result);
assertNotSame(previous, result);
previous = result;
- assertEquals( 1 + i, jc.arrays.get());
+ assertEquals(1 + i, jc.arrays.get());
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
index 08ae08a6..a9d65838 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
@@ -80,7 +80,7 @@ public class JexlTestCase {
static final JexlOptions MODE_PRO50 = new JexlOptions();
static {
- MODE_PRO50.setFlags( "+strict +cancellable +lexical +lexicalShade
-safe".split(" "));
+ MODE_PRO50.setFlags("+strict +cancellable +lexical +lexicalShade
-safe".split(" "));
}
/**
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
index 53ad9dd0..f88f0fb5 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
@@ -122,7 +122,7 @@ public class ScriptTest extends JexlTestCase {
con.setRequestMethod("POST");
con.setRequestProperty("Accept", "application/json");
// send data
- if ( jsonData != null ) {
+ if (jsonData != null) {
con.setRequestProperty("Content-Type", "application/json");
con.setDoOutput(true);
@@ -133,7 +133,7 @@ public class ScriptTest extends JexlTestCase {
// read response
final int responseCode = con.getResponseCode();
InputStream inputStream = null;
- inputStream = con.getInputStream();
+ inputStream = con.getInputStream();
final StringBuilder response = new StringBuilder();
if (inputStream != null) {
try (BufferedReader in = new BufferedReader(new
InputStreamReader(inputStream))) {
diff --git a/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java
b/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java
index 905dd574..937a069d 100644
--- a/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java
@@ -135,9 +135,10 @@ public class ShiftOperatorsTest extends JexlTestCase {
a360.assertExpression("40L + (2 << 1) + 1", 40L + (2L << 1) + 1);
a360.assertExpression("(40L + 2) << (1 + 1)", 40L + 2L << 1 + 1);
}
+
@Test
public void testRightShiftBigValue() throws Exception {
- a360.assertExpression( "9223372036854775808 >> 2", new
BigInteger("9223372036854775808").shiftRight(2));
+ a360.assertExpression("9223372036854775808 >> 2", new
BigInteger("9223372036854775808").shiftRight(2));
a360.assertExpression("9223372036854775808 >> -2", new
BigInteger("9223372036854775808").shiftRight(-2));
a360.assertExpression("-9223372036854775809 >> 2", new
BigInteger("-9223372036854775809").shiftRight(2));
a360.assertExpression("-9223372036854775809 >> -2", new
BigInteger("-9223372036854775809").shiftRight(-2));
@@ -172,10 +173,10 @@ public class ShiftOperatorsTest extends JexlTestCase {
@Test
public void testRightShiftUnsignedBigValue() throws Exception {
- a360.assertExpression( "9223372036854775808 >>> 2",
shiftRightUnsigned("9223372036854775808", 2));
- a360.assertExpression("9223372036854775808 >>> -2",
shiftRightUnsigned("9223372036854775808",-2));
+ a360.assertExpression("9223372036854775808 >>> 2",
shiftRightUnsigned("9223372036854775808", 2));
+ a360.assertExpression("9223372036854775808 >>> -2",
shiftRightUnsigned("9223372036854775808", -2));
a360.assertExpression("-9223372036854775809 >>> 2",
shiftRightUnsigned("-9223372036854775809", 2));
- a360.assertExpression("-9223372036854775809 >>> -2",
shiftRightUnsigned("-9223372036854775809",-2));
+ a360.assertExpression("-9223372036854775809 >>> -2",
shiftRightUnsigned("-9223372036854775809", -2));
}
@Test
diff --git a/src/test/java/org/apache/commons/jexl3/StrategyTest.java
b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
index 4036eb00..c4893f46 100644
--- a/src/test/java/org/apache/commons/jexl3/StrategyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
@@ -128,7 +128,7 @@ public class StrategyTest extends JexlTestCase {
@Test
public void testMyMapStrategy() throws Exception {
- final JexlEngine jexl = new JexlBuilder().arithmetic( new
MapArithmetic(true)).create();
+ final JexlEngine jexl = new JexlBuilder().arithmetic(new
MapArithmetic(true)).create();
run171(jexl, false);
}
diff --git a/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java
b/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java
index f189cd3b..4ab39731 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java
@@ -96,7 +96,7 @@ public class StreamTest {
* @return the mapped stream
*/
public Stream<?> map(final Stream<?> stream, final JexlScript mapper) {
- return stream.map( x -> mapper.execute(this, x));
+ return stream.map(x -> mapper.execute(this, x));
}
}
