You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/06/23 19:42:15 UTC
[commons-ognl] branch master updated (9812376 -> 15e311f)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-ognl.git
from 9812376 Merge pull request #126 from apache/dependabot/github_actions/actions/checkout-3.5.3
new 21e1c04 [main] Throw a specialized RuntimeException instead of RuntimeException
new 15e311f [test] Throw a specialized RuntimeException instead of RuntimeException
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/commons/ognl/ExpressionNode.java | 2 +-
.../java/org/apache/commons/ognl/MapPropertyAccessor.java | 10 ++++------
src/main/java/org/apache/commons/ognl/OgnlOps.java | 2 +-
src/main/java/org/apache/commons/ognl/ToStringVisitor.java | 2 +-
.../apache/commons/ognl/enhance/ExpressionCompiler.java | 2 +-
.../org/apache/commons/ognl/test/ArrayCreationTest.java | 10 ++++++----
.../org/apache/commons/ognl/test/ArrayElementsTest.java | 12 +++++++-----
.../commons/ognl/test/CollectionDirectPropertyTest.java | 12 +++++++-----
.../commons/ognl/test/CompilingPropertyAccessor.java | 2 +-
.../org/apache/commons/ognl/test/IndexedPropertyTest.java | 10 ++++++----
.../apache/commons/ognl/test/InterfaceInheritanceTest.java | 12 +++++++-----
.../java/org/apache/commons/ognl/test/MapCreationTest.java | 13 ++++++++++---
.../apache/commons/ognl/test/MethodWithConversionTest.java | 10 ++++++----
.../org/apache/commons/ognl/test/NestedMethodTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/NullHandlerTest.java | 10 ++++++----
.../commons/ognl/test/NumberFormatExceptionTest.java | 14 ++++++++------
.../commons/ognl/test/ObjectIndexedPropertyTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/OperatorTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/Performance.java | 2 +-
.../org/apache/commons/ognl/test/PrimitiveArrayTest.java | 10 ++++++----
.../commons/ognl/test/PrimitiveNullHandlingTest.java | 4 +++-
.../org/apache/commons/ognl/test/PrivateAccessorTest.java | 10 ++++++----
22 files changed, 106 insertions(+), 73 deletions(-)
[commons-ognl] 02/02: [test] Throw a specialized RuntimeException instead of RuntimeException
Posted by gg...@apache.org.
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
commit 15e311f1866bb968709c6d5c73cadb1bcae8ebaa
Author: Gary Gregory <gg...@rocketsoftware.com>
AuthorDate: Fri Jun 23 15:42:10 2023 -0400
[test] Throw a specialized RuntimeException instead of
RuntimeException
---
.../org/apache/commons/ognl/test/ArrayCreationTest.java | 10 ++++++----
.../org/apache/commons/ognl/test/ArrayElementsTest.java | 12 +++++++-----
.../commons/ognl/test/CollectionDirectPropertyTest.java | 12 +++++++-----
.../commons/ognl/test/CompilingPropertyAccessor.java | 2 +-
.../org/apache/commons/ognl/test/IndexedPropertyTest.java | 10 ++++++----
.../apache/commons/ognl/test/InterfaceInheritanceTest.java | 12 +++++++-----
.../java/org/apache/commons/ognl/test/MapCreationTest.java | 13 ++++++++++---
.../apache/commons/ognl/test/MethodWithConversionTest.java | 10 ++++++----
.../org/apache/commons/ognl/test/NestedMethodTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/NullHandlerTest.java | 10 ++++++----
.../commons/ognl/test/NumberFormatExceptionTest.java | 14 ++++++++------
.../commons/ognl/test/ObjectIndexedPropertyTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/OperatorTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/Performance.java | 2 +-
.../org/apache/commons/ognl/test/PrimitiveArrayTest.java | 10 ++++++----
.../commons/ognl/test/PrimitiveNullHandlingTest.java | 4 +++-
.../org/apache/commons/ognl/test/PrivateAccessorTest.java | 10 ++++++----
17 files changed, 98 insertions(+), 63 deletions(-)
diff --git a/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java b/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
index c1a7024..f25ce12 100644
--- a/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.ExpressionSyntaxException;
import org.apache.commons.ognl.test.objects.Entry;
import org.apache.commons.ognl.test.objects.Root;
@@ -26,9 +31,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class ArrayCreationTest
extends OgnlTestCase
@@ -93,7 +95,7 @@ public class ArrayCreationTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length" );
+ fail( "don't understand TEST format with length" );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java b/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
index ae6b19f..0b1b5f6 100644
--- a/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
@@ -18,16 +18,18 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Root;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class ArrayElementsTest
extends OgnlTestCase
@@ -91,7 +93,7 @@ public class ArrayElementsTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length" );
+ fail( "don't understand TEST format with length" );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java b/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
index e9fd304..ea48ab1 100644
--- a/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
-import org.apache.commons.ognl.test.objects.Root;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.commons.ognl.test.objects.Root;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
@RunWith(value = Parameterized.class)
public class CollectionDirectPropertyTest
extends OgnlTestCase
@@ -84,7 +86,7 @@ public class CollectionDirectPropertyTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length" );
+ fail( "don't understand TEST format with length" );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java b/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
index 46a481b..ede1b34 100644
--- a/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
+++ b/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
@@ -55,7 +55,7 @@ public class CompilingPropertyAccessor
}
catch ( Exception ex )
{
- throw new RuntimeException( ex );
+ throw new IllegalStateException( ex );
}
};
diff --git a/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java b/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
index b0386f0..6cbf0b0 100644
--- a/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Indexed;
import org.apache.commons.ognl.test.objects.Root;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class IndexedPropertyTest
extends OgnlTestCase
@@ -85,7 +87,7 @@ public class IndexedPropertyTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java b/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
index 78a793d..5baaa15 100644
--- a/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
@@ -18,6 +18,12 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
import org.apache.commons.ognl.OgnlRuntime;
import org.apache.commons.ognl.test.objects.Bean1;
import org.apache.commons.ognl.test.objects.BeanProvider;
@@ -31,10 +37,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
@RunWith(value = Parameterized.class)
public class InterfaceInheritanceTest
extends OgnlTestCase
@@ -99,7 +101,7 @@ public class InterfaceInheritanceTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java b/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
index 56101a6..1647cf2 100644
--- a/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
@@ -18,13 +18,20 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.apache.commons.ognl.test.objects.Root;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.*;
-
@RunWith(value = Parameterized.class)
public class MapCreationTest
extends OgnlTestCase
@@ -102,7 +109,7 @@ public class MapCreationTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java b/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
index 4d3d4e9..cd5d4bf 100644
--- a/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Simple;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class MethodWithConversionTest
extends OgnlTestCase
@@ -74,7 +76,7 @@ public class MethodWithConversionTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java b/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
index 0546803..5ea24c4 100644
--- a/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Component;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class NestedMethodTest
extends OgnlTestCase
@@ -72,7 +74,7 @@ public class NestedMethodTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java b/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
index b5d74ae..eed7410 100644
--- a/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.OgnlRuntime;
import org.apache.commons.ognl.test.objects.CorrectedObject;
import org.junit.Before;
@@ -26,9 +31,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class NullHandlerTest
extends OgnlTestCase
@@ -72,7 +74,7 @@ public class NullHandlerTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java b/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
index de9959e..249d189 100644
--- a/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
@@ -18,17 +18,19 @@
*/
package org.apache.commons.ognl.test;
-import org.apache.commons.ognl.OgnlException;
-import org.apache.commons.ognl.test.objects.Simple;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.junit.Assert.fail;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.commons.ognl.OgnlException;
+import org.apache.commons.ognl.test.objects.Simple;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
@RunWith(value = Parameterized.class)
public class NumberFormatExceptionTest
extends OgnlTestCase
@@ -91,7 +93,7 @@ public class NumberFormatExceptionTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + TEST.length );
+ fail( "don't understand TEST format with length " + TEST.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java b/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
index 2c1002f..c1e3254 100644
--- a/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.OgnlException;
import org.apache.commons.ognl.test.objects.Bean1;
import org.apache.commons.ognl.test.objects.ObjectIndexed;
@@ -25,9 +30,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class ObjectIndexedPropertyTest
extends OgnlTestCase
@@ -94,7 +96,7 @@ public class ObjectIndexedPropertyTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/OperatorTest.java b/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
index 652f79e..0d8ffa5 100644
--- a/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
@@ -18,13 +18,15 @@
*/
package org.apache.commons.ognl.test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
@RunWith(value = Parameterized.class)
public class OperatorTest
extends OgnlTestCase
@@ -70,7 +72,7 @@ public class OperatorTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/Performance.java b/src/test/java/org/apache/commons/ognl/test/Performance.java
index 1eb711f..4271b37 100644
--- a/src/test/java/org/apache/commons/ognl/test/Performance.java
+++ b/src/test/java/org/apache/commons/ognl/test/Performance.java
@@ -322,7 +322,7 @@ public class Performance
{
return _iterations >= MAX_ITERATIONS;
}
- throw new RuntimeException( "no maximums specified" );
+ throw new IllegalStateException( "no maximums specified" );
}
/*
diff --git a/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java b/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
index 502fc86..245f0eb 100644
--- a/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
@@ -18,14 +18,16 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Root;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class PrimitiveArrayTest
extends OgnlTestCase
@@ -80,7 +82,7 @@ public class PrimitiveArrayTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + TEST.length );
+ fail( "don't understand TEST format with length " + TEST.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java b/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
index 8b8fcc6..be08a02 100644
--- a/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collection;
@@ -87,7 +89,7 @@ public class PrimitiveNullHandlingTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java b/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
index 1f9b1c7..bdc84d0 100644
--- a/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.DefaultMemberAccess;
import org.apache.commons.ognl.test.objects.Root;
import org.junit.Before;
@@ -26,9 +31,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-
@RunWith(value = Parameterized.class)
public class PrivateAccessorTest
extends OgnlTestCase
@@ -80,7 +82,7 @@ public class PrivateAccessorTest
break;
default:
- throw new RuntimeException( "don't understand TEST format with length " + element.length );
+ fail( "don't understand TEST format with length " + element.length );
}
data.add( tmp );
[commons-ognl] 01/02: [main] Throw a specialized RuntimeException instead of RuntimeException
Posted by gg...@apache.org.
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
commit 21e1c0411455652ad2fa72548df9c73eea77a49a
Author: Gary Gregory <gg...@rocketsoftware.com>
AuthorDate: Fri Jun 23 15:42:02 2023 -0400
[main] Throw a specialized RuntimeException instead of
RuntimeException
---
src/main/java/org/apache/commons/ognl/ExpressionNode.java | 2 +-
src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java | 10 ++++------
src/main/java/org/apache/commons/ognl/OgnlOps.java | 2 +-
src/main/java/org/apache/commons/ognl/ToStringVisitor.java | 2 +-
.../org/apache/commons/ognl/enhance/ExpressionCompiler.java | 2 +-
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/commons/ognl/ExpressionNode.java b/src/main/java/org/apache/commons/ognl/ExpressionNode.java
index 4fdf017..ce5b06d 100644
--- a/src/main/java/org/apache/commons/ognl/ExpressionNode.java
+++ b/src/main/java/org/apache/commons/ognl/ExpressionNode.java
@@ -73,7 +73,7 @@ public abstract class ExpressionNode
public String getExpressionOperator( int index )
{
- throw new RuntimeException( "unknown operator for " + OgnlParserTreeConstants.jjtNodeName[id] );
+ throw new UnsupportedOperationException( "unknown operator for " + OgnlParserTreeConstants.jjtNodeName[id] );
}
@Override
diff --git a/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java b/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
index 8c24f65..1c9077c 100644
--- a/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
@@ -21,6 +21,7 @@ package org.apache.commons.ognl;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
/**
@@ -93,14 +94,11 @@ public class MapPropertyAccessor
public String getSourceAccessor( OgnlContext context, Object target, Object index )
{
- Node currentNode = context.getCurrentNode().jjtGetParent();
+ Objects.requireNonNull(context, "context");
+ Objects.requireNonNull(context.getCurrentNode(), "getCurrentNode()");
+ Node currentNode = Objects.requireNonNull(context.getCurrentNode().jjtGetParent(), "node is null for '" + index + "'" );
boolean indexedAccess = false;
- if ( currentNode == null )
- {
- throw new RuntimeException( "node is null for '" + index + "'" );
- }
-
if ( !( currentNode instanceof ASTProperty ) )
{
currentNode = currentNode.jjtGetParent();
diff --git a/src/main/java/org/apache/commons/ognl/OgnlOps.java b/src/main/java/org/apache/commons/ognl/OgnlOps.java
index 58fd1c7..88c4308 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlOps.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlOps.java
@@ -810,7 +810,7 @@ public abstract class OgnlOps
}
catch ( Throwable t )
{
- throw new RuntimeException( "Error converting " + value + " to integer:", t );
+ throw new IllegalArgumentException( "Error converting " + value + " to integer:", t );
}
}
diff --git a/src/main/java/org/apache/commons/ognl/ToStringVisitor.java b/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
index 477c555..17a3ffa 100644
--- a/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
+++ b/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
@@ -455,7 +455,7 @@ public class ToStringVisitor
catch ( OgnlException e )
{
// This should never happen, but delegate it on just in case.
- throw new RuntimeException( e );
+ throw new IllegalArgumentException( e );
}
}
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 e75eadc..fa7b0ff 100644
--- a/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
+++ b/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
@@ -566,7 +566,7 @@ public class ExpressionCompiler
}
catch ( Throwable t )
{
- throw new RuntimeException( "Error compiling expression on object " + root + " with expression node "
+ throw new IllegalStateException( "Error compiling expression on object " + root + " with expression node "
+ expression + " getter body: " + getBody + " setter body: " + setBody, t );
}