Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D6C36404 for ; Sat, 14 May 2011 13:19:40 +0000 (UTC) Received: (qmail 65021 invoked by uid 500); 14 May 2011 13:19:39 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 64969 invoked by uid 500); 14 May 2011 13:19:39 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 64962 invoked by uid 99); 14 May 2011 13:19:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 May 2011 13:19:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 May 2011 13:19:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E95CB2388C10; Sat, 14 May 2011 13:18:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1103095 [10/24] - in /incubator/ognl/trunk/src: main/java/org/apache/commons/ognl/ main/java/org/apache/commons/ognl/enhance/ main/java/org/apache/commons/ognl/internal/ test/java/org/apache/commons/ognl/ test/java/org/apache/commons/ognl/... Date: Sat, 14 May 2011 13:18:36 -0000 To: commits@commons.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110514131839.E95CB2388C10@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java?rev=1103095&r1=1103094&r2=1103095&view=diff ============================================================================== --- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java (original) +++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java Sat May 14 13:18:29 2011 @@ -21,23 +21,29 @@ package org.apache.commons.ognl; import java.lang.reflect.Method; - /** * Superclass for OGNL exceptions, incorporating an optional encapsulated exception. - * + * * @author Luke Blanshard (blanshlu@netscape.net) * @author Drew Davidson (drew@ognl.org) */ -public class OgnlException extends Exception +public class OgnlException + extends Exception { // cache initCause method - if available..to be used during throwable constructor // to properly setup superclass. static Method _initCause; - static { - try { - _initCause = OgnlException.class.getMethod("initCause", new Class[] { Throwable.class}); - } catch (NoSuchMethodException e) { /** ignore */ } + static + { + try + { + _initCause = OgnlException.class.getMethod( "initCause", new Class[] { Throwable.class } ); + } + catch ( NoSuchMethodException e ) + { + /** ignore */ + } } /** @@ -47,6 +53,7 @@ public class OgnlException extends Excep /** * Why this exception was thrown. + * * @serial */ private Throwable _reason; @@ -59,6 +66,7 @@ public class OgnlException extends Excep /** * Constructs an OgnlException with the given message but no encapsulated exception. + * * @param msg the exception's detail message */ public OgnlException( String msg ) @@ -68,24 +76,31 @@ public class OgnlException extends Excep /** * Constructs an OgnlException with the given message and encapsulated exception. - * @param msg the exception's detail message - * @param reason the encapsulated exception + * + * @param msg the exception's detail message + * @param reason the encapsulated exception */ public OgnlException( String msg, Throwable reason ) { super( msg ); this._reason = reason; - if (_initCause != null) + if ( _initCause != null ) { - try { - _initCause.invoke(this, new Object[] { reason }); - } catch (Exception t) { /** ignore */ } + try + { + _initCause.invoke( this, new Object[] { reason } ); + } + catch ( Exception t ) + { + /** ignore */ + } } } /** * Returns the encapsulated exception, or null if there is none. + * * @return the encapsulated exception */ public Throwable getReason() @@ -94,8 +109,8 @@ public class OgnlException extends Excep } /** - * Returns the Evaluation that was the root evaluation when the exception was - * thrown. + * Returns the Evaluation that was the root evaluation when the exception was thrown. + * * @return The {@link Evaluation}. */ public Evaluation getEvaluation() @@ -105,16 +120,17 @@ public class OgnlException extends Excep /** * Sets the Evaluation that was current when this exception was thrown. - * + * * @param value The {@link Evaluation}. */ - public void setEvaluation(Evaluation value) + public void setEvaluation( Evaluation value ) { _evaluation = value; } /** * Returns a string representation of this exception. + * * @return a string representation of this exception */ public String toString() @@ -125,10 +141,8 @@ public class OgnlException extends Excep return super.toString() + " [" + _reason + "]"; } - /** - * Prints the stack trace for this (and possibly the encapsulated) exception on - * System.err. + * Prints the stack trace for this (and possibly the encapsulated) exception on System.err. */ public void printStackTrace() { @@ -136,34 +150,34 @@ public class OgnlException extends Excep } /** - * Prints the stack trace for this (and possibly the encapsulated) exception on the - * given print stream. + * Prints the stack trace for this (and possibly the encapsulated) exception on the given print stream. */ - public void printStackTrace(java.io.PrintStream s) + public void printStackTrace( java.io.PrintStream s ) { - synchronized (s) + synchronized ( s ) { - super.printStackTrace(s); - if ( _reason != null ) { - s.println( "/-- Encapsulated exception ------------\\" ); - _reason.printStackTrace(s); + super.printStackTrace( s ); + if ( _reason != null ) + { + s.println( "/-- Encapsulated exception ------------\\" ); + _reason.printStackTrace( s ); s.println( "\\--------------------------------------/" ); } } } /** - * Prints the stack trace for this (and possibly the encapsulated) exception on the - * given print writer. + * Prints the stack trace for this (and possibly the encapsulated) exception on the given print writer. */ - public void printStackTrace(java.io.PrintWriter s) + public void printStackTrace( java.io.PrintWriter s ) { - synchronized (s) + synchronized ( s ) { - super.printStackTrace(s); - if ( _reason != null ) { - s.println( "/-- Encapsulated exception ------------\\" ); - _reason.printStackTrace(s); + super.printStackTrace( s ); + if ( _reason != null ) + { + s.println( "/-- Encapsulated exception ------------\\" ); + _reason.printStackTrace( s ); s.println( "\\--------------------------------------/" ); } } Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlInvokePermission.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlInvokePermission.java?rev=1103095&r1=1103094&r2=1103095&view=diff ============================================================================== --- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlInvokePermission.java (original) +++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlInvokePermission.java Sat May 14 13:18:29 2011 @@ -22,24 +22,23 @@ package org.apache.commons.ognl; import java.security.*; /** - * BasicPermission subclass that defines a permission token for invoking - * methods within OGNL. This does not override any methods (except - * constructors) and does not implement actions. It is similar in spirit - * to the {@link java.lang.reflect.ReflectPermission} class in that it - * guards access to methods. + * BasicPermission subclass that defines a permission token for invoking methods within OGNL. This does not override any + * methods (except constructors) and does not implement actions. It is similar in spirit to the + * {@link java.lang.reflect.ReflectPermission} class in that it guards access to methods. + * * @author Luke Blanshard (blanshlu@netscape.net) * @author Drew Davidson (drew@ognl.org) */ -public class OgnlInvokePermission extends BasicPermission +public class OgnlInvokePermission + extends BasicPermission { - public OgnlInvokePermission(String name) + public OgnlInvokePermission( String name ) { - super(name); + super( name ); } - public OgnlInvokePermission(String name, String actions) + public OgnlInvokePermission( String name, String actions ) { - super(name, actions); + super( name, actions ); } } - Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java?rev=1103095&r1=1103094&r2=1103095&view=diff ============================================================================== --- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java (original) +++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java Sat May 14 13:18:29 2011 @@ -32,265 +32,290 @@ import java.util.Enumeration; * @author Luke Blanshard (blanshlu@netscape.net) * @author Drew Davidson (drew@ognl.org) */ -public abstract class OgnlOps implements NumericTypes +public abstract class OgnlOps + implements NumericTypes { /** - * Compares two objects for equality, even if it has to convert one of them to the other type. - * If both objects are numeric they are converted to the widest type and compared. If one is - * non-numeric and one is numeric the non-numeric is converted to double and compared to the - * double numeric value. If both are non-numeric and 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. Positive indicates that v1 > v2. Zero indicates v1 == v2. - * @throws IllegalArgumentException - * if the objects are both non-numeric yet of incompatible types or do not implement - * Comparable. + * Compares two objects for equality, even if it has to convert one of them to the other type. If both objects are + * numeric they are converted to the widest type and compared. If one is non-numeric and one is numeric the + * non-numeric is converted to double and compared to the double numeric value. If both are non-numeric and + * 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. + * Positive indicates that v1 > v2. Zero indicates v1 == v2. + * @throws IllegalArgumentException if the objects are both non-numeric yet of incompatible types or do not + * implement Comparable. */ - public static int compareWithConversion(Object v1, Object v2) + public static int compareWithConversion( Object v1, Object v2 ) { int result; - if (v1 == v2) { + if ( v1 == v2 ) + { result = 0; - } else { - int t1 = getNumericType(v1), t2 = getNumericType(v2), type = getNumericType(t1, t2, true); - - switch(type) { - case BIGINT: - result = bigIntValue(v1).compareTo(bigIntValue(v2)); - break; - - case BIGDEC: - result = bigDecValue(v1).compareTo(bigDecValue(v2)); - break; + } + else + { + int t1 = getNumericType( v1 ), t2 = getNumericType( v2 ), type = getNumericType( t1, t2, true ); - case NONNUMERIC: - if ((t1 == NONNUMERIC) && (t2 == NONNUMERIC)) { - if ((v1 instanceof Comparable) && v1.getClass().isAssignableFrom(v2.getClass())) { - result = ((Comparable) v1).compareTo(v2); - break; - } else { - throw new IllegalArgumentException("invalid comparison: " + v1.getClass().getName() + " and " - + v2.getClass().getName()); + switch ( type ) + { + case BIGINT: + result = bigIntValue( v1 ).compareTo( bigIntValue( v2 ) ); + break; + + case BIGDEC: + result = bigDecValue( v1 ).compareTo( bigDecValue( v2 ) ); + break; + + case NONNUMERIC: + if ( ( t1 == NONNUMERIC ) && ( t2 == NONNUMERIC ) ) + { + if ( ( v1 instanceof Comparable ) && v1.getClass().isAssignableFrom( v2.getClass() ) ) + { + result = ( (Comparable) v1 ).compareTo( v2 ); + break; + } + else + { + throw new IllegalArgumentException( "invalid comparison: " + v1.getClass().getName() + + " and " + v2.getClass().getName() ); + } } - } - // else fall through - case FLOAT: - case DOUBLE: - double dv1 = doubleValue(v1), - dv2 = doubleValue(v2); - - return (dv1 == dv2) ? 0 : ((dv1 < dv2) ? -1 : 1); + // else fall through + case FLOAT: + case DOUBLE: + double dv1 = doubleValue( v1 ), + dv2 = doubleValue( v2 ); + + return ( dv1 == dv2 ) ? 0 : ( ( dv1 < dv2 ) ? -1 : 1 ); + + default: + long lv1 = longValue( v1 ), + lv2 = longValue( v2 ); - default: - long lv1 = longValue(v1), - lv2 = longValue(v2); - - return (lv1 == lv2) ? 0 : ((lv1 < lv2) ? -1 : 1); + return ( lv1 == lv2 ) ? 0 : ( ( lv1 < lv2 ) ? -1 : 1 ); } } return result; } /** - * 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 equals() sense. + * 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 equals() sense. * - * @param object1 - * First object to compare - * @param object2 - * Second object to compare + * @param object1 First object to compare + * @param object2 Second object to compare * @return true if v1 == v2 */ - public static boolean isEqual(Object object1, Object object2) + public static boolean isEqual( Object object1, Object object2 ) { boolean result = false; - if (object1 == object2) { + if ( object1 == object2 ) + { result = true; - } else { - if ((object1 != null) && object1.getClass().isArray()) { - if ((object2 != null) && object2.getClass().isArray() && (object2.getClass() == object1.getClass())) { - result = (Array.getLength(object1) == Array.getLength(object2)); - if (result) { - for(int i = 0, icount = Array.getLength(object1); result && (i < icount); i++) { - result = isEqual(Array.get(object1, i), Array.get(object2, i)); + } + else + { + if ( ( object1 != null ) && object1.getClass().isArray() ) + { + if ( ( object2 != null ) && object2.getClass().isArray() && ( object2.getClass() == object1.getClass() ) ) + { + result = ( Array.getLength( object1 ) == Array.getLength( object2 ) ); + if ( result ) + { + for ( int i = 0, icount = Array.getLength( object1 ); result && ( i < icount ); i++ ) + { + result = isEqual( Array.get( object1, i ), Array.get( object2, i ) ); } } } - } else { + } + else + { // Check for converted equivalence first, then equals() equivalence - result = (object1 != null) && (object2 != null) - && (object1.equals(object2) || (compareWithConversion(object1, object2) == 0)); + result = + ( object1 != null ) && ( object2 != null ) + && ( object1.equals( object2 ) || ( compareWithConversion( object1, object2 ) == 0 ) ); } } return result; } - - public static boolean booleanValue(boolean value) + + public static boolean booleanValue( boolean value ) { return value; } - - public static boolean booleanValue(int value) + + public static boolean booleanValue( int value ) { return value > 0; } - - public static boolean booleanValue(float value) + + public static boolean booleanValue( float value ) { return value > 0; } - - public static boolean booleanValue(long value) + + public static boolean booleanValue( long value ) { return value > 0; } - - public static boolean booleanValue(double value) + + public static boolean booleanValue( double value ) { return value > 0; } - + /** - * 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. + * 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 + * @param value an object to interpret as a boolean * @return the boolean value implied by the given object */ - public static boolean booleanValue(Object value) + public static boolean booleanValue( Object value ) { - if (value == null) + if ( value == null ) return false; Class c = value.getClass(); - if (c == Boolean.class) - return ((Boolean) value).booleanValue(); + if ( c == Boolean.class ) + return ( (Boolean) value ).booleanValue(); // if ( c == String.class ) // return ((String)value).length() > 0; - if (c == Character.class) - return ((Character) value).charValue() != 0; - if (value instanceof Number) - return ((Number) value).doubleValue() != 0; - + if ( c == Character.class ) + return ( (Character) value ).charValue() != 0; + if ( value instanceof Number ) + return ( (Number) value ).doubleValue() != 0; + return true; // non-null } /** * Evaluates the given object as a long integer. * - * @param value - * an object to interpret 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 + * @throws NumberFormatException if the given object can't be understood as a long integer */ - public static long longValue(Object value) + public static long longValue( Object value ) throws NumberFormatException { - if (value == null) return 0L; + if ( value == null ) + return 0L; Class c = value.getClass(); - if (c.getSuperclass() == Number.class) return ((Number) value).longValue(); - if (c == Boolean.class) return ((Boolean) value).booleanValue() ? 1 : 0; - if (c == Character.class) return ((Character) value).charValue(); - return Long.parseLong(stringValue(value, true)); + if ( c.getSuperclass() == Number.class ) + return ( (Number) value ).longValue(); + if ( c == Boolean.class ) + return ( (Boolean) value ).booleanValue() ? 1 : 0; + if ( c == Character.class ) + return ( (Character) value ).charValue(); + return Long.parseLong( stringValue( value, true ) ); } /** * Evaluates the given object as a double-precision floating-point number. * - * @param value - * an object to interpret as a double + * @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 + * @throws NumberFormatException if the given object can't be understood as a double */ - public static double doubleValue(Object value) + public static double doubleValue( Object value ) throws NumberFormatException { - if (value == null) return 0.0; + if ( value == null ) + return 0.0; Class c = value.getClass(); - if (c.getSuperclass() == Number.class) return ((Number) value).doubleValue(); - if (c == Boolean.class) return ((Boolean) value).booleanValue() ? 1 : 0; - if (c == Character.class) return ((Character) value).charValue(); - String s = stringValue(value, true); + if ( c.getSuperclass() == Number.class ) + return ( (Number) value ).doubleValue(); + if ( c == Boolean.class ) + return ( (Boolean) value ).booleanValue() ? 1 : 0; + if ( c == Character.class ) + return ( (Character) value ).charValue(); + String s = stringValue( value, true ); - return (s.length() == 0) ? 0.0 : Double.parseDouble(s); + return ( s.length() == 0 ) ? 0.0 : Double.parseDouble( s ); } /** * Evaluates the given object as a BigInteger. * - * @param value - * an object to interpret 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 + * @throws NumberFormatException if the given object can't be understood as a BigInteger */ - public static BigInteger bigIntValue(Object value) + public static BigInteger bigIntValue( Object value ) throws NumberFormatException { - if (value == null) return BigInteger.valueOf(0L); + if ( value == null ) + return BigInteger.valueOf( 0L ); Class c = value.getClass(); - if (c == BigInteger.class) return (BigInteger) value; - if (c == BigDecimal.class) return ((BigDecimal) value).toBigInteger(); - if (c.getSuperclass() == Number.class) return BigInteger.valueOf(((Number) value).longValue()); - if (c == Boolean.class) return BigInteger.valueOf(((Boolean) value).booleanValue() ? 1 : 0); - if (c == Character.class) return BigInteger.valueOf(((Character) value).charValue()); - return new BigInteger(stringValue(value, true)); + if ( c == BigInteger.class ) + return (BigInteger) value; + if ( c == BigDecimal.class ) + return ( (BigDecimal) value ).toBigInteger(); + if ( c.getSuperclass() == Number.class ) + return BigInteger.valueOf( ( (Number) value ).longValue() ); + if ( c == Boolean.class ) + return BigInteger.valueOf( ( (Boolean) value ).booleanValue() ? 1 : 0 ); + if ( c == Character.class ) + return BigInteger.valueOf( ( (Character) value ).charValue() ); + return new BigInteger( stringValue( value, true ) ); } /** * Evaluates the given object as a BigDecimal. * - * @param value - * an object to interpret 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 + * @throws NumberFormatException if the given object can't be understood as a BigDecimal */ - public static BigDecimal bigDecValue(Object value) + public static BigDecimal bigDecValue( Object value ) throws NumberFormatException { - if (value == null) return BigDecimal.valueOf(0L); + if ( value == null ) + return BigDecimal.valueOf( 0L ); Class c = value.getClass(); - if (c == BigDecimal.class) return (BigDecimal) value; - if (c == BigInteger.class) return new BigDecimal((BigInteger) value); - if (c == Boolean.class) return BigDecimal.valueOf(((Boolean) value).booleanValue() ? 1 : 0); - if (c == Character.class) return BigDecimal.valueOf(((Character) value).charValue()); - return new BigDecimal(stringValue(value, true)); + if ( c == BigDecimal.class ) + return (BigDecimal) value; + if ( c == BigInteger.class ) + return new BigDecimal( (BigInteger) value ); + if ( c == Boolean.class ) + return BigDecimal.valueOf( ( (Boolean) value ).booleanValue() ? 1 : 0 ); + if ( c == Character.class ) + return BigDecimal.valueOf( ( (Character) value ).charValue() ); + return new BigDecimal( stringValue( value, true ) ); } /** * 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 - * @return the String value implied by the given object as returned by the toString() method, or - * "null" if the object is null. + * @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. */ - public static String stringValue(Object value, boolean trim) + public static String stringValue( Object value, boolean trim ) { String result; - if (value == null) { + if ( value == null ) + { result = OgnlRuntime.NULL_STRING; - } else { + } + else + { result = value.toString(); - if (trim) { + if ( trim ) + { result = result.trim(); } } @@ -300,301 +325,336 @@ public abstract class OgnlOps implements /** * 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. + * @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. */ - public static String stringValue(Object value) + public static String stringValue( Object value ) { - return stringValue(value, false); + return stringValue( value, false ); } /** - * Returns a constant from the NumericTypes interface that represents the numeric type of the - * given object. + * 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 + * @param value an object that needs to be interpreted as a number * @return the appropriate constant from the NumericTypes interface */ - public static int getNumericType(Object value) + public static int getNumericType( Object value ) { - if (value != null) { + if ( value != null ) + { Class c = value.getClass(); - if (c == Integer.class) return INT; - if (c == Double.class) return DOUBLE; - if (c == Boolean.class) return BOOL; - if (c == Byte.class) return BYTE; - if (c == Character.class) return CHAR; - if (c == Short.class) return SHORT; - if (c == Long.class) return LONG; - if (c == Float.class) return FLOAT; - if (c == BigInteger.class) return BIGINT; - if (c == BigDecimal.class) return BIGDEC; + if ( c == Integer.class ) + return INT; + if ( c == Double.class ) + return DOUBLE; + if ( c == Boolean.class ) + return BOOL; + if ( c == Byte.class ) + return BYTE; + if ( c == Character.class ) + return CHAR; + if ( c == Short.class ) + return SHORT; + if ( c == Long.class ) + return LONG; + if ( c == Float.class ) + return FLOAT; + if ( c == BigInteger.class ) + return BIGINT; + if ( c == BigDecimal.class ) + return BIGDEC; } return NONNUMERIC; } - public static Object toArray(char value, Class toType) + public static Object toArray( char value, Class toType ) { - return toArray(new Character(value), toType); + return toArray( new Character( value ), toType ); } - public static Object toArray(byte value, Class toType) + public static Object toArray( byte value, Class toType ) { - return toArray(new Byte(value), toType); + return toArray( new Byte( value ), toType ); } - public static Object toArray(int value, Class toType) + public static Object toArray( int value, Class toType ) { - return toArray(new Integer(value), toType); + return toArray( new Integer( value ), toType ); } - public static Object toArray(long value, Class toType) + public static Object toArray( long value, Class toType ) { - return toArray(new Long(value), toType); + return toArray( new Long( value ), toType ); } - public static Object toArray(float value, Class toType) + public static Object toArray( float value, Class toType ) { - return toArray(new Float(value), toType); + return toArray( new Float( value ), toType ); } - public static Object toArray(double value, Class toType) + public static Object toArray( double value, Class toType ) { - return toArray(new Double(value), toType); + return toArray( new Double( value ), toType ); } - public static Object toArray(boolean value, Class toType) + public static Object toArray( boolean value, Class toType ) { - return toArray(new Boolean(value), toType); + return toArray( new Boolean( value ), toType ); } - public static Object convertValue(char value, Class toType) + public static Object convertValue( char value, Class toType ) { - return convertValue(new Character(value), toType); + return convertValue( new Character( value ), toType ); } - - public static Object convertValue(byte value, Class toType) + + public static Object convertValue( byte value, Class toType ) { - return convertValue(new Byte(value), toType); + return convertValue( new Byte( value ), toType ); } - - public static Object convertValue(int value, Class toType) + + public static Object convertValue( int value, Class toType ) { - return convertValue(new Integer(value), toType); + return convertValue( new Integer( value ), toType ); } - - public static Object convertValue(long value, Class toType) + + public static Object convertValue( long value, Class toType ) { - return convertValue(new Long(value), toType); + return convertValue( new Long( value ), toType ); } - - public static Object convertValue(float value, Class toType) + + public static Object convertValue( float value, Class toType ) { - return convertValue(new Float(value), toType); + return convertValue( new Float( value ), toType ); } - - public static Object convertValue(double value, Class toType) + + public static Object convertValue( double value, Class toType ) { - return convertValue(new Double(value), toType); + return convertValue( new Double( value ), toType ); } - - public static Object convertValue(boolean value, Class toType) + + public static Object convertValue( boolean value, Class toType ) { - return convertValue(new Boolean(value), toType); + return convertValue( new Boolean( value ), toType ); } - - //////////////////////////////////////////////////////////////// - - public static Object convertValue(char value, Class toType, boolean preventNull) + + // ////////////////////////////////////////////////////////////// + + public static Object convertValue( char value, Class toType, boolean preventNull ) { - return convertValue(new Character(value), toType, preventNull); + return convertValue( new Character( value ), toType, preventNull ); } - - public static Object convertValue(byte value, Class toType, boolean preventNull) + + public static Object convertValue( byte value, Class toType, boolean preventNull ) { - return convertValue(new Byte(value), toType, preventNull); + return convertValue( new Byte( value ), toType, preventNull ); } - - public static Object convertValue(int value, Class toType, boolean preventNull) + + public static Object convertValue( int value, Class toType, boolean preventNull ) { - return convertValue(new Integer(value), toType, preventNull); + return convertValue( new Integer( value ), toType, preventNull ); } - - public static Object convertValue(long value, Class toType, boolean preventNull) + + public static Object convertValue( long value, Class toType, boolean preventNull ) { - return convertValue(new Long(value), toType, preventNull); + return convertValue( new Long( value ), toType, preventNull ); } - - public static Object convertValue(float value, Class toType, boolean preventNull) + + public static Object convertValue( float value, Class toType, boolean preventNull ) { - return convertValue(new Float(value), toType, preventNull); + return convertValue( new Float( value ), toType, preventNull ); } - - public static Object convertValue(double value, Class toType, boolean preventNull) + + public static Object convertValue( double value, Class toType, boolean preventNull ) { - return convertValue(new Double(value), toType, preventNull); + return convertValue( new Double( value ), toType, preventNull ); } - - public static Object convertValue(boolean value, Class toType, boolean preventNull) + + public static Object convertValue( boolean value, Class toType, boolean preventNull ) { - return convertValue(new Boolean(value), toType, preventNull); + return convertValue( new Boolean( value ), toType, preventNull ); } - ///////////////////////////////////////////////////////////////// - + // /////////////////////////////////////////////////////////////// - public static Object toArray(char value, Class toType, boolean preventNull) + public static Object toArray( char value, Class toType, boolean preventNull ) { - return toArray(new Character(value), toType, preventNull); + return toArray( new Character( value ), toType, preventNull ); } - public static Object toArray(byte value, Class toType, boolean preventNull) + public static Object toArray( byte value, Class toType, boolean preventNull ) { - return toArray(new Byte(value), toType, preventNull); + return toArray( new Byte( value ), toType, preventNull ); } - public static Object toArray(int value, Class toType, boolean preventNull) + public static Object toArray( int value, Class toType, boolean preventNull ) { - return toArray(new Integer(value), toType, preventNull); + return toArray( new Integer( value ), toType, preventNull ); } - public static Object toArray(long value, Class toType, boolean preventNull) + public static Object toArray( long value, Class toType, boolean preventNull ) { - return toArray(new Long(value), toType, preventNull); + return toArray( new Long( value ), toType, preventNull ); } - public static Object toArray(float value, Class toType, boolean preventNull) + public static Object toArray( float value, Class toType, boolean preventNull ) { - return toArray(new Float(value), toType, preventNull); + return toArray( new Float( value ), toType, preventNull ); } - public static Object toArray(double value, Class toType, boolean preventNull) + public static Object toArray( double value, Class toType, boolean preventNull ) { - return toArray(new Double(value), toType, preventNull); + return toArray( new Double( value ), toType, preventNull ); } - public static Object toArray(boolean value, Class toType, boolean preventNull) + public static Object toArray( boolean value, Class toType, boolean preventNull ) { - return toArray(new Boolean(value), toType, preventNull); + return toArray( new Boolean( value ), toType, preventNull ); } - /** - * 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. + * 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. + * @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. */ - public static Object convertValue(Object value, Class toType) + public static Object convertValue( Object value, Class toType ) { - return convertValue(value, toType, false); + return convertValue( value, toType, false ); } - public static Object toArray(Object value, Class toType) + public static Object toArray( Object value, Class toType ) { - return toArray(value, toType, false); + return toArray( value, toType, false ); } - - public static Object toArray(Object value, Class toType, boolean preventNulls) + + public static Object toArray( Object value, Class toType, boolean preventNulls ) { - if (value == null) + if ( value == null ) return null; - + Object result = null; - - if (value.getClass().isArray() && toType.isAssignableFrom(value.getClass().getComponentType())) + + if ( value.getClass().isArray() && toType.isAssignableFrom( value.getClass().getComponentType() ) ) return value; - if (!value.getClass().isArray()) { - - if (toType == Character.TYPE) - return stringValue(value).toCharArray(); - - Object arr = Array.newInstance(toType, 1); - Array.set(arr, 0, convertValue(value, toType, preventNulls)); + if ( !value.getClass().isArray() ) + { + + if ( toType == Character.TYPE ) + return stringValue( value ).toCharArray(); + + Object arr = Array.newInstance( toType, 1 ); + Array.set( arr, 0, convertValue( value, toType, preventNulls ) ); return arr; } - - result = Array.newInstance(toType, Array.getLength(value)); - for(int i = 0, icount = Array.getLength(value); i < icount; i++) { - Array.set(result, i, convertValue(Array.get(value, i), toType)); + + result = Array.newInstance( toType, Array.getLength( value ) ); + for ( int i = 0, icount = Array.getLength( value ); i < icount; i++ ) + { + Array.set( result, i, convertValue( Array.get( value, i ), toType ) ); } - - if (result == null && preventNulls) + + if ( result == null && preventNulls ) return value; return result; } - public static Object convertValue(Object value, Class toType, boolean preventNulls) + public static Object convertValue( Object value, Class toType, boolean preventNulls ) { Object result = null; - - if (value != null && toType.isAssignableFrom(value.getClass())) + + if ( value != null && toType.isAssignableFrom( value.getClass() ) ) return value; - - if (value != null) { + + if ( value != null ) + { /* If array -> array then convert components of array individually */ - if (value.getClass().isArray() && toType.isArray()) { + if ( value.getClass().isArray() && toType.isArray() ) + { Class componentType = toType.getComponentType(); - result = Array.newInstance(componentType, Array.getLength(value)); - for(int i = 0, icount = Array.getLength(value); i < icount; i++) { - Array.set(result, i, convertValue(Array.get(value, i), componentType)); + result = Array.newInstance( componentType, Array.getLength( value ) ); + for ( int i = 0, icount = Array.getLength( value ); i < icount; i++ ) + { + Array.set( result, i, convertValue( Array.get( value, i ), componentType ) ); } - } else if (value.getClass().isArray() && !toType.isArray()) { - - return convertValue(Array.get(value, 0), toType); - } else if (!value.getClass().isArray() && toType.isArray()){ - - if (toType.getComponentType() == Character.TYPE) { + } + else if ( value.getClass().isArray() && !toType.isArray() ) + { - result = stringValue(value).toCharArray(); - } else if (toType.getComponentType() == Object.class) { + return convertValue( Array.get( value, 0 ), toType ); + } + else if ( !value.getClass().isArray() && toType.isArray() ) + { + + if ( toType.getComponentType() == Character.TYPE ) + { + + result = stringValue( value ).toCharArray(); + } + else if ( toType.getComponentType() == Object.class ) + { return new Object[] { value }; } - } else { - if ((toType == Integer.class) || (toType == Integer.TYPE)) { - result = new Integer((int) longValue(value)); + } + else + { + if ( ( toType == Integer.class ) || ( toType == Integer.TYPE ) ) + { + result = new Integer( (int) longValue( value ) ); } - if ((toType == Double.class) || (toType == Double.TYPE)) result = new Double(doubleValue(value)); - if ((toType == Boolean.class) || (toType == Boolean.TYPE)) - result = booleanValue(value) ? Boolean.TRUE : Boolean.FALSE; - if ((toType == Byte.class) || (toType == Byte.TYPE)) result = new Byte((byte) longValue(value)); - if ((toType == Character.class) || (toType == Character.TYPE)) - result = new Character((char) longValue(value)); - if ((toType == Short.class) || (toType == Short.TYPE)) result = new Short((short) longValue(value)); - if ((toType == Long.class) || (toType == Long.TYPE)) result = new Long(longValue(value)); - if ((toType == Float.class) || (toType == Float.TYPE)) result = new Float(doubleValue(value)); - if (toType == BigInteger.class) result = bigIntValue(value); - if (toType == BigDecimal.class) result = bigDecValue(value); - if (toType == String.class) result = stringValue(value); - } - } else { - if (toType.isPrimitive()) { - result = OgnlRuntime.getPrimitiveDefaultValue(toType); - } else if (preventNulls && toType == Boolean.class) { + if ( ( toType == Double.class ) || ( toType == Double.TYPE ) ) + result = new Double( doubleValue( value ) ); + if ( ( toType == Boolean.class ) || ( toType == Boolean.TYPE ) ) + result = booleanValue( value ) ? Boolean.TRUE : Boolean.FALSE; + if ( ( toType == Byte.class ) || ( toType == Byte.TYPE ) ) + result = new Byte( (byte) longValue( value ) ); + if ( ( toType == Character.class ) || ( toType == Character.TYPE ) ) + result = new Character( (char) longValue( value ) ); + if ( ( toType == Short.class ) || ( toType == Short.TYPE ) ) + result = new Short( (short) longValue( value ) ); + if ( ( toType == Long.class ) || ( toType == Long.TYPE ) ) + result = new Long( longValue( value ) ); + if ( ( toType == Float.class ) || ( toType == Float.TYPE ) ) + result = new Float( doubleValue( value ) ); + if ( toType == BigInteger.class ) + result = bigIntValue( value ); + if ( toType == BigDecimal.class ) + result = bigDecValue( value ); + if ( toType == String.class ) + result = stringValue( value ); + } + } + else + { + if ( toType.isPrimitive() ) + { + result = OgnlRuntime.getPrimitiveDefaultValue( toType ); + } + else if ( preventNulls && toType == Boolean.class ) + { result = Boolean.FALSE; - } else if (preventNulls && Number.class.isAssignableFrom(toType)){ - result = OgnlRuntime.getNumericDefaultValue(toType); + } + else if ( preventNulls && Number.class.isAssignableFrom( toType ) ) + { + result = OgnlRuntime.getNumericDefaultValue( toType ); } } - - if (result == null && preventNulls) + + if ( result == null && preventNulls ) return value; - if (value != null && result == null) { - - throw new IllegalArgumentException("Unable to convert type " + value.getClass().getName() + " of " + value + " to type of " + toType.getName()); + if ( value != null && result == null ) + { + + throw new IllegalArgumentException( "Unable to convert type " + value.getClass().getName() + " of " + value + + " to type of " + toType.getName() ); } return result; @@ -602,441 +662,478 @@ public abstract class OgnlOps implements /** * Converts the specified value to a primitive integer value. - * *
    - *
  • Null values will cause a -1 to be returned.
    • - *
  • {@link Number} instances have their intValue() methods invoked.
    • - *
  • All other types result in calling Integer.parseInt(value.toString());
    • + *
  • Null values will cause a -1 to be returned.
    • + *
  • {@link Number} instances have their intValue() methods invoked.
    • + *
  • All other types result in calling Integer.parseInt(value.toString());
    • *
- * - * @param value - * The object to get the value of. + * + * @param value The object to get the value of. * @return A valid integer. */ - public static int getIntValue(Object value) + public static int getIntValue( Object value ) { try { - if (value == null) + if ( value == null ) return -1; - if (Number.class.isInstance(value)) { + if ( Number.class.isInstance( value ) ) + { - return ((Number)value).intValue(); + return ( (Number) value ).intValue(); } - String str = String.class.isInstance(value) ? (String)value : value.toString(); - - return Integer.parseInt(str); + String str = String.class.isInstance( value ) ? (String) value : value.toString(); + + return Integer.parseInt( str ); } - catch (Throwable t) + catch ( Throwable t ) { - throw new RuntimeException("Error converting " + value + " to integer:", t); + throw new RuntimeException( "Error converting " + value + " to integer:", t ); } } /** - * Returns the constant from the NumericTypes interface that best expresses the type of a - * numeric operation on the two given objects. + * 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 + * @param v1 one argument to a numeric operator + * @param v2 the other argument * @return the appropriate constant from the NumericTypes interface */ - public static int getNumericType(Object v1, Object v2) + public static int getNumericType( Object v1, Object v2 ) { - return getNumericType(v1, v2, false); + return getNumericType( v1, v2, false ); } /** - * 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. + * 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 + * @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 * @return the appropriate constant from the NumericTypes interface */ - public static int getNumericType(int t1, int t2, boolean canBeNonNumeric) + public static int getNumericType( int t1, int t2, boolean canBeNonNumeric ) { - if (t1 == t2) return t1; + if ( t1 == t2 ) + return t1; - if (canBeNonNumeric && (t1 == NONNUMERIC || t2 == NONNUMERIC || t1 == CHAR || t2 == CHAR)) return NONNUMERIC; + if ( canBeNonNumeric && ( t1 == NONNUMERIC || t2 == NONNUMERIC || t1 == CHAR || t2 == CHAR ) ) + return NONNUMERIC; - if (t1 == NONNUMERIC) t1 = DOUBLE; // Try to interpret strings as doubles... - if (t2 == NONNUMERIC) t2 = DOUBLE; // Try to interpret strings as doubles... + if ( t1 == NONNUMERIC ) + t1 = DOUBLE; // Try to interpret strings as doubles... + if ( t2 == NONNUMERIC ) + t2 = DOUBLE; // Try to interpret strings as doubles... - if (t1 >= MIN_REAL_TYPE) { - if (t2 >= MIN_REAL_TYPE) return Math.max(t1, t2); - if (t2 < INT) return t1; - if (t2 == BIGINT) return BIGDEC; - return Math.max(DOUBLE, t1); - } else if (t2 >= MIN_REAL_TYPE) { - if (t1 < INT) return t2; - if (t1 == BIGINT) return BIGDEC; - return Math.max(DOUBLE, t2); - } else return Math.max(t1, t2); + if ( t1 >= MIN_REAL_TYPE ) + { + if ( t2 >= MIN_REAL_TYPE ) + return Math.max( t1, t2 ); + if ( t2 < INT ) + return t1; + if ( t2 == BIGINT ) + return BIGDEC; + return Math.max( DOUBLE, t1 ); + } + else if ( t2 >= MIN_REAL_TYPE ) + { + if ( t1 < INT ) + return t2; + if ( t1 == BIGINT ) + return BIGDEC; + return Math.max( DOUBLE, t2 ); + } + else + return Math.max( t1, t2 ); } /** - * 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. + * 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 + * @param v1 one argument to an operator + * @param v2 the other argument + * @param canBeNonNumeric whether the operator can be interpreted as non-numeric * @return the appropriate constant from the NumericTypes interface */ - public static int getNumericType(Object v1, Object v2, boolean canBeNonNumeric) + public static int getNumericType( Object v1, Object v2, boolean canBeNonNumeric ) { - return getNumericType(getNumericType(v1), getNumericType(v2), canBeNonNumeric); + return getNumericType( getNumericType( v1 ), getNumericType( v2 ), canBeNonNumeric ); } /** - * 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. + * 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 + * @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 */ - public static Number newInteger(int type, long value) + public static Number newInteger( int type, long value ) { - switch(type) { - case BOOL: - case CHAR: - case INT: - return new Integer((int) value); + switch ( type ) + { + case BOOL: + case CHAR: + case INT: + return new Integer( (int) value ); - case FLOAT: - if ((long) (float) value == value) { return new Float((float) value); } - // else fall through: - case DOUBLE: - if ((long) (double) value == value) { return new Double((double) value); } - // else fall through: - case LONG: - return new Long(value); + case FLOAT: + if ( (long) (float) value == value ) + { + return new Float( (float) value ); + } + // else fall through: + case DOUBLE: + if ( (long) (double) value == value ) + { + return new Double( (double) value ); + } + // else fall through: + case LONG: + return new Long( value ); - case BYTE: - return new Byte((byte) value); + case BYTE: + return new Byte( (byte) value ); - case SHORT: - return new Short((short) value); + case SHORT: + return new Short( (short) value ); - default: - return BigInteger.valueOf(value); + default: + return BigInteger.valueOf( value ); } } /** - * 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. + * 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 + * @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 */ - public static Number newReal(int type, double value) + public static Number newReal( int type, double value ) { - if (type == FLOAT) return new Float((float) value); - return new Double(value); + if ( type == FLOAT ) + return new Float( (float) value ); + return new Double( value ); } - public static Object binaryOr(Object v1, Object v2) + public static Object binaryOr( Object v1, Object v2 ) { - int type = getNumericType(v1, v2); - if (type == BIGINT || type == BIGDEC) return bigIntValue(v1).or(bigIntValue(v2)); - return newInteger(type, longValue(v1) | longValue(v2)); + int type = getNumericType( v1, v2 ); + if ( type == BIGINT || type == BIGDEC ) + return bigIntValue( v1 ).or( bigIntValue( v2 ) ); + return newInteger( type, longValue( v1 ) | longValue( v2 ) ); } - public static Object binaryXor(Object v1, Object v2) + public static Object binaryXor( Object v1, Object v2 ) { - int type = getNumericType(v1, v2); - if (type == BIGINT || type == BIGDEC) return bigIntValue(v1).xor(bigIntValue(v2)); - return newInteger(type, longValue(v1) ^ longValue(v2)); + int type = getNumericType( v1, v2 ); + if ( type == BIGINT || type == BIGDEC ) + return bigIntValue( v1 ).xor( bigIntValue( v2 ) ); + return newInteger( type, longValue( v1 ) ^ longValue( v2 ) ); } - public static Object binaryAnd(Object v1, Object v2) + public static Object binaryAnd( Object v1, Object v2 ) { - int type = getNumericType(v1, v2); - if (type == BIGINT || type == BIGDEC) return bigIntValue(v1).and(bigIntValue(v2)); - return newInteger(type, longValue(v1) & longValue(v2)); + int type = getNumericType( v1, v2 ); + if ( type == BIGINT || type == BIGDEC ) + return bigIntValue( v1 ).and( bigIntValue( v2 ) ); + return newInteger( type, longValue( v1 ) & longValue( v2 ) ); } - - public static boolean equal(Object v1, Object v2) + + public static boolean equal( Object v1, Object v2 ) { - if (v1 == null) return v2 == null; - if (v1 == v2 || isEqual(v1, v2)) return true; - if (v1 instanceof Number && v2 instanceof Number) - return ((Number) v1).doubleValue() == ((Number) v2).doubleValue(); + if ( v1 == null ) + return v2 == null; + if ( v1 == v2 || isEqual( v1, v2 ) ) + return true; + if ( v1 instanceof Number && v2 instanceof Number ) + return ( (Number) v1 ).doubleValue() == ( (Number) v2 ).doubleValue(); return false; } - public static boolean less(Object v1, Object v2) + public static boolean less( Object v1, Object v2 ) { - return compareWithConversion(v1, v2) < 0; + return compareWithConversion( v1, v2 ) < 0; } - public static boolean greater(Object v1, Object v2) + public static boolean greater( Object v1, Object v2 ) { - return compareWithConversion(v1, v2) > 0; + return compareWithConversion( v1, v2 ) > 0; } - public static boolean in(Object v1, Object v2) + public static boolean in( Object v1, Object v2 ) throws OgnlException { - if (v2 == null) // A null collection is always treated as empty + if ( v2 == null ) // A null collection is always treated as empty return false; - ElementsAccessor elementsAccessor = OgnlRuntime.getElementsAccessor(OgnlRuntime.getTargetClass(v2)); - - for(Enumeration e = elementsAccessor.getElements(v2); e.hasMoreElements();) { + ElementsAccessor elementsAccessor = OgnlRuntime.getElementsAccessor( OgnlRuntime.getTargetClass( v2 ) ); + + for ( Enumeration e = elementsAccessor.getElements( v2 ); e.hasMoreElements(); ) + { Object o = e.nextElement(); - if (equal(v1, o)) + if ( equal( v1, o ) ) return true; } - + return false; } - public static Object shiftLeft(Object v1, Object v2) + public static Object shiftLeft( Object v1, Object v2 ) { - int type = getNumericType(v1); - if (type == BIGINT || type == BIGDEC) return bigIntValue(v1).shiftLeft((int) longValue(v2)); - return newInteger(type, longValue(v1) << (int) longValue(v2)); + int type = getNumericType( v1 ); + if ( type == BIGINT || type == BIGDEC ) + return bigIntValue( v1 ).shiftLeft( (int) longValue( v2 ) ); + return newInteger( type, longValue( v1 ) << (int) longValue( v2 ) ); } - public static Object shiftRight(Object v1, Object v2) + public static Object shiftRight( Object v1, Object v2 ) { - int type = getNumericType(v1); - if (type == BIGINT || type == BIGDEC) return bigIntValue(v1).shiftRight((int) longValue(v2)); - return newInteger(type, longValue(v1) >> (int) longValue(v2)); + int type = getNumericType( v1 ); + if ( type == BIGINT || type == BIGDEC ) + return bigIntValue( v1 ).shiftRight( (int) longValue( v2 ) ); + return newInteger( type, longValue( v1 ) >> (int) longValue( v2 ) ); } - public static Object unsignedShiftRight(Object v1, Object v2) + public static Object unsignedShiftRight( Object v1, Object v2 ) { - int type = getNumericType(v1); - if (type == BIGINT || type == BIGDEC) return bigIntValue(v1).shiftRight((int) longValue(v2)); - if (type <= INT) return newInteger(INT, ((int) longValue(v1)) >>> (int) longValue(v2)); - return newInteger(type, longValue(v1) >>> (int) longValue(v2)); + int type = getNumericType( v1 ); + if ( type == BIGINT || type == BIGDEC ) + return bigIntValue( v1 ).shiftRight( (int) longValue( v2 ) ); + if ( type <= INT ) + return newInteger( INT, ( (int) longValue( v1 ) ) >>> (int) longValue( v2 ) ); + return newInteger( type, longValue( v1 ) >>> (int) longValue( v2 ) ); } - public static Object add(Object v1, Object v2) + public static Object add( Object v1, Object v2 ) { - int type = getNumericType(v1, v2, true); - switch(type) { - case BIGINT: - return bigIntValue(v1).add(bigIntValue(v2)); - case BIGDEC: - return bigDecValue(v1).add(bigDecValue(v2)); - case FLOAT: - case DOUBLE: - return newReal(type, doubleValue(v1) + doubleValue(v2)); - case NONNUMERIC: - int t1 = getNumericType(v1), - t2 = getNumericType(v2); - - if (((t1 != NONNUMERIC) && (v2 == null)) || ((t2 != NONNUMERIC) && (v1 == null))) { - throw new NullPointerException("Can't add values " + v1 + " , " + v2); - } + int type = getNumericType( v1, v2, true ); + switch ( type ) + { + case BIGINT: + return bigIntValue( v1 ).add( bigIntValue( v2 ) ); + case BIGDEC: + return bigDecValue( v1 ).add( bigDecValue( v2 ) ); + case FLOAT: + case DOUBLE: + return newReal( type, doubleValue( v1 ) + doubleValue( v2 ) ); + case NONNUMERIC: + int t1 = getNumericType( v1 ), + t2 = getNumericType( v2 ); - return stringValue(v1) + stringValue(v2); - default: - return newInteger(type, longValue(v1) + longValue(v2)); + if ( ( ( t1 != NONNUMERIC ) && ( v2 == null ) ) || ( ( t2 != NONNUMERIC ) && ( v1 == null ) ) ) + { + throw new NullPointerException( "Can't add values " + v1 + " , " + v2 ); + } + + return stringValue( v1 ) + stringValue( v2 ); + default: + return newInteger( type, longValue( v1 ) + longValue( v2 ) ); } } - public static Object subtract(Object v1, Object v2) + public static Object subtract( Object v1, Object v2 ) { - int type = getNumericType(v1, v2); - switch(type) { - case BIGINT: - return bigIntValue(v1).subtract(bigIntValue(v2)); - case BIGDEC: - return bigDecValue(v1).subtract(bigDecValue(v2)); - case FLOAT: - case DOUBLE: - return newReal(type, doubleValue(v1) - doubleValue(v2)); - default: - return newInteger(type, longValue(v1) - longValue(v2)); + int type = getNumericType( v1, v2 ); + switch ( type ) + { + case BIGINT: + return bigIntValue( v1 ).subtract( bigIntValue( v2 ) ); + case BIGDEC: + return bigDecValue( v1 ).subtract( bigDecValue( v2 ) ); + case FLOAT: + case DOUBLE: + return newReal( type, doubleValue( v1 ) - doubleValue( v2 ) ); + default: + return newInteger( type, longValue( v1 ) - longValue( v2 ) ); } } - public static Object multiply(Object v1, Object v2) + public static Object multiply( Object v1, Object v2 ) { - int type = getNumericType(v1, v2); - switch(type) { - case BIGINT: - return bigIntValue(v1).multiply(bigIntValue(v2)); - case BIGDEC: - return bigDecValue(v1).multiply(bigDecValue(v2)); - case FLOAT: - case DOUBLE: - return newReal(type, doubleValue(v1) * doubleValue(v2)); - default: - return newInteger(type, longValue(v1) * longValue(v2)); + int type = getNumericType( v1, v2 ); + switch ( type ) + { + case BIGINT: + return bigIntValue( v1 ).multiply( bigIntValue( v2 ) ); + case BIGDEC: + return bigDecValue( v1 ).multiply( bigDecValue( v2 ) ); + case FLOAT: + case DOUBLE: + return newReal( type, doubleValue( v1 ) * doubleValue( v2 ) ); + default: + return newInteger( type, longValue( v1 ) * longValue( v2 ) ); } } - public static Object divide(Object v1, Object v2) + public static Object divide( Object v1, Object v2 ) { - int type = getNumericType(v1, v2); - switch(type) { - case BIGINT: - return bigIntValue(v1).divide(bigIntValue(v2)); - case BIGDEC: - return bigDecValue(v1).divide(bigDecValue(v2), BigDecimal.ROUND_HALF_EVEN); - case FLOAT: - case DOUBLE: - return newReal(type, doubleValue(v1) / doubleValue(v2)); - default: - return newInteger(type, longValue(v1) / longValue(v2)); + int type = getNumericType( v1, v2 ); + switch ( type ) + { + case BIGINT: + return bigIntValue( v1 ).divide( bigIntValue( v2 ) ); + case BIGDEC: + return bigDecValue( v1 ).divide( bigDecValue( v2 ), BigDecimal.ROUND_HALF_EVEN ); + case FLOAT: + case DOUBLE: + return newReal( type, doubleValue( v1 ) / doubleValue( v2 ) ); + default: + return newInteger( type, longValue( v1 ) / longValue( v2 ) ); } } - public static Object remainder(Object v1, Object v2) + public static Object remainder( Object v1, Object v2 ) { - int type = getNumericType(v1, v2); - switch(type) { - case BIGDEC: - case BIGINT: - return bigIntValue(v1).remainder(bigIntValue(v2)); - default: - return newInteger(type, longValue(v1) % longValue(v2)); + int type = getNumericType( v1, v2 ); + switch ( type ) + { + case BIGDEC: + case BIGINT: + return bigIntValue( v1 ).remainder( bigIntValue( v2 ) ); + default: + return newInteger( type, longValue( v1 ) % longValue( v2 ) ); } } - public static Object negate(Object value) + public static Object negate( Object value ) { - int type = getNumericType(value); - switch(type) { - case BIGINT: - return bigIntValue(value).negate(); - case BIGDEC: - return bigDecValue(value).negate(); - case FLOAT: - case DOUBLE: - return newReal(type, -doubleValue(value)); - default: - return newInteger(type, -longValue(value)); + int type = getNumericType( value ); + switch ( type ) + { + case BIGINT: + return bigIntValue( value ).negate(); + case BIGDEC: + return bigDecValue( value ).negate(); + case FLOAT: + case DOUBLE: + return newReal( type, -doubleValue( value ) ); + default: + return newInteger( type, -longValue( value ) ); } } - public static Object bitNegate(Object value) + public static Object bitNegate( Object value ) { - int type = getNumericType(value); - switch(type) { - case BIGDEC: - case BIGINT: - return bigIntValue(value).not(); - default: - return newInteger(type, ~longValue(value)); + int type = getNumericType( value ); + switch ( type ) + { + case BIGDEC: + case BIGINT: + return bigIntValue( value ).not(); + default: + return newInteger( type, ~longValue( value ) ); } } - public static String getEscapeString(String value) + public static String getEscapeString( String value ) { StringBuffer result = new StringBuffer(); - for(int i = 0, icount = value.length(); i < icount; i++) { - result.append(getEscapedChar(value.charAt(i))); + for ( int i = 0, icount = value.length(); i < icount; i++ ) + { + result.append( getEscapedChar( value.charAt( i ) ) ); } - return new String(result); + return new String( result ); } - public static String getEscapedChar(char ch) + public static String getEscapedChar( char ch ) { String result; - switch(ch) { - case '\b': - result = "\b"; - break; - case '\t': - result = "\\t"; - break; - case '\n': - result = "\\n"; - break; - case '\f': - result = "\\f"; - break; - case '\r': - result = "\\r"; - break; - case '\"': - result = "\\\""; - break; - case '\'': - result = "\\\'"; - break; - case '\\': - result = "\\\\"; - break; - default: - if (Character.isISOControl(ch)) { - - String hc = Integer.toString((int) ch, 16); - int hcl = hc.length(); - - result = "\\u"; - if (hcl < 4) { - if (hcl == 3) { - result = result + "0"; - } else { - if (hcl == 2) { - result = result + "00"; - } else { - result = result + "000"; + switch ( ch ) + { + case '\b': + result = "\b"; + break; + case '\t': + result = "\\t"; + break; + case '\n': + result = "\\n"; + break; + case '\f': + result = "\\f"; + break; + case '\r': + result = "\\r"; + break; + case '\"': + result = "\\\""; + break; + case '\'': + result = "\\\'"; + break; + case '\\': + result = "\\\\"; + break; + default: + if ( Character.isISOControl( ch ) ) + { + + String hc = Integer.toString( (int) ch, 16 ); + int hcl = hc.length(); + + result = "\\u"; + if ( hcl < 4 ) + { + if ( hcl == 3 ) + { + result = result + "0"; + } + else + { + if ( hcl == 2 ) + { + result = result + "00"; + } + else + { + result = result + "000"; + } } } + + result = result + hc; } - - result = result + hc; - } else { - result = new String(ch + ""); - } - break; + else + { + result = new String( ch + "" ); + } + break; } return result; } - public static Object returnValue(Object ignore, Object returnValue) + public static Object returnValue( Object ignore, Object returnValue ) { return returnValue; } /** - * Utility method that converts incoming exceptions to {@link RuntimeException} - * instances - or casts them if they already are. - * - * @param t - * The exception to cast. + * 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}. */ - public static RuntimeException castToRuntime(Throwable t) + public static RuntimeException castToRuntime( Throwable t ) { - if (RuntimeException.class.isInstance(t)) - return (RuntimeException)t; + if ( RuntimeException.class.isInstance( t ) ) + return (RuntimeException) t; + + if ( OgnlException.class.isInstance( t ) ) + throw new UnsupportedCompilationException( "Error evluating expression: " + t.getMessage(), t ); - if (OgnlException.class.isInstance(t)) - throw new UnsupportedCompilationException("Error evluating expression: " + t.getMessage(), t); - - return new RuntimeException(t); + return new RuntimeException( t ); } }