commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcucchi...@apache.org
Subject svn commit: r1239216 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: DefaultTypeConverter.java ObjectMethodAccessor.java OgnlOps.java OgnlRuntime.java TypeConverter.java internal/CacheException.java
Date Wed, 01 Feb 2012 17:25:12 GMT
Author: mcucchiara
Date: Wed Feb  1 17:25:11 2012
New Revision: 1239216

URL: http://svn.apache.org/viewvc?rev=1239216&view=rev
Log:
Recovered the api layout (see http://goo.gl/KzeDH)

Modified:
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
Wed Feb  1 17:25:11 2012
@@ -33,7 +33,6 @@ public class DefaultTypeConverter
 {
 
     public <T> T convertValue( Map<String, Object> context, Object value, Class<T>
toType )
-        throws OgnlException
     {
         @SuppressWarnings( "unchecked" ) // type checking performed in OgnlOps.convertValue(
value, toType )
         T ret = (T) OgnlOps.convertValue( value, toType );
@@ -45,7 +44,6 @@ public class DefaultTypeConverter
      */
     public <T> T convertValue( Map<String, Object> context, Object target, Member
member, String propertyName,
                                Object value, Class<T> toType )
-        throws OgnlException
     {
         return convertValue( context, value, toType );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
Wed Feb  1 17:25:11 2012
@@ -39,7 +39,7 @@ public class ObjectMethodAccessor
      */
     public Object callStaticMethod( Map<String, Object> context, Class<?> targetClass,
String methodName,
                                     Object[] args )
-        throws OgnlException
+        throws MethodFailedException
     {
         List<Method> methods = OgnlRuntime.getMethods( targetClass, methodName, true
);
 
@@ -51,7 +51,7 @@ public class ObjectMethodAccessor
      * {@inheritDoc}
      */
     public Object callMethod( Map<String, Object> context, Object target, String methodName,
Object[] args )
-        throws OgnlException
+        throws MethodFailedException
     {
         Class<?> targetClass = ( target == null ) ? null : target.getClass();
         List<Method> methods = OgnlRuntime.getMethods( targetClass, methodName, false
);

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java Wed Feb 
1 17:25:11 2012
@@ -606,7 +606,6 @@ public abstract class OgnlOps
      * @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 )
-        throws OgnlException
     {
         return convertValue( value, toType, false );
     }
@@ -662,7 +661,6 @@ public abstract class OgnlOps
     }
 
     public static <T> Object convertValue( Object value, Class<T> toType, boolean
preventNulls )
-        throws OgnlException
     {
         Object result = null;
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java Wed Feb
 1 17:25:11 2012
@@ -758,7 +758,6 @@ public class OgnlRuntime
     }
 
     public static Object getPrimitiveDefaultValue( Class<?> forClass )
-        throws OgnlException
     {
         return primitiveDefaults.get( forClass );
     }
@@ -770,14 +769,13 @@ public class OgnlRuntime
 
     public static Object getConvertedType( OgnlContext context, Object target, Member member,
String propertyName,
                                            Object value, Class<?> type )
-        throws OgnlException
     {
         return context.getTypeConverter().convertValue( context, target, member, propertyName,
value, type );
     }
 
     public static boolean getConvertedTypes( OgnlContext context, Object target, Member member,
String propertyName,
                                              Class<?>[] parameterTypes, Object[] args,
Object[] newArgs )
-        throws OgnlException
+        
     {
         boolean result = false;
 
@@ -813,7 +811,7 @@ public class OgnlRuntime
 
     public static Method getConvertedMethodAndArgs( OgnlContext context, Object target, String
propertyName,
                                                     List<Method> methods, Object[]
args, Object[] newArgs )
-        throws OgnlException
+        
     {
         Method convertedMethod = null;
         TypeConverter typeConverter = context.getTypeConverter();
@@ -839,7 +837,7 @@ public class OgnlRuntime
     public static Constructor<?> getConvertedConstructorAndArgs( OgnlContext context,
Object target,
                                                                  List<Constructor<?>>
constructors, Object[] args,
                                                                  Object[] newArgs )
-        throws OgnlException
+        
     {
         Constructor<?> constructor = null;
         TypeConverter typeConverter = context.getTypeConverter();
@@ -876,7 +874,7 @@ public class OgnlRuntime
      */
     public static Method getAppropriateMethod( OgnlContext context, Object source, Object
target, String propertyName,
                                                List<Method> methods, Object[] args,
Object[] actualArgs )
-        throws OgnlException
+        
     {
         Method appropriateMethod = null;
         Class<?>[] resultParameterTypes = null;
@@ -1016,10 +1014,6 @@ public class OgnlRuntime
         {
             cause = e.getTargetException();
         }
-        catch ( OgnlException e )
-        {
-            cause = e;
-        }
         finally
         {
             objectArrayPool.recycle( actualArgs );
@@ -1237,7 +1231,6 @@ public class OgnlRuntime
     }
 
     public static List<Constructor<?>> getConstructors( Class<?> targetClass
)
-        throws OgnlException
     {
         return cache.getConstructor( targetClass );
     }
@@ -1246,10 +1239,8 @@ public class OgnlRuntime
      * @param targetClass
      * @param staticMethods if true (false) returns only the (non-)static methods
      * @return Returns the map of methods for a given class
-     * @throws OgnlException
      */
     public static Map<String, List<Method>> getMethods( Class<?> targetClass,
boolean staticMethods )
-        throws OgnlException
     {
         DeclaredMethodCacheEntry.MethodType type = staticMethods ?
             DeclaredMethodCacheEntry.MethodType.STATIC :
@@ -1259,19 +1250,16 @@ public class OgnlRuntime
     }
 
     public static List<Method> getMethods( Class<?> targetClass, String name,
boolean staticMethods )
-        throws OgnlException
     {
         return getMethods( targetClass, staticMethods ).get( name );
     }
 
     public static Map<String, Field> getFields( Class<?> targetClass )
-        throws OgnlException
     {
         return cache.getField( targetClass );
     }
 
     public static Field getField( Class<?> inClass, String name )
-        throws OgnlException
     {
         Field field = getFields( inClass ).get( name );
 
@@ -1293,14 +1281,14 @@ public class OgnlRuntime
     }
 
     public static Object getFieldValue( OgnlContext context, Object target, String propertyName
)
-        throws NoSuchFieldException, OgnlException
+        throws NoSuchFieldException
     {
         return getFieldValue( context, target, propertyName, false );
     }
 
     public static Object getFieldValue( OgnlContext context, Object target, String propertyName,
                                         boolean checkAccessAndExistence )
-        throws NoSuchFieldException, OgnlException
+        throws NoSuchFieldException
     {
         Object result = null;
         Class<?> targetClass = target == null ? null : target.getClass();
@@ -1380,7 +1368,6 @@ public class OgnlRuntime
     }
 
     public static boolean isFieldAccessible( OgnlContext context, Object target, Class<?>
inClass, String propertyName )
-        throws OgnlException
     {
         return isFieldAccessible( context, target, getField( inClass, propertyName ), propertyName
);
     }
@@ -1391,7 +1378,6 @@ public class OgnlRuntime
     }
 
     public static boolean hasField( OgnlContext context, Object target, Class<?> inClass,
String propertyName )
-        throws OgnlException
     {
         Field field = getField( inClass, propertyName );
 
@@ -1460,10 +1446,9 @@ public class OgnlRuntime
      * @param propertyName
      * @param findSets
      * @return Returns the list of (g)setter of a class for a given property name
-     * @throws OgnlException
+     * @
      */
     public static List<Method> getDeclaredMethods( Class<?> targetClass, String
propertyName, boolean findSets )
-        throws OgnlException
     {
         String baseName = Character.toUpperCase( propertyName.charAt( 0 ) ) + propertyName.substring(
1 );
         List<Method> methods = new ArrayList<Method>();

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java Wed
Feb  1 17:25:11 2012
@@ -46,7 +46,6 @@ public interface TypeConverter
      *         not possible.
      */
     <T> T convertValue( Map<String, Object> context, Object target, Member member,
String propertyName, Object value,
-                        Class<T> toType )
-        throws OgnlException;
+                        Class<T> toType );
 
 }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
Wed Feb  1 17:25:11 2012
@@ -22,10 +22,8 @@ package org.apache.commons.ognl.internal
 /*
  * $Id$
  */
-import org.apache.commons.ognl.OgnlException;
-
 public class CacheException
-    extends OgnlException
+    extends RuntimeException
 {
     public CacheException( Throwable e )
     {



Mime
View raw message