ResultSetIterator.get(String) now throws IllegalArgumentException

instead of RuntimeException to wrap cases of SQLException

- ResultSetIterator.hasNext() now throws IllegalStateException
instead of RuntimeException to wrap cases of SQLException-
ResultSetIterator.next() now throws IllegalStateException
instead of RuntimeException to wrap cases of SQLException
- ResultSetIterator.set(String, Object) now throws
IllegalArgumentException instead of RuntimeException to wrap cases of
SQLException
- ResultSetIterator.set(String, String, Object) now throws
IllegalArgumentException instead of RuntimeException to wrap cases of
SQLException

Author: garydgregory

src/changes/changes.xml

@@ -46,6 +46,13 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">The class LocaleBeanUtils no longer extends BeanUtils (both classes only contains static methods).</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">The class org.apache.commons.beanutils2.BeanUtils is now final (the class only contains static methods).</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">The constructor org.apache.commons.beanutils2.BeanUtils is now private (the class only contains static methods).</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">BeanComparator.compare(T, T) now throws IllegalArgumentException instead of RuntimeException to wrap all cases of ReflectiveOperationException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">MappedMethodReference.get() now throws IllegalStateException instead of RuntimeException to wrap cases of NoSuchMethodException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.get(String) now throws IllegalArgumentException instead of RuntimeException to wrap cases of SQLException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.hasNext() now throws IllegalStateException instead of RuntimeException to wrap cases of SQLException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.next() now throws IllegalStateException instead of RuntimeException to wrap cases of SQLException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.set(String, Object) now throws IllegalArgumentException instead of RuntimeException to wrap cases of SQLException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.set(String, String, Object) now throws IllegalArgumentException instead of RuntimeException to wrap cases of SQLException.</action>
       <!-- ADD -->
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Gary Gregory">Bump org.apache.commons:commons-parent from 78 to 81.</action>

src/main/java/org/apache/commons/beanutils2/BeanComparator.java

@@ -17,7 +17,6 @@
 
 package org.apache.commons.beanutils2;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Comparator;
 
 /**
@@ -157,8 +156,8 @@ public int compare(final T o1, final T o2) {
             final Object value1 = PropertyUtils.getProperty(o1, property);
             final Object value2 = PropertyUtils.getProperty(o2, property);
             return internalCompare(value1, value2);
-        } catch (final NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(e.getClass().getSimpleName() + ": " + e.toString());
+        } catch (final ReflectiveOperationException e) {
+            throw new IllegalArgumentException(e);
         }
     }
 

src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java

@@ -112,7 +112,7 @@ private Method get() {
                     // Un-comment following line for testing
                     // System.out.println("Recreated Method " + methodName + " for " + className);
                 } catch (final NoSuchMethodException e) {
-                    throw new RuntimeException("Method " + methodName + " for " + className + " could not be reconstructed - method not found");
+                    throw new IllegalStateException("Method " + methodName + " for " + className + " could not be reconstructed - method not found");
                 }
                 methodRef = new SoftReference<>(m);
             }

src/main/java/org/apache/commons/beanutils2/sql/ResultSetIterator.java

@@ -113,7 +113,7 @@ public Object get(final String name) {
         try {
             return dynaClass.getObjectFromResultSet(name);
         } catch (final SQLException e) {
-            throw new RuntimeException("get(" + name + "): SQLException: " + e);
+            throw new IllegalArgumentException("get(" + name + "): SQLException: " + e);
         }
     }
 
@@ -170,7 +170,7 @@ public boolean hasNext() {
             advance();
             return !eof;
         } catch (final SQLException e) {
-            throw new RuntimeException("hasNext():  SQLException:  " + e);
+            throw new IllegalStateException("hasNext():  SQLException:  " + e);
         }
     }
 
@@ -191,7 +191,7 @@ public DynaBean next() {
             current = false;
             return this;
         } catch (final SQLException e) {
-            throw new RuntimeException("next():  SQLException:  " + e);
+            throw new IllegalStateException("next():  SQLException:  " + e);
         }
     }
 
@@ -251,7 +251,7 @@ public void set(final String name, final Object value) {
         try {
             dynaClass.getResultSet().updateObject(name, value);
         } catch (final SQLException e) {
-            throw new RuntimeException("set(" + name + "): SQLException: " + e);
+            throw new IllegalArgumentException("set(" + name + "): SQLException: " + e);
         }
     }