Skip to content

Commit

Permalink
Remove extra blank lines
Browse files Browse the repository at this point in the history
  • Loading branch information
garydgregory committed Nov 26, 2023
1 parent ebef0c3 commit 44b22a6
Show file tree
Hide file tree
Showing 55 changed files with 0 additions and 84 deletions.
3 changes: 0 additions & 3 deletions src/main/java/org/apache/commons/jexl3/JexlException.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public class JexlException extends RuntimeException {
/** Maximum number of characters around exception location. */
private static final int MAX_EXCHARLOC = 42;


/**
* Creates a new JexlException.
*
Expand Down Expand Up @@ -771,7 +770,6 @@ public Method(final JexlInfo info, final String name, final Object[] args) {
this(info, name, args, null);
}


/**
* Creates a new Method exception instance.
*
Expand Down Expand Up @@ -1065,7 +1063,6 @@ public static JexlException tryFailed(final InvocationTargetException xinvoke) {
: new JexlException.TryFailed(xinvoke); // fail
}


/**
* Detailed info message about this error.
* Format is "debug![begin,end]: string \n msg" where:
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/org/apache/commons/jexl3/JexlFeatures.java
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,6 @@ public boolean supportsImportPragma() {
return getFeature(IMPORT_PRAGMA);
}


/**
* Sets whether annotation constructs are enabled.
* <p>
Expand Down Expand Up @@ -857,7 +856,6 @@ public JexlFeatures lexical(final boolean flag) {
return this;
}


/** @return whether lexical scope feature is enabled */
public boolean isLexical() {
return getFeature(LEXICAL);
Expand All @@ -877,7 +875,6 @@ public JexlFeatures lexicalShade(final boolean flag) {
return this;
}


/** @return whether lexical shade feature is enabled */
public boolean isLexicalShade() {
return getFeature(LEXICAL_SHADE);
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/org/apache/commons/jexl3/internal/Debugger.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.commons.jexl3.internal;


import java.util.Collections;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -435,7 +434,6 @@ protected Object acceptStatement(final JexlNode child, final Object data) {
return value;
}


/**
* Checks if a terminal node is the cause to debug &amp; adds its representation to the rebuilt expression.
* @param node the child node
Expand Down Expand Up @@ -743,7 +741,6 @@ protected Object visit(final ASTBreak node, final Object data) {
return check(node, "break", data);
}


@Override
protected Object visit(final ASTForeachStatement node, final Object data) {
final int form = node.getLoopForm();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ public Engine(final JexlBuilder conf) {
}
}


/**
* Gets the default instance of Uberspect.
* <p>This is lazily initialized to avoid building a default instance if there
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.commons.jexl3.internal;


import org.apache.commons.jexl3.JexlBuilder;
import org.apache.commons.jexl3.JexlContext;
import org.apache.commons.jexl3.JexlOptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public int getMax() {
return max;
}


@Override
public int hashCode() {
int hash = getClass().hashCode();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2044,7 +2044,6 @@ public class AnnotatedCall implements Callable<Object> {
data = adata;
}


@Override
public Object call() throws Exception {
processed = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.commons.jexl3.internal;


import java.util.Collection;
import java.util.HashMap;
import java.util.List;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/apache/commons/jexl3/internal/Scope.java
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ public String[] getLocalVariables() {
return locals.toArray(new String[0]);
}


Scope getParent() {
return parent;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,3 @@ protected boolean removeEldestEntry(final Map.Entry<K, V> eldest) {
}
}





Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ public boolean debug(final JxltEngine.Template jt) {
return end > 0;
}


@Override
protected Object visit(final ASTBlock node, final Object data) {
// if not really a template, must use super impl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ int getIndex() {
}
}



/**
* A helper class to build expressions.
* Keeps count of sub-expressions by type.
Expand Down Expand Up @@ -688,7 +686,6 @@ protected Object evaluate(final Interpreter interpreter) {
}
}


@Override
public JxltEngine.Expression createExpression(final JexlInfo jexlInfo, final String expression) {
final JexlInfo info = jexlInfo == null ? jexl.createInfo() : jexlInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.commons.jexl3.internal.introspection;


import java.util.Enumeration;
import java.util.Iterator;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.commons.jexl3.internal.introspection;


import java.beans.IntrospectionException;
import java.lang.reflect.Method;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ public Object tryInvoke(final String name, final Object obj, final Object... arg
return JexlEngine.TRY_FAILED;
}


/**
* Reassembles arguments if the method is a vararg method.
* @param args The actual arguments being passed to this method
Expand Down Expand Up @@ -155,4 +154,3 @@ private Object[] handleVarArg(final Object[] args) {
}
}


Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ public final JexlPropertySet getPropertySet(final JexlUberspect uber,
JexlResolver.CONTAINER
));


/**
* A resolver types list tailored for Maps, favors '[]' over '.'.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.commons.jexl3.parser;


/**
* Identifiers, variables and registers.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.apache.commons.jexl3.internal.LexicalScope;
import org.apache.commons.jexl3.internal.Scope;


/**
* The base class for parsing, manages the parameter/local variable frame.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public String toString() {
return strb.toString();
}


Class<? extends Number> getLiteralClass() {
return clazz;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ public String getMessage() {
+ "after : " + StringParser.escapeString(after, '"');
}


/** Constructor with message and reason. */
public TokenMgrException(final String message, final int reason) {
super(message);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ private static JexlEngine getEngine() {
return engine;
}


/** The logger. */
static final Log LOG = LogFactory.getLog(JexlScriptEngine.class);

Expand Down Expand Up @@ -256,7 +255,6 @@ public Log getLogger() {
}
}


/**
* Create a scripting engine using the supplied factory.
*
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ private static int getJavaVersion() {

private final Asserter asserter;


private final JexlArithmetic jexla;

private final JexlArithmetic jexlb;
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.junit.Before;
import org.junit.Test;


/**
* Tests for array access operator []
*
Expand Down Expand Up @@ -283,7 +282,6 @@ public void testDoubleArrays() throws Exception {
asserter.assertExpression("foo.'0'.'1' = 'three'", "three");
asserter.assertExpression("foo.'0'.'1'", "three");


foo[0][0] = "one";
foo[0][1] = "two";
asserter.assertExpression("foo.0.1", "two");
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/apache/commons/jexl3/CacheTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ public void set(final String p, Object v) {
}
}


public static class Cached3 extends java.util.TreeMap<String, Object> {
private static final long serialVersionUID = 1L;
boolean flag = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public Arithmetic363(final boolean strict) {
}
}


static class CountingArrayBuilder extends ArrayBuilder {
final AtomicInteger count;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,3 @@ protected <K, V> Map<K, V> createMap(final int cacheSize) {
}
}


1 change: 0 additions & 1 deletion src/test/java/org/apache/commons/jexl3/DoWhileTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ public void testWhileExecutesExpressionWhenLooping() throws Exception {
o = e.execute(jc);
Assert.assertEquals(23, o);


jc.set("x", 1);
e = JEXL.createScript("do x += 1; while (x < 23); return 42;");
o = e.execute(jc);
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/apache/commons/jexl3/FeaturesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ public void testNoLocals() throws Exception {
checkFeature(f, scripts);
}


@Test
public void testNoLoop() throws Exception {
final JexlFeatures f = new JexlFeatures().loops(false);
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/apache/commons/jexl3/Foo.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ public boolean isSimple()
return true;
}


public String repeat(final String str) {
return "Repeat : " + str;
}
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/apache/commons/jexl3/IfTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ public void testTernaryFail() throws Exception {
}
}


/**
* Ternary operator condition undefined or null evaluates to false
* independently of engine flags; same for null coalescing operator.
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/apache/commons/jexl3/Issues100Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ public Object or(final String lhs, final String rhs) {
}
}


public static class C192 {
public static Integer callme(final Integer n) {
if (n == null) {
Expand Down
6 changes: 0 additions & 6 deletions src/test/java/org/apache/commons/jexl3/Issues200Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.commons.jexl3;


import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -246,12 +245,10 @@ private static void handle(final ExecutorService pool, final JexlScript script,
pool.submit(() -> script.execute(new MapContext(payload)));
}


public Issues200Test() {
super("Issues200Test", null);
}


@Before
@Override
public void setUp() throws Exception {
Expand Down Expand Up @@ -345,7 +342,6 @@ public void test217() throws Exception {
Assert.assertNull("oob adverted", r);
}


@Test
public void test221() throws Exception {
final JexlEvalContext jc = new JexlEvalContext();
Expand Down Expand Up @@ -450,7 +446,6 @@ public void test242() throws Exception {
Assert.assertEquals(Double.doubleToLongBits(e) + " != " + Double.doubleToLongBits(c), a + b, e, 0.0);
}


@Test
public void test243a() throws Exception {
final JexlEngine jexl = new JexlBuilder().cache(32).create();
Expand Down Expand Up @@ -554,7 +549,6 @@ public void test265() throws Exception {
Assert.assertEquals(42, result);
}


@Test
public void test266() throws Exception {
Object result;
Expand Down
4 changes: 0 additions & 4 deletions src/test/java/org/apache/commons/jexl3/Issues300Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ <T> T createProxy(final JexlEngine jexl, final Object o, final Class[] clazzz) {
);
}


private Object run361a(final JexlEngine jexl) {
final String src = "()-> { ()-> { if (versionFile != null) { return 'foo'; } else { return 'bar'; }} }";
final JexlScript script = jexl.createScript(src);
Expand Down Expand Up @@ -387,7 +386,6 @@ public void test306b() {
Assert.assertEquals(2, o2);
}


@Test
public void test306c() {
final JexlEngine jexl = new JexlBuilder().safe(true).create();
Expand Down Expand Up @@ -762,7 +760,6 @@ public void test331() {
Assert.assertTrue(result.toString().contains("\n"));
}


@Test
public void test347() {
final String src = "A.B == 5";
Expand Down Expand Up @@ -850,7 +847,6 @@ public void test361b_33() {
}
}


@Test
public void test361c_32() {
final JexlEngine jexl = new Engine32(new JexlBuilder().safe(false).strict(false));
Expand Down
Loading

0 comments on commit 44b22a6

Please sign in to comment.