You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2015/12/08 16:42:14 UTC
svn commit: r1718636 - in
/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3:
JexlArithmetic.java JexlContext.java JexlException.java MapContext.java
scripting/JexlScriptEngineFactory.java scripting/Main.java
Author: ebourg
Date: Tue Dec 8 15:42:14 2015
New Revision: 1718636
URL: http://svn.apache.org/viewvc?rev=1718636&view=rev
Log:
Minor code changes (foreach loops, unnecessary cast and modifiers, etc)
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/MapContext.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/Main.java
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java?rev=1718636&r1=1718635&r2=1718636&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java Tue Dec 8 15:42:14 2015
@@ -432,7 +432,7 @@ public class JexlArithmetic {
*/
public Number narrowNumber(Number original, Class<?> narrow) {
if (original == null) {
- return original;
+ return null;
}
Number result = original;
if (original instanceof BigDecimal) {
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java?rev=1718636&r1=1718635&r2=1718636&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlContext.java Tue Dec 8 15:42:14 2015
@@ -77,7 +77,7 @@ public interface JexlContext {
*
* @since 3.0
*/
- public interface NamespaceResolver {
+ interface NamespaceResolver {
/**
* Resolves a namespace by its name.
@@ -92,7 +92,7 @@ public interface JexlContext {
*
* <p>The functor is created once during the lifetime of a script evaluation.</p>
*/
- public interface NamespaceFunctor {
+ interface NamespaceFunctor {
/**
* Creates the functor object that will be used instead of the namespace.
* @param context the context
@@ -113,7 +113,7 @@ public interface JexlContext {
* @see JexlEngine#setThreadContext(JexlContext.ThreadLocal)
* @see JexlEngine#getThreadContext()
*/
- public interface ThreadLocal extends JexlContext {
+ interface ThreadLocal extends JexlContext {
// no specific method
}
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java?rev=1718636&r1=1718635&r2=1718636&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlException.java Tue Dec 8 15:42:14 2015
@@ -153,10 +153,8 @@ public class JexlException extends Runti
*/
private static <X extends Throwable> X clean(X xthrow) {
if (xthrow != null) {
- StackTraceElement[] stack = xthrow.getStackTrace();
List<StackTraceElement> stackJexl = new ArrayList<StackTraceElement>();
- for (int s = 0; s < stack.length; ++s) {
- StackTraceElement se = stack[s];
+ for (StackTraceElement se : xthrow.getStackTrace()) {
String className = se.getClassName();
if (!className.startsWith("org.apache.commons.jexl3.internal")
&& !className.startsWith("org.apache.commons.jexl3.parser")) {
@@ -176,9 +174,9 @@ public class JexlException extends Runti
*/
private static Throwable unwrap(Throwable xthrow) {
if (xthrow instanceof InvocationTargetException) {
- return ((InvocationTargetException) xthrow).getCause();
+ return xthrow.getCause();
} else if (xthrow instanceof UndeclaredThrowableException) {
- return ((UndeclaredThrowableException) xthrow).getCause();
+ return xthrow.getCause();
} else {
return xthrow;
}
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/MapContext.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/MapContext.java?rev=1718636&r1=1718635&r2=1718636&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/MapContext.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/MapContext.java Tue Dec 8 15:42:14 2015
@@ -44,7 +44,6 @@ public class MapContext implements JexlC
* @param vars the variable map
*/
public MapContext(Map<String, Object> vars) {
- super();
map = vars == null ? new HashMap<String, Object>() : vars;
}
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java?rev=1718636&r1=1718635&r2=1718636&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngineFactory.java Tue Dec 8 15:42:14 2015
@@ -147,8 +147,7 @@ public class JexlScriptEngineFactory imp
@Override
public ScriptEngine getScriptEngine() {
- JexlScriptEngine engine = new JexlScriptEngine(this);
- return engine;
+ return new JexlScriptEngine(this);
}
}
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/Main.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/Main.java?rev=1718636&r1=1718635&r2=1718636&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/Main.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/Main.java Tue Dec 8 15:42:14 2015
@@ -42,7 +42,7 @@ public class Main {
* @throws Exception if anything goes wrong
*/
static BufferedReader read(Charset charset, String fileName) throws Exception {
- BufferedReader in = new BufferedReader(
+ return new BufferedReader(
new InputStreamReader(
fileName == null
? System.in
@@ -50,7 +50,6 @@ public class Main {
charset == null
? Charset.defaultCharset()
: charset));
- return in;
}
/**