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-ognl.git
The following commit(s) were added to refs/heads/master by this push:
new 334f8e8 Remove use of redundant String.substring() parameter.
334f8e8 is described below
commit 334f8e877df4dd75c542f311bb26d1f07c54a61c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 28 09:38:46 2021 -0500
Remove use of redundant String.substring() parameter.
---
src/main/java/org/apache/commons/ognl/ASTAdd.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTAnd.java | 2 +-
.../java/org/apache/commons/ognl/ASTAssign.java | 2 +-
.../java/org/apache/commons/ognl/ASTBitAnd.java | 2 +-
.../java/org/apache/commons/ognl/ASTBitNegate.java | 2 +-
.../java/org/apache/commons/ognl/ASTBitOr.java | 2 +-
.../java/org/apache/commons/ognl/ASTChain.java | 14 ++--
.../java/org/apache/commons/ognl/ASTConst.java | 14 ++--
src/main/java/org/apache/commons/ognl/ASTCtor.java | 10 +--
.../java/org/apache/commons/ognl/ASTDivide.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTEq.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTEval.java | 2 +-
.../java/org/apache/commons/ognl/ASTGreater.java | 2 +-
.../java/org/apache/commons/ognl/ASTGreaterEq.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTIn.java | 2 +-
.../org/apache/commons/ognl/ASTInstanceof.java | 4 +-
src/main/java/org/apache/commons/ognl/ASTLess.java | 2 +-
.../java/org/apache/commons/ognl/ASTLessEq.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTList.java | 4 +-
.../java/org/apache/commons/ognl/ASTMultiply.java | 2 +-
.../java/org/apache/commons/ognl/ASTNegate.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTNot.java | 4 +-
.../java/org/apache/commons/ognl/ASTNotEq.java | 2 +-
.../java/org/apache/commons/ognl/ASTNotIn.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTOr.java | 12 +--
.../java/org/apache/commons/ognl/ASTProject.java | 2 +-
.../java/org/apache/commons/ognl/ASTRemainder.java | 2 +-
.../org/apache/commons/ognl/ASTRootVarRef.java | 4 +-
.../java/org/apache/commons/ognl/ASTSelect.java | 2 +-
.../org/apache/commons/ognl/ASTSelectFirst.java | 2 +-
.../org/apache/commons/ognl/ASTSelectLast.java | 2 +-
.../java/org/apache/commons/ognl/ASTSequence.java | 4 +-
.../java/org/apache/commons/ognl/ASTShiftLeft.java | 2 +-
.../org/apache/commons/ognl/ASTShiftRight.java | 2 +-
.../org/apache/commons/ognl/ASTStaticField.java | 4 +-
.../java/org/apache/commons/ognl/ASTSubtract.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTTest.java | 14 ++--
.../org/apache/commons/ognl/ASTThisVarRef.java | 2 +-
.../apache/commons/ognl/ASTUnsignedShiftRight.java | 2 +-
.../java/org/apache/commons/ognl/ASTVarRef.java | 2 +-
src/main/java/org/apache/commons/ognl/ASTXor.java | 2 +-
.../apache/commons/ognl/ClassCacheInspector.java | 2 +-
.../org/apache/commons/ognl/ElementsAccessor.java | 2 +-
.../org/apache/commons/ognl/MethodAccessor.java | 4 +-
src/main/java/org/apache/commons/ognl/Node.java | 4 +-
.../java/org/apache/commons/ognl/NodeType.java | 4 +-
.../ognl/ObjectIndexedPropertyDescriptor.java | 8 +-
src/main/java/org/apache/commons/ognl/Ognl.java | 88 +++++++++++-----------
.../java/org/apache/commons/ognl/OgnlContext.java | 4 +-
.../org/apache/commons/ognl/OgnlException.java | 14 ++--
src/main/java/org/apache/commons/ognl/OgnlOps.java | 36 ++++-----
.../java/org/apache/commons/ognl/OgnlRuntime.java | 8 +-
.../org/apache/commons/ognl/PropertyAccessor.java | 8 +-
.../commons/ognl/enhance/ExpressionAccessor.java | 6 +-
.../commons/ognl/enhance/ExpressionCompiler.java | 18 ++---
.../commons/ognl/enhance/LocalReference.java | 6 +-
.../ognl/enhance/OgnlExpressionCompiler.java | 14 ++--
.../apache/commons/ognl/enhance/OrderedReturn.java | 4 +-
.../enhance/UnsupportedCompilationException.java | 2 +-
.../ognl/internal/ConcurrentHashMapCache.java | 26 +++----
.../internal/ConcurrentHashMapCacheFactory.java | 26 +++----
.../apache/commons/ognl/internal/HashMapCache.java | 26 +++----
.../commons/ognl/internal/HashMapClassCache.java | 26 +++----
.../internal/ReentrantReadWriteLockClassCache.java | 26 +++----
.../entry/DeclaredMethodCacheEntryFactory.java | 26 +++----
.../commons/ognl/test/InheritedMethodsTest.java | 2 +-
.../ognl/test/NullStringCatenationTest.java | 10 +--
.../ognl/test/objects/BeanProviderAccessor.java | 2 +-
.../ognl/test/objects/BeanProviderImpl.java | 2 +-
.../commons/ognl/test/objects/FirstBean.java | 2 +-
.../commons/ognl/test/objects/SecondBean.java | 2 +-
71 files changed, 278 insertions(+), 278 deletions(-)
diff --git a/src/main/java/org/apache/commons/ognl/ASTAdd.java
b/src/main/java/org/apache/commons/ognl/ASTAdd.java
index 12fe65a..f0d7777 100644
--- a/src/main/java/org/apache/commons/ognl/ASTAdd.java
+++ b/src/main/java/org/apache/commons/ognl/ASTAdd.java
@@ -343,7 +343,7 @@ class ASTAdd
throw OgnlOps.castToRuntime( t );
}
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTAnd.java
b/src/main/java/org/apache/commons/ognl/ASTAnd.java
index 41585e4..ff21a5e 100644
--- a/src/main/java/org/apache/commons/ognl/ASTAnd.java
+++ b/src/main/java/org/apache/commons/ognl/ASTAnd.java
@@ -230,7 +230,7 @@ public class ASTAnd
return result;
}
-
+
/* (non-Javadoc)
* @see
org.apache.commons.ognl.Node#accept(org.apache.commons.ognl.NodeVisitor,
java.lang.Object)
*/
diff --git a/src/main/java/org/apache/commons/ognl/ASTAssign.java
b/src/main/java/org/apache/commons/ognl/ASTAssign.java
index 5992594..b394435 100644
--- a/src/main/java/org/apache/commons/ognl/ASTAssign.java
+++ b/src/main/java/org/apache/commons/ognl/ASTAssign.java
@@ -142,7 +142,7 @@ class ASTAssign
return result + value + ")";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
b/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
index 5f5928c..ea83d4f 100644
--- a/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
+++ b/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
@@ -60,7 +60,7 @@ class ASTBitAnd
{
return "(long)" + super.coerceToNumeric( source, context, child );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
b/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
index fb65132..ac91826 100644
--- a/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
+++ b/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
@@ -54,7 +54,7 @@ class ASTBitNegate
return "~(" + source + ")";
}
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTBitOr.java
b/src/main/java/org/apache/commons/ognl/ASTBitOr.java
index 17df92e..7eb3a42 100644
--- a/src/main/java/org/apache/commons/ognl/ASTBitOr.java
+++ b/src/main/java/org/apache/commons/ognl/ASTBitOr.java
@@ -55,7 +55,7 @@ class ASTBitOr
{
return "|";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTChain.java
b/src/main/java/org/apache/commons/ognl/ASTChain.java
index e0cc8ac..23026f9 100644
--- a/src/main/java/org/apache/commons/ognl/ASTChain.java
+++ b/src/main/java/org/apache/commons/ognl/ASTChain.java
@@ -131,7 +131,7 @@ public class ASTChain
if ( !handled )
{
result =
- OgnlRuntime.getIndexedProperty(
+ OgnlRuntime.getIndexedProperty(
context,
result,
propertyNode.getProperty( context,
result ).toString(),
@@ -221,7 +221,7 @@ public class ASTChain
else if ( !handled )
{
target =
- OgnlRuntime.getIndexedProperty(
+ OgnlRuntime.getIndexedProperty(
context,
target,
propertyNode.getProperty( context,
target ).toString(),
@@ -395,7 +395,7 @@ public class ASTChain
{
throw new UnsupportedCompilationException( "Can't compile nested
chain expressions." );
}
-
+
if ( target != null )
{
context.setCurrentObject( target );
@@ -433,7 +433,7 @@ public class ASTChain
{
constructor = true;
}
-
+
if ( NodeType.class.isInstance( children[i] )
&& ( (NodeType) children[i] ).getGetterClass() != null
)
{
@@ -467,7 +467,7 @@ public class ASTChain
{
result += value;
}
-
+
context.put( "_currentChain", result );
}
}
@@ -484,10 +484,10 @@ public class ASTChain
{
setterClass = lastType.getSetterClass();
}
-
+
return result;
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTConst.java
b/src/main/java/org/apache/commons/ognl/ASTConst.java
index 380d922..ef3693d 100644
--- a/src/main/java/org/apache/commons/ognl/ASTConst.java
+++ b/src/main/java/org/apache/commons/ognl/ASTConst.java
@@ -43,9 +43,9 @@ public class ASTConst
super( p, id );
}
- /**
+ /**
* Called from parser actions.
- * @param value the value to set
+ * @param value the value to set
*/
public void setValue( Object value )
{
@@ -75,7 +75,7 @@ public class ASTConst
{
return null;
}
-
+
return getterClass;
}
@@ -114,7 +114,7 @@ public class ASTConst
return value.toString();
}
else if ( !( parent != null
- && value != null
+ && value != null
&& NumericExpression.class.isAssignableFrom(
parent.getClass() ) )
&& String.class.isAssignableFrom( value.getClass() ) )
{
@@ -140,7 +140,7 @@ public class ASTConst
{
retval = "'" + OgnlOps.getEscapedChar( ( (Character) value
).charValue() ) + "'";
}
-
+
context.setCurrentObject( retval );
return retval.toString();
}
@@ -164,10 +164,10 @@ public class ASTConst
{
throw new UnsupportedCompilationException( "Can't modify constant
values." );
}
-
+
return toGetSourceString( context, target );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTCtor.java
b/src/main/java/org/apache/commons/ognl/ASTCtor.java
index 0c5abd6..17bfe4b 100644
--- a/src/main/java/org/apache/commons/ognl/ASTCtor.java
+++ b/src/main/java/org/apache/commons/ognl/ASTCtor.java
@@ -238,12 +238,12 @@ public class ASTCtor
{
cast = "";
}
-
+
if ( !ASTConst.class.isInstance( children[i] ) )
{
value = cast + value;
}
-
+
values[i] = objValue;
expressions[i] = value;
types[i] = context.getCurrentType();
@@ -274,8 +274,8 @@ public class ASTCtor
OgnlRuntime.getConstructors( clazz ), values,
new
Object[values.length] );
}
-
- if ( ctor == null )
+
+ if ( ctor == null )
{
throw new NoSuchMethodException(
"Unable to find constructor appropriate for
arguments in class: " + clazz );
@@ -322,7 +322,7 @@ public class ASTCtor
{
value =
"new "
- +
ExpressionCompiler.getCastString(
+ + ExpressionCompiler.getCastString(
OgnlRuntime.getPrimitiveWrapperClass( types[i] ) )
+ "(" + value + ")";
}
diff --git a/src/main/java/org/apache/commons/ognl/ASTDivide.java
b/src/main/java/org/apache/commons/ognl/ASTDivide.java
index 6f5449f..b74948e 100644
--- a/src/main/java/org/apache/commons/ognl/ASTDivide.java
+++ b/src/main/java/org/apache/commons/ognl/ASTDivide.java
@@ -48,7 +48,7 @@ class ASTDivide
return "/";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTEq.java
b/src/main/java/org/apache/commons/ognl/ASTEq.java
index b2aaca7..1479110 100644
--- a/src/main/java/org/apache/commons/ognl/ASTEq.java
+++ b/src/main/java/org/apache/commons/ognl/ASTEq.java
@@ -52,7 +52,7 @@ class ASTEq
{
return "org.apache.commons.ognl.OgnlOps.equal";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTEval.java
b/src/main/java/org/apache/commons/ognl/ASTEval.java
index 44ba694..f098a5a 100644
--- a/src/main/java/org/apache/commons/ognl/ASTEval.java
+++ b/src/main/java/org/apache/commons/ognl/ASTEval.java
@@ -86,7 +86,7 @@ class ASTEval
{
throw new UnsupportedCompilationException( "Map expressions not
supported as native java yet." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTGreater.java
b/src/main/java/org/apache/commons/ognl/ASTGreater.java
index 6f14837..00c9968 100644
--- a/src/main/java/org/apache/commons/ognl/ASTGreater.java
+++ b/src/main/java/org/apache/commons/ognl/ASTGreater.java
@@ -53,7 +53,7 @@ class ASTGreater
{
return "org.apache.commons.ognl.OgnlOps.greater";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
b/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
index 348eaef..fb3b606 100644
--- a/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
+++ b/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
@@ -52,7 +52,7 @@ class ASTGreaterEq
{
return "!org.apache.commons.ognl.OgnlOps.less";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTIn.java
b/src/main/java/org/apache/commons/ognl/ASTIn.java
index 8ebe91c..4c990b8 100644
--- a/src/main/java/org/apache/commons/ognl/ASTIn.java
+++ b/src/main/java/org/apache/commons/ognl/ASTIn.java
@@ -91,7 +91,7 @@ class ASTIn
{
throw new UnsupportedCompilationException( "Map expressions not
supported as native java yet." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
b/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
index ddfc72f..3b6b5d9 100644
--- a/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
+++ b/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
@@ -43,7 +43,7 @@ public class ASTInstanceof
this.targetType = targetType;
}
- String getTargetType()
+ String getTargetType()
{
return targetType;
}
@@ -95,7 +95,7 @@ public class ASTInstanceof
{
return toGetSourceString( context, target );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTLess.java
b/src/main/java/org/apache/commons/ognl/ASTLess.java
index c7e8ed7..fb8c8a4 100644
--- a/src/main/java/org/apache/commons/ognl/ASTLess.java
+++ b/src/main/java/org/apache/commons/ognl/ASTLess.java
@@ -53,7 +53,7 @@ class ASTLess
{
return "org.apache.commons.ognl.OgnlOps.less";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTLessEq.java
b/src/main/java/org/apache/commons/ognl/ASTLessEq.java
index e68ac33..2fd093b 100644
--- a/src/main/java/org/apache/commons/ognl/ASTLessEq.java
+++ b/src/main/java/org/apache/commons/ognl/ASTLessEq.java
@@ -53,7 +53,7 @@ class ASTLessEq
return "!org.apache.commons.ognl.OgnlOps.greater";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTList.java
b/src/main/java/org/apache/commons/ognl/ASTList.java
index 66f0707..9709c5d 100644
--- a/src/main/java/org/apache/commons/ognl/ASTList.java
+++ b/src/main/java/org/apache/commons/ognl/ASTList.java
@@ -123,7 +123,7 @@ public class ASTList
{
cast = "";
}
-
+
if ( !ASTConst.class.isInstance( children[i] ) )
{
value = cast + value;
@@ -219,7 +219,7 @@ public class ASTList
{
throw new UnsupportedCompilationException( "Can't generate setter for
ASTList." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTMultiply.java
b/src/main/java/org/apache/commons/ognl/ASTMultiply.java
index 808ad4e..ce7c986 100644
--- a/src/main/java/org/apache/commons/ognl/ASTMultiply.java
+++ b/src/main/java/org/apache/commons/ognl/ASTMultiply.java
@@ -56,7 +56,7 @@ class ASTMultiply
{
return "*";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTNegate.java
b/src/main/java/org/apache/commons/ognl/ASTNegate.java
index f2765a8..71161a2 100644
--- a/src/main/java/org/apache/commons/ognl/ASTNegate.java
+++ b/src/main/java/org/apache/commons/ognl/ASTNegate.java
@@ -54,7 +54,7 @@ class ASTNegate
return "-(" + source + ")";
}
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTNot.java
b/src/main/java/org/apache/commons/ognl/ASTNot.java
index 9927c83..52b6f1a 100644
--- a/src/main/java/org/apache/commons/ognl/ASTNot.java
+++ b/src/main/java/org/apache/commons/ognl/ASTNot.java
@@ -57,7 +57,7 @@ class ASTNot
{
srcString = "null";
}
-
+
context.setCurrentType( Boolean.TYPE );
return "(! org.apache.commons.ognl.OgnlOps.booleanValue(" +
srcString + ") )";
@@ -68,7 +68,7 @@ class ASTNot
throw OgnlOps.castToRuntime( t );
}
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTNotEq.java
b/src/main/java/org/apache/commons/ognl/ASTNotEq.java
index 9f59fae..e09dc7d 100644
--- a/src/main/java/org/apache/commons/ognl/ASTNotEq.java
+++ b/src/main/java/org/apache/commons/ognl/ASTNotEq.java
@@ -53,7 +53,7 @@ class ASTNotEq
{
return "!org.apache.commons.ognl.OgnlOps.equal";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTNotIn.java
b/src/main/java/org/apache/commons/ognl/ASTNotIn.java
index ba4b76a..d96e390 100644
--- a/src/main/java/org/apache/commons/ognl/ASTNotIn.java
+++ b/src/main/java/org/apache/commons/ognl/ASTNotIn.java
@@ -85,7 +85,7 @@ class ASTNotIn
throw OgnlOps.castToRuntime( t );
}
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTOr.java
b/src/main/java/org/apache/commons/ognl/ASTOr.java
index 7934e53..304352d 100644
--- a/src/main/java/org/apache/commons/ognl/ASTOr.java
+++ b/src/main/java/org/apache/commons/ognl/ASTOr.java
@@ -90,7 +90,7 @@ public class ASTOr
{
throw new UnsupportedCompilationException( "Can only compile
boolean expressions with two children." );
}
-
+
String result = "(";
try
@@ -101,7 +101,7 @@ public class ASTOr
{
first = OgnlRuntime.getCompiler( context
).createLocalReference( context, first, context.getCurrentType() );
}
-
+
Class firstType = context.getCurrentType();
String second = OgnlRuntime.getChildSource( context, target,
children[1] );
@@ -109,7 +109,7 @@ public class ASTOr
{
second = OgnlRuntime.getCompiler( context
).createLocalReference( context, second, context.getCurrentType() );
}
-
+
Class secondType = context.getCurrentType();
boolean mismatched =
@@ -146,13 +146,13 @@ public class ASTOr
{
throw new UnsupportedCompilationException( "Can only compile
boolean expressions with two children." );
}
-
+
String pre = (String) context.get( "_currentChain" );
if ( pre == null )
{
pre = "";
}
-
+
String result = "";
try
@@ -197,7 +197,7 @@ public class ASTOr
return result;
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTProject.java
b/src/main/java/org/apache/commons/ognl/ASTProject.java
index 7230714..b0973e8 100644
--- a/src/main/java/org/apache/commons/ognl/ASTProject.java
+++ b/src/main/java/org/apache/commons/ognl/ASTProject.java
@@ -68,7 +68,7 @@ class ASTProject
{
throw new UnsupportedCompilationException( "Projection expressions not
supported as native java yet." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTRemainder.java
b/src/main/java/org/apache/commons/ognl/ASTRemainder.java
index 00a27c8..b1aaea1 100644
--- a/src/main/java/org/apache/commons/ognl/ASTRemainder.java
+++ b/src/main/java/org/apache/commons/ognl/ASTRemainder.java
@@ -47,7 +47,7 @@ class ASTRemainder
{
return "%";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
b/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
index c630415..7dc07f5 100644
--- a/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
+++ b/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
@@ -55,7 +55,7 @@ public class ASTRootVarRef
{
getterClass = target.getClass();
}
-
+
if ( getterClass != null )
{
@@ -83,7 +83,7 @@ public class ASTRootVarRef
return "$3";
}
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTSelect.java
b/src/main/java/org/apache/commons/ognl/ASTSelect.java
index 75e6d82..f2c5515 100644
--- a/src/main/java/org/apache/commons/ognl/ASTSelect.java
+++ b/src/main/java/org/apache/commons/ognl/ASTSelect.java
@@ -72,7 +72,7 @@ class ASTSelect
{
throw new UnsupportedCompilationException( "Eval expressions not
supported as native java yet." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
b/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
index 2ce21ed..948e2d0 100644
--- a/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
+++ b/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
@@ -70,7 +70,7 @@ class ASTSelectFirst
{
throw new UnsupportedCompilationException( "Eval expressions not
supported as native java yet." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
b/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
index bce7de2..33297f2 100644
--- a/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
+++ b/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
@@ -70,7 +70,7 @@ class ASTSelectLast
{
throw new UnsupportedCompilationException( "Eval expressions not
supported as native java yet." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTSequence.java
b/src/main/java/org/apache/commons/ognl/ASTSequence.java
index b2bd571..4f4d4f6 100644
--- a/src/main/java/org/apache/commons/ognl/ASTSequence.java
+++ b/src/main/java/org/apache/commons/ognl/ASTSequence.java
@@ -122,7 +122,7 @@ public class ASTSequence
{
pre = "";
}
-
+
seqValue =
ExpressionCompiler.getRootExpression( children[i],
context.getRoot(), context ) + pre + seqValue;
context.setCurrentAccessor( context.getRoot().getClass() );
@@ -157,7 +157,7 @@ public class ASTSequence
return result;
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
b/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
index 06a289c..113d61b 100644
--- a/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
+++ b/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
@@ -47,7 +47,7 @@ class ASTShiftLeft
{
return "<<";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
b/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
index b1cf854..f5de697 100644
--- a/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
+++ b/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
@@ -47,7 +47,7 @@ class ASTShiftRight
{
return ">>";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTStaticField.java
b/src/main/java/org/apache/commons/ognl/ASTStaticField.java
index c39ed58..231e904 100644
--- a/src/main/java/org/apache/commons/ognl/ASTStaticField.java
+++ b/src/main/java/org/apache/commons/ognl/ASTStaticField.java
@@ -109,7 +109,7 @@ public class ASTStaticField
{
throw new OgnlException( "Could not get static field " + fieldName
+ " from class " + className, cause );
}
-
+
return result;
}
@@ -209,7 +209,7 @@ public class ASTStaticField
return className + "." + fieldName;
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTSubtract.java
b/src/main/java/org/apache/commons/ognl/ASTSubtract.java
index b725946..da84eef 100644
--- a/src/main/java/org/apache/commons/ognl/ASTSubtract.java
+++ b/src/main/java/org/apache/commons/ognl/ASTSubtract.java
@@ -47,7 +47,7 @@ class ASTSubtract
{
return "-";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTTest.java
b/src/main/java/org/apache/commons/ognl/ASTTest.java
index b47c916..0d9ead9 100644
--- a/src/main/java/org/apache/commons/ognl/ASTTest.java
+++ b/src/main/java/org/apache/commons/ognl/ASTTest.java
@@ -64,13 +64,13 @@ class ASTTest
{
throw new UnsupportedCompilationException( "evaluation resulted in
null expression." );
}
-
+
if ( children.length != 3 )
{
throw new UnsupportedCompilationException( "Can only compile test
expressions with two children."
+ children.length );
}
-
+
String result = "";
try
@@ -81,7 +81,7 @@ class ASTTest
{
first = OgnlRuntime.getCompiler( context
).createLocalReference( context, first, context.getCurrentType() );
}
-
+
if ( ExpressionNode.class.isInstance( children[0] ) )
{
first = "(" + first + ")";
@@ -94,7 +94,7 @@ class ASTTest
{
second = OgnlRuntime.getCompiler( context
).createLocalReference( context, second, context.getCurrentType() );
}
-
+
if ( ExpressionNode.class.isInstance( children[1] ) )
{
second = "(" + second + ")";
@@ -106,9 +106,9 @@ class ASTTest
if ( !OgnlRuntime.isBoolean( third ) &&
!context.getCurrentType().isPrimitive() )
{
third = OgnlRuntime.getCompiler( context
).createLocalReference( context, third, context.getCurrentType() );
-
+
}
-
+
if ( ExpressionNode.class.isInstance( children[2] ) )
{
third = "(" + third + ")";
@@ -144,7 +144,7 @@ class ASTTest
throw OgnlOps.castToRuntime( t );
}
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java
b/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java
index db934d7..dd9b13a 100644
--- a/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java
+++ b/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java
@@ -59,7 +59,7 @@ public class ASTThisVarRef
{
throw new UnsupportedCompilationException( "Unable to compile this
references." );
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
b/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
index 1cda285..037d29b 100644
--- a/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
+++ b/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
@@ -83,7 +83,7 @@ class ASTUnsignedShiftRight
return result;
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ASTVarRef.java
b/src/main/java/org/apache/commons/ognl/ASTVarRef.java
index 4d56faf..28f8c2d 100644
--- a/src/main/java/org/apache/commons/ognl/ASTVarRef.java
+++ b/src/main/java/org/apache/commons/ognl/ASTVarRef.java
@@ -115,7 +115,7 @@ public class ASTVarRef
{
throw new UnsupportedCompilationException( "Current context object
is null, can't compile var reference." );
}
-
+
String pre = "";
String post = "";
if ( context.getCurrentType() != null )
diff --git a/src/main/java/org/apache/commons/ognl/ASTXor.java
b/src/main/java/org/apache/commons/ognl/ASTXor.java
index 4e11c0c..7c9ed1e 100644
--- a/src/main/java/org/apache/commons/ognl/ASTXor.java
+++ b/src/main/java/org/apache/commons/ognl/ASTXor.java
@@ -55,7 +55,7 @@ class ASTXor
{
return "^";
}
-
+
public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
throws OgnlException
{
diff --git a/src/main/java/org/apache/commons/ognl/ClassCacheInspector.java
b/src/main/java/org/apache/commons/ognl/ClassCacheInspector.java
index 4161daf..bd61132 100644
--- a/src/main/java/org/apache/commons/ognl/ClassCacheInspector.java
+++ b/src/main/java/org/apache/commons/ognl/ClassCacheInspector.java
@@ -28,7 +28,7 @@ public interface ClassCacheInspector
/**
* Invoked just before storing a class type within a cache instance.
- *
+ *
* @param type The class that is to be stored.
* @return True if the class can be cached, false otherwise.
*/
diff --git a/src/main/java/org/apache/commons/ognl/ElementsAccessor.java
b/src/main/java/org/apache/commons/ognl/ElementsAccessor.java
index 3f5cf18..973cfdd 100644
--- a/src/main/java/org/apache/commons/ognl/ElementsAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/ElementsAccessor.java
@@ -33,7 +33,7 @@ public interface ElementsAccessor
{
/**
* Returns an iterator over the elements of the given target object.
- *
+ *
* @param target the object to get the elements of
* @return an iterator over the elements of the given object
* @throws OgnlException if there is an error getting the given object's
elements
diff --git a/src/main/java/org/apache/commons/ognl/MethodAccessor.java
b/src/main/java/org/apache/commons/ognl/MethodAccessor.java
index 8150ba7..6353c09 100644
--- a/src/main/java/org/apache/commons/ognl/MethodAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/MethodAccessor.java
@@ -29,7 +29,7 @@ public interface MethodAccessor
{
/**
* Calls the static method named with the arguments given on the class
given.
- *
+ *
* @param context expression context in which the method should be called
* @param targetClass the object in which the method exists
* @param methodName the name of the method
@@ -42,7 +42,7 @@ public interface MethodAccessor
/**
* Calls the method named with the arguments given.
- *
+ *
* @param context expression context in which the method should be called
* @param target the object in which the method exists
* @param methodName the name of the method
diff --git a/src/main/java/org/apache/commons/ognl/Node.java
b/src/main/java/org/apache/commons/ognl/Node.java
index 5cc3d15..6ab0b5c 100644
--- a/src/main/java/org/apache/commons/ognl/Node.java
+++ b/src/main/java/org/apache/commons/ognl/Node.java
@@ -77,14 +77,14 @@ public interface Node
/**
* Gets the compiled bytecode enhanced expression accessor for
getting/setting values.
- *
+ *
* @return The accessor for this node, or null if none has been compiled
for it.
*/
ExpressionAccessor getAccessor();
/**
* Sets a new compiled accessor for this node expression.
- *
+ *
* @param accessor The compiled representation of this node.
*/
void setAccessor( ExpressionAccessor accessor );
diff --git a/src/main/java/org/apache/commons/ognl/NodeType.java
b/src/main/java/org/apache/commons/ognl/NodeType.java
index 6b28dc8..cd6847e 100644
--- a/src/main/java/org/apache/commons/ognl/NodeType.java
+++ b/src/main/java/org/apache/commons/ognl/NodeType.java
@@ -27,14 +27,14 @@ public interface NodeType
{
/**
* The type returned from the expression - if any.
- *
+ *
* @return The type.
*/
Class<?> getGetterClass();
/**
* The type used to set the value - if any.
- *
+ *
* @return The type.
*/
Class<?> getSetterClass();
diff --git
a/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
b/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
index 7d5096b..7dd000e 100644
--- a/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
+++ b/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
* IndexedPropertyDescriptor this allows the "key" to be an arbitrary object
rather than just an int. Consequently it
* does not have a "readMethod" or "writeMethod" because it only expects a
pattern like:
* </p>
- *
+ *
* <pre>
* public void set<i>Property</i>(<i>KeyType</i>, <i>ValueType</i>);
* public <i>ValueType</i> get<i>Property</i>(<i>KeyType</i>);
@@ -42,12 +42,12 @@ import java.lang.reflect.Method;
* <p>
* For example, if an object were to have methods that accessed and
"attributes" property it would be natural to index
* them by String rather than by integer and expose the attributes as a map
with a different property name:
- *
+ *
* <pre>
* public void setAttribute( String name, Object value );
- *
+ *
* public Object getAttribute( String name );
- *
+ *
* public Map getAttributes();
* </pre>
* <p>
diff --git a/src/main/java/org/apache/commons/ognl/Ognl.java
b/src/main/java/org/apache/commons/ognl/Ognl.java
index 1d1ed1f..16616f7 100644
--- a/src/main/java/org/apache/commons/ognl/Ognl.java
+++ b/src/main/java/org/apache/commons/ognl/Ognl.java
@@ -32,9 +32,9 @@ import java.util.Map;
* The simplest use of the Ognl class is to get the value of an expression
from an object, without extra context or
* pre-parsing.
* </p>
- *
+ *
* <pre>
- *
+ *
* import org.apache.commons.ognl.Ognl;
* import org.apache.commons.ognl.OgnlException;
* ...
@@ -46,7 +46,7 @@ import java.util.Map;
* {
* // Report error or recover
* }
- *
+ *
* </pre>
* <p>
* This will parse the expression given and evaluate it against the root
object given, returning the result. If there is
@@ -68,9 +68,9 @@ import java.util.Map;
* Here is an example that shows how to extract the <code>documentName</code>
property out of the root object and append
* a string with the current user name in parens:
* </p>
- *
+ *
* <pre>
- *
+ *
* private Map<String, Object> context = new HashMap<String,
Object>();
* ...
* public void setUserName( String value )
@@ -88,7 +88,7 @@ import java.util.Map;
* {
* // Report error or recover
* }
- *
+ *
* </pre>
*/
public abstract class Ognl
@@ -97,7 +97,7 @@ public abstract class Ognl
/**
* Parses the given OGNL expression and returns a tree representation of
the expression that can be used by
* <code>Ognl</code> static methods.
- *
+ *
* @param expression the OGNL expression to be parsed
* @return a tree representation of the expression
* @throws ExpressionSyntaxException if the expression is malformed
@@ -125,7 +125,7 @@ public abstract class Ognl
* Parses and compiles the given expression using the {@link
org.apache.commons.ognl.enhance.OgnlExpressionCompiler}
* returned from
* {@link org.apache.commons.ognl.OgnlRuntime#getCompiler(OgnlContext)}.
- *
+ *
* @param context The context to use.
* @param root The root object for the given expression.
* @param expression The expression to compile.
@@ -148,7 +148,7 @@ public abstract class Ognl
/**
* Creates and returns a new standard naming context for evaluating an
OGNL expression.
- *
+ *
* @param root the root of the object graph
* @return a new Map with the keys <code>root</code> and
<code>context</code> set appropriately
*/
@@ -159,7 +159,7 @@ public abstract class Ognl
/**
* Creates and returns a new standard naming context for evaluating an
OGNL expression.
- *
+ *
* @param root The root of the object graph.
* @param classResolver The resolver used to instantiate {@link Class}
instances referenced in the expression.
* @return a new OgnlContext with the keys <code>root</code> and
<code>context</code> set appropriately
@@ -171,7 +171,7 @@ public abstract class Ognl
/**
* Creates and returns a new standard naming context for evaluating an
OGNL expression.
- *
+ *
* @param root The root of the object graph.
* @param classResolver The resolver used to instantiate {@link Class}
instances referenced in the expression.
* @param converter Converter used to convert return types of an
expression in to their desired types.
@@ -185,7 +185,7 @@ public abstract class Ognl
/**
* Creates and returns a new standard naming context for evaluating an
OGNL expression.
- *
+ *
* @param root The root of the object graph.
* @param classResolver The resolver used to instantiate {@link Class}
instances referenced in the expression.
* @param converter Converter used to convert return types of an
expression in to their desired types.
@@ -202,7 +202,7 @@ public abstract class Ognl
/**
* Appends the standard naming context for evaluating an OGNL expression
into the context given so that cached maps
* can be used as a context.
- *
+ *
* @param root the root of the object graph
* @param context the context to which OGNL context will be added.
* @return Context Map with the keys <code>root</code> and
<code>context</code> set appropriately
@@ -215,7 +215,7 @@ public abstract class Ognl
/**
* Appends the standard naming context for evaluating an OGNL expression
into the context given so that cached maps
* can be used as a context.
- *
+ *
* @param root The root of the object graph.
* @param classResolver The resolver used to instantiate {@link Class}
instances referenced in the expression.
* @param context The context to which OGNL context will be added.
@@ -230,7 +230,7 @@ public abstract class Ognl
/**
* Appends the standard naming context for evaluating an OGNL expression
into the context given so that cached maps
* can be used as a context.
- *
+ *
* @param root The root of the object graph.
* @param classResolver The resolver used to instantiate {@link Class}
instances referenced in the expression.
* @param converter Converter used to convert return types of an
expression in to their desired types.
@@ -246,7 +246,7 @@ public abstract class Ognl
/**
* Appends the standard naming context for evaluating an OGNL expression
into the context given so that cached maps
* can be used as a context.
- *
+ *
* @param root the root of the object graph
* @param classResolver The class loading resolver that should be used to
resolve class references.
* @param converter The type converter to be used by default.
@@ -290,7 +290,7 @@ public abstract class Ognl
/**
* Configures the {@link ClassResolver} to use for the given context. Will
be used during expression parsing /
* execution to resolve class names.
- *
+ *
* @param context The context to place the resolver.
* @param classResolver The resolver to use to resolve classes.
*/
@@ -301,7 +301,7 @@ public abstract class Ognl
/**
* Gets the previously stored {@link ClassResolver} for the given context
- if any.
- *
+ *
* @param context The context to get the configured resolver from.
* @return The resolver instance, or null if none found.
*/
@@ -313,7 +313,7 @@ public abstract class Ognl
/**
* Configures the type converter to use for a given context. This will be
used to convert into / out of various java
* class types.
- *
+ *
* @param context The context to configure it for.
* @param converter The converter to use.
*/
@@ -324,7 +324,7 @@ public abstract class Ognl
/**
* Gets the currently configured {@link TypeConverter} for the given
context - if any.
- *
+ *
* @param context The context to get the converter from.
* @return The converter - or null if none found.
*/
@@ -336,7 +336,7 @@ public abstract class Ognl
/**
* Configures the specified context with a {@link MemberAccess} instance
for handling field/method protection
* levels.
- *
+ *
* @param context The context to configure.
* @param memberAccess The access resolver to configure the context with.
*/
@@ -347,7 +347,7 @@ public abstract class Ognl
/**
* Gets the currently stored {@link MemberAccess} object for the given
context - if any.
- *
+ *
* @param context The context to get the object from.
* @return The configured {@link MemberAccess} instance in the specified
context - or null if none found.
*/
@@ -359,7 +359,7 @@ public abstract class Ognl
/**
* Sets the root object to use for all expressions in the given context -
doesn't necessarily replace root object
* instances explicitly passed in to other expression resolving methods on
this class.
- *
+ *
* @param context The context to store the root object in.
* @param root The root object.
*/
@@ -370,7 +370,7 @@ public abstract class Ognl
/**
* Gets the stored root object for the given context - if any.
- *
+ *
* @param context The context to get the root object from.
* @return The root object - or null if none found.
*/
@@ -381,7 +381,7 @@ public abstract class Ognl
/**
* Gets the last {@link Evaluation} executed on the given context.
- *
+ *
* @param context The context to get the evaluation from.
* @return The {@link Evaluation} - or null if none was found.
*/
@@ -393,7 +393,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression tree to extract a value from the
given root object. The default context is
* set for the given context and root via <code>addDefaultContext()</code>.
- *
+ *
* @param tree the OGNL expression tree to evaluate, as returned by
parseExpression()
* @param context the naming context for the evaluation
* @param root the root object for the OGNL expression
@@ -412,7 +412,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression tree to extract a value from the
given root object. The default context is
* set for the given context and root via <code>addDefaultContext()</code>.
- *
+ *
* @param tree the OGNL expression tree to evaluate, as returned by
parseExpression()
* @param context the naming context for the evaluation
* @param root the root object for the OGNL expression
@@ -450,7 +450,7 @@ public abstract class Ognl
/**
* Gets the value represented by the given pre-compiled expression on the
specified root object.
- *
+ *
* @param expression The pre-compiled expression, as found in {@link
Node#getAccessor()}.
* @param context The ognl context.
* @param root The object to retrieve the expression value from.
@@ -464,7 +464,7 @@ public abstract class Ognl
/**
* Gets the value represented by the given pre-compiled expression on the
specified root object.
- *
+ *
* @param expression The pre-compiled expression, as found in {@link
Node#getAccessor()}.
* @param context The ognl context.
* @param root The object to retrieve the expression value from.
@@ -481,7 +481,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression to extract a value from the given
root object in a given context
- *
+ *
* @see #parseExpression(String)
* @see #getValue(Object,Object)
* @param expression the OGNL expression to be parsed
@@ -501,7 +501,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression to extract a value from the given
root object in a given context
- *
+ *
* @see #parseExpression(String)
* @see #getValue(Object,Object)
* @param expression the OGNL expression to be parsed
@@ -522,7 +522,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression tree to extract a value from the
given root object.
- *
+ *
* @param tree the OGNL expression tree to evaluate, as returned by
parseExpression()
* @param root the root object for the OGNL expression
* @return the result of evaluating the expression
@@ -539,7 +539,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression tree to extract a value from the
given root object.
- *
+ *
* @param tree the OGNL expression tree to evaluate, as returned by
parseExpression()
* @param root the root object for the OGNL expression
* @param resultType the converted type of the resultant object, using the
context's type converter
@@ -557,7 +557,7 @@ public abstract class Ognl
/**
* Convenience method that combines calls to <code> parseExpression
</code> and <code> getValue</code>.
- *
+ *
* @see #parseExpression(String)
* @see #getValue(Object,Object)
* @param expression the OGNL expression to be parsed
@@ -577,7 +577,7 @@ public abstract class Ognl
/**
* Convenience method that combines calls to <code> parseExpression
</code> and <code> getValue</code>.
- *
+ *
* @see #parseExpression(String)
* @see #getValue(Object,Object)
* @param expression the OGNL expression to be parsed
@@ -599,7 +599,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression tree to insert a value into the
object graph rooted at the given root object.
* The default context is set for the given context and root via
<code>addDefaultContext()</code>.
- *
+ *
* @param tree the OGNL expression tree to evaluate, as returned by
parseExpression()
* @param context the naming context for the evaluation
* @param root the root object for the OGNL expression
@@ -626,7 +626,7 @@ public abstract class Ognl
/**
* Sets the value given using the pre-compiled expression on the specified
root object.
- *
+ *
* @param expression The pre-compiled expression, as found in {@link
Node#getAccessor()}.
* @param context The ognl context.
* @param root The object to set the expression value on.
@@ -640,7 +640,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression to insert a value into the object
graph rooted at the given root object given
* the context.
- *
+ *
* @param expression the OGNL expression to be parsed
* @param root the root object for the OGNL expression
* @param context the naming context for the evaluation
@@ -658,7 +658,7 @@ public abstract class Ognl
/**
* Evaluates the given OGNL expression tree to insert a value into the
object graph rooted at the given root object.
- *
+ *
* @param tree the OGNL expression tree to evaluate, as returned by
parseExpression()
* @param root the root object for the OGNL expression
* @param value the value to insert into the object graph
@@ -675,7 +675,7 @@ public abstract class Ognl
/**
* Convenience method that combines calls to <code> parseExpression
</code> and <code> setValue</code>.
- *
+ *
* @see #parseExpression(String)
* @see #setValue(Object,Object,Object)
* @param expression the OGNL expression to be parsed
@@ -695,7 +695,7 @@ public abstract class Ognl
/**
* Checks if the specified {@link Node} instance represents a constant
expression.
- *
+ *
* @param tree The {@link Node} to check.
* @param context The context to use.
* @return True if the node is a constant - false otherwise.
@@ -709,7 +709,7 @@ public abstract class Ognl
/**
* Checks if the specified expression represents a constant expression.
- *
+ *
* @param expression The expression to check.
* @param context The context to use.
* @return True if the node is a constant - false otherwise.
@@ -723,7 +723,7 @@ public abstract class Ognl
/**
* Same as {@link #isConstant(Object, java.util.Map)} - only the {@link
Map} context is created for you.
- *
+ *
* @param tree The {@link Node} to check.
* @return True if the node represents a constant expression - false
otherwise.
* @throws OgnlException If an exception occurs.
@@ -736,7 +736,7 @@ public abstract class Ognl
/**
* Same as {@link #isConstant(String, java.util.Map)} - only the {@link
Map} instance is created for you.
- *
+ *
* @param expression The expression to check.
* @return True if the expression represents a constant - false otherwise.
* @throws OgnlException If an exception occurs.
diff --git a/src/main/java/org/apache/commons/ognl/OgnlContext.java
b/src/main/java/org/apache/commons/ognl/OgnlContext.java
index ddf7143..6a61ba3 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlContext.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlContext.java
@@ -344,7 +344,7 @@ public class OgnlContext
/**
* Gets the current class type being evaluated on the stack, as set by
{@link #setCurrentType(Class)}.
- *
+ *
* @return The current object type, may be null.
*/
public Class<?> getCurrentType()
@@ -365,7 +365,7 @@ public class OgnlContext
/**
* Represents the last known object type on the evaluation stack, will be
the value of the last known
* {@link #getCurrentType()}.
- *
+ *
* @return The previous type of object on the stack, may be null.
*/
public Class<?> getPreviousType()
diff --git a/src/main/java/org/apache/commons/ognl/OgnlException.java
b/src/main/java/org/apache/commons/ognl/OgnlException.java
index 82deb81..3aea0a9 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlException.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlException.java
@@ -52,7 +52,7 @@ public class OgnlException
/**
* Why this exception was thrown.
- *
+ *
* @serial
*/
private final Throwable reason;
@@ -65,7 +65,7 @@ public class OgnlException
/**
* Constructs an OgnlException with the given message but no encapsulated
exception.
- *
+ *
* @param msg the exception's detail message
*/
public OgnlException( String msg )
@@ -75,7 +75,7 @@ public class OgnlException
/**
* Constructs an OgnlException with the given message and encapsulated
exception.
- *
+ *
* @param msg the exception's detail message
* @param reason the encapsulated exception
*/
@@ -99,7 +99,7 @@ public class OgnlException
/**
* Returns the encapsulated exception, or null if there is none.
- *
+ *
* @return the encapsulated exception
*/
public Throwable getReason()
@@ -109,7 +109,7 @@ public class OgnlException
/**
* Returns the Evaluation that was the root evaluation when the exception
was thrown.
- *
+ *
* @return The {@link Evaluation}.
*/
public Evaluation getEvaluation()
@@ -119,7 +119,7 @@ public class OgnlException
/**
* Sets the Evaluation that was current when this exception was thrown.
- *
+ *
* @param value The {@link Evaluation}.
*/
public void setEvaluation( Evaluation value )
@@ -129,7 +129,7 @@ public class OgnlException
/**
* Returns a string representation of this exception.
- *
+ *
* @return a string representation of this exception
*/
@Override
diff --git a/src/main/java/org/apache/commons/ognl/OgnlOps.java
b/src/main/java/org/apache/commons/ognl/OgnlOps.java
index a527b91..c75ed2f 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlOps.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlOps.java
@@ -40,7 +40,7 @@ public abstract class OgnlOps
* Comparable and the types are compatible (i.e. v1 is of the same or
superclass of v2's type) they are compared
* with Comparable.compareTo(). If both values are non-numeric and not
Comparable or of incompatible classes this
* will throw and IllegalArgumentException.
- *
+ *
* @param v1 First value to compare
* @param v2 second value to compare
* @return integer describing the comparison between the two objects. A
negative number indicates that v1 < v2.
@@ -102,7 +102,7 @@ public abstract class OgnlOps
/**
* Returns true if object1 is equal to object2 in either the sense that
they are the same object or, if both are
* non-null if they are equal in the <CODE>equals()</CODE> sense.
- *
+ *
* @param object1 First object to compare
* @param object2 Second object to compare
* @return true if v1 == v2
@@ -171,7 +171,7 @@ public abstract class OgnlOps
/**
* Evaluates the given object as a boolean: if it is a Boolean object,
it's easy; if it's a Number or a Character,
* returns true for non-zero objects; and otherwise returns true for
non-null objects.
- *
+ *
* @param value an object to interpret as a boolean
* @return the boolean value implied by the given object
*/
@@ -200,7 +200,7 @@ public abstract class OgnlOps
/**
* Evaluates the given object as a long integer.
- *
+ *
* @param value an object to interpret as a long integer
* @return the long integer value implied by the given object
* @throws NumberFormatException if the given object can't be understood
as a long integer
@@ -229,7 +229,7 @@ public abstract class OgnlOps
/**
* Evaluates the given object as a double-precision floating-point number.
- *
+ *
* @param value an object to interpret as a double
* @return the double value implied by the given object
* @throws NumberFormatException if the given object can't be understood
as a double
@@ -260,7 +260,7 @@ public abstract class OgnlOps
/**
* Evaluates the given object as a BigInteger.
- *
+ *
* @param value an object to interpret as a BigInteger
* @return the BigInteger value implied by the given object
* @throws NumberFormatException if the given object can't be understood
as a BigInteger
@@ -297,7 +297,7 @@ public abstract class OgnlOps
/**
* Evaluates the given object as a BigDecimal.
- *
+ *
* @param value an object to interpret as a BigDecimal
* @return the BigDecimal value implied by the given object
* @throws NumberFormatException if the given object can't be understood
as a BigDecimal
@@ -330,7 +330,7 @@ public abstract class OgnlOps
/**
* Evaluates the given object as a String and trims it if the trim flag is
true.
- *
+ *
* @param value an object to interpret as a String
* @param trim if true trims the result
* @return the String value implied by the given object as returned by the
toString() method, or "null" if the
@@ -357,7 +357,7 @@ public abstract class OgnlOps
/**
* Evaluates the given object as a String.
- *
+ *
* @param value an object to interpret as a String
* @return the String value implied by the given object as returned by the
toString() method, or "null" if the
* object is null.
@@ -369,7 +369,7 @@ public abstract class OgnlOps
/**
* Returns a constant from the NumericTypes interface that represents the
numeric type of the given object.
- *
+ *
* @param value an object that needs to be interpreted as a number
* @return the appropriate constant from the NumericTypes interface
*/
@@ -597,7 +597,7 @@ public abstract class OgnlOps
/**
* Returns the value converted numerically to the given class type This
method also detects when arrays are being
* converted and converts the components of one array to the type of the
other.
- *
+ *
* @param value an object to be converted to the given type
* @param toType class type to be converted to
* @return converted value of the type given, or value if the value cannot
be converted to the given type.
@@ -785,7 +785,7 @@ public abstract class OgnlOps
* <li>{@link Number} instances have their intValue() methods invoked.</li>
* <li>All other types result in calling
Integer.parseInt(value.toString());</li>
* </ul>
- *
+ *
* @param value The object to get the value of.
* @return A valid integer.
*/
@@ -817,7 +817,7 @@ public abstract class OgnlOps
/**
* Returns the constant from the NumericTypes interface that best
expresses the type of a numeric operation on the
* two given objects.
- *
+ *
* @param v1 one argument to a numeric operator
* @param v2 the other argument
* @return the appropriate constant from the NumericTypes interface
@@ -830,7 +830,7 @@ public abstract class OgnlOps
/**
* Returns the constant from the NumericTypes interface that best
expresses the type of an operation, which can be
* either numeric or not, on the two given types.
- *
+ *
* @param t1 type of one argument to an operator
* @param t2 type of the other argument
* @param canBeNonNumeric whether the operator can be interpreted as
non-numeric
@@ -894,7 +894,7 @@ public abstract class OgnlOps
/**
* Returns the constant from the NumericTypes interface that best
expresses the type of an operation, which can be
* either numeric or not, on the two given objects.
- *
+ *
* @param v1 one argument to an operator
* @param v2 the other argument
* @param canBeNonNumeric whether the operator can be interpreted as
non-numeric
@@ -908,7 +908,7 @@ public abstract class OgnlOps
/**
* Returns a new Number object of an appropriate type to hold the given
integer value. The type of the returned
* object is consistent with the given type argument, which is a constant
from the NumericTypes interface.
- *
+ *
* @param type the nominal numeric type of the result, a constant from the
NumericTypes interface
* @param value the integer value to convert to a Number object
* @return a Number object with the given value, of type implied by the
type argument
@@ -952,7 +952,7 @@ public abstract class OgnlOps
* Returns a new Number object of an appropriate type to hold the given
real value. The type of the returned object
* is always either Float or Double, and is only Float if the given type
tag (a constant from the NumericTypes
* interface) is FLOAT.
- *
+ *
* @param type the nominal numeric type of the result, a constant from the
NumericTypes interface
* @param value the real value to convert to a Number object
* @return a Number object with the given value, of type implied by the
type argument
@@ -1290,7 +1290,7 @@ public abstract class OgnlOps
/**
* Utility method that converts incoming exceptions to {@link
RuntimeException} instances - or casts them if they
* already are.
- *
+ *
* @param t The exception to cast.
* @return The exception cast to a {@link RuntimeException}.
*/
diff --git a/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
b/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
index 05e6878..53fac20 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
@@ -700,7 +700,7 @@ public class OgnlRuntime
public static boolean getConvertedTypes( OgnlContext context, Object
target, Member member, String propertyName,
Class<?>[] parameterTypes,
Object[] args, Object[] newArgs )
-
+
{
boolean result = false;
@@ -736,7 +736,7 @@ public class OgnlRuntime
public static Method getConvertedMethodAndArgs( OgnlContext context,
Object target, String propertyName,
List<Method> methods,
Object[] args, Object[] newArgs )
-
+
{
Method convertedMethod = null;
TypeConverter typeConverter = context.getTypeConverter();
@@ -762,7 +762,7 @@ public class OgnlRuntime
public static Constructor<?> getConvertedConstructorAndArgs( OgnlContext
context, Object target,
List<Constructor<?>> constructors, Object[] args,
Object[]
newArgs )
-
+
{
Constructor<?> constructor = null;
TypeConverter typeConverter = context.getTypeConverter();
@@ -799,7 +799,7 @@ public class OgnlRuntime
*/
public static Method getAppropriateMethod( OgnlContext context, Object
source, Object target, String propertyName,
List<Method> methods, Object[]
args, Object[] actualArgs )
-
+
{
Method appropriateMethod = null;
Class<?>[] resultParameterTypes = null;
diff --git a/src/main/java/org/apache/commons/ognl/PropertyAccessor.java
b/src/main/java/org/apache/commons/ognl/PropertyAccessor.java
index f2213f9..c4840fa 100644
--- a/src/main/java/org/apache/commons/ognl/PropertyAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/PropertyAccessor.java
@@ -40,7 +40,7 @@ public interface PropertyAccessor
/**
* Extracts and returns the property of the given name from the given
target object.
- *
+ *
* @param context The current execution context.
* @param target the object to get the property from
* @param name the name of the property to get.
@@ -52,7 +52,7 @@ public interface PropertyAccessor
/**
* Sets the value of the property of the given name in the given target
object.
- *
+ *
* @param context The current execution context.
* @param target the object to set the property in
* @param name the name of the property to set
@@ -65,7 +65,7 @@ public interface PropertyAccessor
/**
* Returns a java string representing the textual method that should be
called to access a particular element. (ie
* "get")
- *
+ *
* @param context The current execution context.
* @param target The current object target on the expression tree being
evaluated.
* @param index The index object that will be placed inside the string to
access the value.
@@ -76,7 +76,7 @@ public interface PropertyAccessor
/**
* Returns a java string representing the textual method that should be
called to set a particular element. (ie
* "set")
- *
+ *
* @param context The current execution context.
* @param target The current object target on the expression tree being
evaluated.
* @param index The index object that will be placed inside the string to
set the value.
diff --git
a/src/main/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java
b/src/main/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java
index 99092f7..7b51efc 100644
--- a/src/main/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java
@@ -32,7 +32,7 @@ public interface ExpressionAccessor
/**
* Gets the value represented by this expression path, if any.
- *
+ *
* @param context The standard ognl context used for variable
substitution/etc.
* @param target The root object this expression is meant for.
* @return The evaluated value, if any.
@@ -41,7 +41,7 @@ public interface ExpressionAccessor
/**
* Sets the value represented by this expression path, if possible.
- *
+ *
* @param context The standard ognl context used for variable
substitution/etc.
* @param target The root object this expression is meant for.
* @param value The new value to set if this expression references a
settable property.
@@ -51,7 +51,7 @@ public interface ExpressionAccessor
/**
* Used to set the original root expression node on instances where the
compiled version has to fall back to
* interpreted syntax because of compilation failures.
- *
+ *
* @param expression The root expression node used to generate this
accessor.
*/
void setExpression( Node expression );
diff --git
a/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
b/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
index 1e1d7f2..e74fe11 100644
--- a/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
+++ b/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
@@ -88,7 +88,7 @@ public class ExpressionCompiler
* store the cast java source string in to the current {@link
org.apache.commons.ognl.OgnlContext}. This will either
* add to the existing string present if it already exists or create a new
instance and store it using the static
* key of {@link #PRE_CAST}.
- *
+ *
* @param context The current execution context.
* @param cast The java source string to store in to the context.
*/
@@ -114,7 +114,7 @@ public class ExpressionCompiler
* For instance, if given an {@link Integer} object the string
<code>"java.lang.Integer"</code> would be returned.
* For an array of primitive ints <code>"int[]"</code> and so on..
* </p>
- *
+ *
* @param type The class to cast a string expression for.
* @return The converted raw string version of the class name.
*/
@@ -132,7 +132,7 @@ public class ExpressionCompiler
* Convenience method called by many different property/method resolving
AST types to get a root expression
* resolving string for the given node. The callers are mostly ignorant
and rely on this method to properly
* determine if the expression should be cast at all and take the
appropriate actions if it should.
- *
+ *
* @param expression The node to check and generate a root expression to
if necessary.
* @param root The root object for this execution.
* @param context The current execution context.
@@ -326,7 +326,7 @@ public class ExpressionCompiler
/**
* Helper utility method used by compiler to help resolve class->method
mappings during method calls to
* {@link
OgnlExpressionCompiler#getSuperOrInterfaceClass(java.lang.reflect.Method,
Class)}.
- *
+ *
* @param m The method to check for existance of.
* @param clazz The class to check for the existance of a matching method
definition to the method passed in.
* @return True if the class contains the specified method, false
otherwise.
@@ -744,7 +744,7 @@ public class ExpressionCompiler
/**
* Fail safe getter creation when normal compilation fails.
- *
+ *
* @param clazz The javassist class the new method should be attached to.
* @param valueGetter The method definition the generated code will be
contained within.
* @param node The root expression node.
@@ -765,7 +765,7 @@ public class ExpressionCompiler
/**
* Fail safe setter creation when normal compilation fails.
- *
+ *
* @param clazz The javassist class the new method should be attached to.
* @param valueSetter The method definition the generated code will be
contained within.
* @param node The root expression node.
@@ -787,7 +787,7 @@ public class ExpressionCompiler
/**
* Creates a {@link ClassLoader} instance compatible with the javassist
classloader and normal OGNL class resolving
* semantics.
- *
+ *
* @param context The current execution context.
* @return The created {@link ClassLoader} instance.
*/
@@ -810,7 +810,7 @@ public class ExpressionCompiler
/**
* Loads a new class definition via javassist for the specified class.
- *
+ *
* @param searchClass The class to load.
* @return The javassist class equivalent.
* @throws javassist.NotFoundException When the class definition can't be
found.
@@ -825,7 +825,7 @@ public class ExpressionCompiler
* Gets either a new or existing {@link ClassPool} for use in compiling
javassist classes. A new class path object
* is inserted in to the returned {@link ClassPool} using the passed in
<code>loader</code> instance if a new pool
* needs to be created.
- *
+ *
* @param context The current execution context.
* @param loader The {@link ClassLoader} instance to use - as returned by
* {@link #getClassLoader(org.apache.commons.ognl.OgnlContext)}.
diff --git a/src/main/java/org/apache/commons/ognl/enhance/LocalReference.java
b/src/main/java/org/apache/commons/ognl/enhance/LocalReference.java
index 5b8173b..57a9be3 100644
--- a/src/main/java/org/apache/commons/ognl/enhance/LocalReference.java
+++ b/src/main/java/org/apache/commons/ognl/enhance/LocalReference.java
@@ -27,21 +27,21 @@ public interface LocalReference
/**
* The name of the assigned variable reference.
- *
+ *
* @return The name of the reference as it will be when compiled.
*/
String getName();
/**
* The expression that sets the value, ie the part after <code><class
type> refName = <expression></code>.
- *
+ *
* @return The setting expression.
*/
String getExpression();
/**
* The type of reference.
- *
+ *
* @return The type.
*/
Class<?> getType();
diff --git
a/src/main/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java
b/src/main/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java
index e9a713a..3ef9255 100644
--- a/src/main/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java
+++ b/src/main/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java
@@ -39,7 +39,7 @@ public interface OgnlExpressionCompiler
* thrown by the method or the statement wasn't compilable in this
instance because of missing/null objects in the
* expression. These instances may in some cases continue to call this
compilation method until the expression is
* resolvable.
- *
+ *
* @param context The context of execution.
* @param expression The pre-parsed root expression node to compile.
* @param root The root object for the expression - may be null in many
instances so some implementations may exit
@@ -52,7 +52,7 @@ public interface OgnlExpressionCompiler
/**
* Gets a javassist safe class string for the given class instance. This
is especially useful for handling array vs.
* normal class casting strings.
- *
+ *
* @param clazz The class to get a string equivalent javassist compatible
string reference for.
* @return The string equivalent of the class.
*/
@@ -63,7 +63,7 @@ public interface OgnlExpressionCompiler
* possible because the method isn't known for a class. Attempts to upcast
the given class to the next available
* non-private accessible class so that compiled expressions can reference
the interface class of an instance so as
* not to be compiled in to overly specific statements.
- *
+ *
* @param clazz The class to attempt to find a compatible interface for.
* @return The same class if no higher level interface could be matched
against or the interface equivalent class.
*/
@@ -71,7 +71,7 @@ public interface OgnlExpressionCompiler
/**
* For the given {@link Method} and class finds the highest level
interface class this combination can be cast to.
- *
+ *
* @param m The method the class must implement.
* @param clazz The current class being worked with.
* @return The highest level interface / class that the referenced {@link
Method} is declared in.
@@ -82,7 +82,7 @@ public interface OgnlExpressionCompiler
* For a given root object type returns the base class type to be used in
root referenced expressions. This helps in
* some instances where the root objects themselves are compiled javassist
instances that need more generic class
* equivalents to cast to.
- *
+ *
* @param rootNode The root expression node.
* @param context The current execution context.
* @return The root expression class type to cast to for this node.
@@ -97,7 +97,7 @@ public interface OgnlExpressionCompiler
* {@link org.apache.commons.ognl.OgnlContext#getCurrentAccessor()}
methods to inspect the type stack and properly
* cast to the right classes - but only when necessary.
* </p>
- *
+ *
* @param context The current execution context.
* @param expression The node being checked for casting.
* @param body The java source string generated by the given node.
@@ -114,7 +114,7 @@ public interface OgnlExpressionCompiler
* sufficiently complicated sub expression blocks can be broken out in to
distinct methods to be referenced by the
* core accessor / setter methods in the base compiled root object.
* </p>
- *
+ *
* @param context The current execution context.
* @param expression The java source expression to dump in to a seperate
method reference.
* @param type The return type that should be specified for the new method.
diff --git a/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
b/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
index b03e8c0..70ee790 100644
--- a/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
+++ b/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
@@ -30,14 +30,14 @@ public interface OrderedReturn
/**
* Get the core expression to execute first before any return foo logic is
started.
- *
+ *
* @return The core standalone expression that shouldn't be pre-pended
with a return keyword.
*/
String getCoreExpression();
/**
* Gets the last expression to be pre-pended with a return
<expression> block.
- *
+ *
* @return The expression representing the return portion of a statement;
*/
String getLastExpression();
diff --git
a/src/main/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java
b/src/main/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java
index f780390..24f9a72 100644
---
a/src/main/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java
+++
b/src/main/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java
@@ -31,7 +31,7 @@ public class UnsupportedCompilationException
{
/**
- *
+ *
*/
private static final long serialVersionUID = 4961625077128174947L;
diff --git
a/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
b/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
index e4a5793..84a98a6 100644
--- a/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
+++ b/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
@@ -3,19 +3,19 @@ package org.apache.commons.ognl.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
* under the License.
*/
diff --git
a/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
b/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
index 255fd84..a9d26ee 100644
---
a/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
+++
b/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
@@ -3,19 +3,19 @@ package org.apache.commons.ognl.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
* under the License.
*/
diff --git a/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java
b/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java
index 8fe631a..d69c7ab 100644
--- a/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java
+++ b/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java
@@ -3,19 +3,19 @@ package org.apache.commons.ognl.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
* under the License.
*/
diff --git
a/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java
b/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java
index 30974c4..fe28b26 100644
--- a/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java
+++ b/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java
@@ -3,19 +3,19 @@ package org.apache.commons.ognl.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
* under the License.
*/
diff --git
a/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java
b/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java
index c7640a6..81209d9 100644
---
a/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java
+++
b/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java
@@ -3,19 +3,19 @@ package org.apache.commons.ognl.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
* under the License.
*/
diff --git
a/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java
b/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java
index 3fd4292..68086c4 100644
---
a/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java
+++
b/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java
@@ -3,19 +3,19 @@ package org.apache.commons.ognl.internal.entry;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
* under the License.
*/
diff --git
a/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java
b/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java
index b1bff70..868e963 100644
--- a/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java
@@ -18,7 +18,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.commons.ognl.test;
diff --git
a/src/test/java/org/apache/commons/ognl/test/NullStringCatenationTest.java
b/src/test/java/org/apache/commons/ognl/test/NullStringCatenationTest.java
index 6ff2094..8408c2d 100644
--- a/src/test/java/org/apache/commons/ognl/test/NullStringCatenationTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NullStringCatenationTest.java
@@ -48,14 +48,14 @@ public class NullStringCatenationTest
{ ROOT, "'width:' + width + ';'", "width:238px;" },
{ ROOT, "theLong + '_' + index", "4_1" },
{ ROOT, "'javascript:' +
@org.apache.commons.ognl.test.NullStringCatenationTest@MESSAGE",
"javascript:blarney" },
- { ROOT, "printDelivery ? '' : 'javascript:deliverySelected(' +
property.carrier + ',' + currentDeliveryId + ')'", "" },
- { ROOT, "bean2.id + '_' + theInt", "1_6" }
+ { ROOT, "printDelivery ? '' : 'javascript:deliverySelected(' +
property.carrier + ',' + currentDeliveryId + ')'", "" },
+ { ROOT, "bean2.id + '_' + theInt", "1_6" }
};
-
+
/**
* Setup parameters for this test which are used to call this class
constructor
- * @return the collection of paramaters
+ * @return the collection of paramaters
*/
@Parameters
public static Collection<Object[]> data()
@@ -76,7 +76,7 @@ public class NullStringCatenationTest
/**
* Constructor: size of the Object[] returned by the @Parameter annotated
method must match
- * the number of arguments in this constructor
+ * the number of arguments in this constructor
*/
public NullStringCatenationTest( String name, Object root, String
expressionString, Object expectedResult)
{
diff --git
a/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
b/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
index 0db0a0a..cf2dfb6 100644
---
a/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
+++
b/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
@@ -18,7 +18,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.commons.ognl.test.objects;
diff --git
a/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderImpl.java
b/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderImpl.java
index 2c5f9ac..85d31cc 100644
--- a/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderImpl.java
+++ b/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderImpl.java
@@ -18,7 +18,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.commons.ognl.test.objects;
diff --git a/src/test/java/org/apache/commons/ognl/test/objects/FirstBean.java
b/src/test/java/org/apache/commons/ognl/test/objects/FirstBean.java
index e139e4e..4c1918e 100644
--- a/src/test/java/org/apache/commons/ognl/test/objects/FirstBean.java
+++ b/src/test/java/org/apache/commons/ognl/test/objects/FirstBean.java
@@ -18,7 +18,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.commons.ognl.test.objects;
diff --git a/src/test/java/org/apache/commons/ognl/test/objects/SecondBean.java
b/src/test/java/org/apache/commons/ognl/test/objects/SecondBean.java
index dd5e001..93eec04 100644
--- a/src/test/java/org/apache/commons/ognl/test/objects/SecondBean.java
+++ b/src/test/java/org/apache/commons/ognl/test/objects/SecondBean.java
@@ -18,7 +18,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.commons.ognl.test.objects;
