This is an automated email from the ASF dual-hosted git repository.
lukaszlenart 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 5165bdd Identical catch sections in a single try statement. Collapse
into a multi-catch section.
new c1132d8 Merge pull request #41 from arturobernalg/feature/catch
5165bdd is described below
commit 5165bddec796a1e2278c01412e06f44de52c911a
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Jun 20 17:21:33 2021 +0200
Identical catch sections in a single try statement. Collapse into a
multi-catch section.
---
.../org/apache/commons/ognl/ASTStaticField.java | 20 ++---------
.../commons/ognl/ObjectPropertyAccessor.java | 20 +++--------
src/main/java/org/apache/commons/ognl/Ognl.java | 6 +---
.../java/org/apache/commons/ognl/OgnlRuntime.java | 40 +++-------------------
.../java/org/apache/commons/ognl/SimpleNode.java | 10 ++----
.../entry/PropertyDescriptorCacheEntryFactory.java | 6 +---
6 files changed, 15 insertions(+), 87 deletions(-)
diff --git a/src/main/java/org/apache/commons/ognl/ASTStaticField.java
b/src/main/java/org/apache/commons/ognl/ASTStaticField.java
index 7357b93..f6f4ad8 100644
--- a/src/main/java/org/apache/commons/ognl/ASTStaticField.java
+++ b/src/main/java/org/apache/commons/ognl/ASTStaticField.java
@@ -92,15 +92,7 @@ public class ASTStaticField
result = Modifier.isFinal( field.getModifiers() );
}
}
- catch ( ClassNotFoundException e )
- {
- cause = e;
- }
- catch ( NoSuchFieldException e )
- {
- cause = e;
- }
- catch ( SecurityException e )
+ catch ( ClassNotFoundException | SecurityException |
NoSuchFieldException e )
{
cause = e;
}
@@ -138,15 +130,7 @@ public class ASTStaticField
return field.getType();
}
- catch ( ClassNotFoundException e )
- {
- cause = e;
- }
- catch ( NoSuchFieldException e )
- {
- cause = e;
- }
- catch ( SecurityException e )
+ catch ( ClassNotFoundException | SecurityException |
NoSuchFieldException e )
{
cause = e;
}
diff --git a/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
b/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
index 39d52e9..ba5c743 100644
--- a/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
@@ -52,16 +52,10 @@ public class ObjectPropertyAccessor
{
result = OgnlRuntime.getFieldValue( ognlContext, target, name,
true );
}
- }
- catch ( IntrospectionException ex )
- {
- throw new OgnlException( name, ex );
- }
- catch ( OgnlException ex )
+ } catch ( OgnlException ex )
{
throw ex;
- }
- catch ( Exception ex )
+ } catch ( Exception ex )
{
throw new OgnlException( name, ex );
}
@@ -93,16 +87,10 @@ public class ObjectPropertyAccessor
result = m.invoke( target, value );
}
}
- }
- catch ( IntrospectionException ex )
- {
- throw new OgnlException( name, ex );
- }
- catch ( OgnlException ex )
+ } catch ( OgnlException ex )
{
throw ex;
- }
- catch ( Exception ex )
+ } catch ( Exception ex )
{
throw new OgnlException( name, ex );
}
diff --git a/src/main/java/org/apache/commons/ognl/Ognl.java
b/src/main/java/org/apache/commons/ognl/Ognl.java
index 16616f7..6d1394b 100644
--- a/src/main/java/org/apache/commons/ognl/Ognl.java
+++ b/src/main/java/org/apache/commons/ognl/Ognl.java
@@ -111,11 +111,7 @@ public abstract class Ognl
OgnlParser parser = new OgnlParser( new StringReader( expression )
);
return parser.topLevelExpression();
}
- catch ( ParseException e )
- {
- throw new ExpressionSyntaxException( expression, e );
- }
- catch ( TokenMgrError e )
+ catch ( ParseException | TokenMgrError e )
{
throw new ExpressionSyntaxException( expression, e );
}
diff --git a/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
b/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
index 755adea..54a7a5f 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
@@ -927,15 +927,10 @@ public class OgnlRuntime
return invokeMethod( target, method, convertedArgs );
}
- catch ( NoSuchMethodException e )
+ catch ( NoSuchMethodException | IllegalAccessException e )
{
cause = e;
- }
- catch ( IllegalAccessException e )
- {
- cause = e;
- }
- catch ( InvocationTargetException e )
+ } catch ( InvocationTargetException e )
{
cause = e.getTargetException();
}
@@ -1019,26 +1014,13 @@ public class OgnlRuntime
}
return ctor.newInstance( actualArgs );
}
- catch ( ClassNotFoundException e )
+ catch ( ClassNotFoundException | InstantiationException |
IllegalAccessException | NoSuchMethodException e )
{
cause = e;
- }
- catch ( NoSuchMethodException e )
- {
- cause = e;
- }
- catch ( IllegalAccessException e )
- {
- cause = e;
- }
- catch ( InvocationTargetException e )
+ } catch ( InvocationTargetException e )
{
cause = e.getTargetException();
}
- catch ( InstantiationException e )
- {
- cause = e;
- }
throw new MethodFailedException( className, "new", cause );
}
@@ -1296,19 +1278,7 @@ public class OgnlRuntime
return field.get( null );
}
- catch ( ClassNotFoundException e )
- {
- cause = e;
- }
- catch ( NoSuchFieldException e )
- {
- cause = e;
- }
- catch ( SecurityException e )
- {
- cause = e;
- }
- catch ( IllegalAccessException e )
+ catch ( ClassNotFoundException | IllegalAccessException |
SecurityException | NoSuchFieldException e )
{
cause = e;
}
diff --git a/src/main/java/org/apache/commons/ognl/SimpleNode.java
b/src/main/java/org/apache/commons/ognl/SimpleNode.java
index 8247731..97f4d19 100644
--- a/src/main/java/org/apache/commons/ognl/SimpleNode.java
+++ b/src/main/java/org/apache/commons/ognl/SimpleNode.java
@@ -243,17 +243,11 @@ public abstract class SimpleNode
{
result = evaluateGetValueBody( context, source );
}
- catch ( OgnlException ex )
- {
- evalException = ex;
- throw ex;
- }
- catch ( RuntimeException ex )
+ catch ( OgnlException | RuntimeException ex )
{
evalException = ex;
throw ex;
- }
- finally
+ } finally
{
Evaluation eval = context.popEvaluation();
diff --git
a/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
b/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
index 3c8616c..a12fb9e 100644
---
a/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
+++
b/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
@@ -67,11 +67,7 @@ public class PropertyDescriptorCacheEntryFactory
findObjectIndexedPropertyDescriptors( targetClass, result );
}
- catch ( IntrospectionException e )
- {
- throw new CacheException( e );
- }
- catch ( OgnlException e )
+ catch ( IntrospectionException | OgnlException e )
{
throw new CacheException( e );
}
