This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit 05b277190c808f0b9d08695cefc0f34bc74d0e9d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Aug 31 09:19:07 2024 -0400
BeanUtils.initCause() will never return false
---
src/main/java/org/apache/commons/beanutils/BeanMap.java | 11 ++---------
.../beanutils/BeanPropertyValueChangeClosure.java | 16 ++++------------
.../beanutils/BeanPropertyValueEqualsPredicate.java | 16 ++++------------
.../beanutils/BeanToPropertyValueTransformer.java | 16 ++++------------
.../java/org/apache/commons/beanutils/BeanUtils.java | 2 +-
.../java/org/apache/commons/beanutils/BeanUtilsBean.java | 2 +-
.../org/apache/commons/beanutils/PropertyUtilsBean.java | 4 +---
7 files changed, 17 insertions(+), 50 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils/BeanMap.java
b/src/main/java/org/apache/commons/beanutils/BeanMap.java
index e8feecaf..0a17e903 100644
--- a/src/main/java/org/apache/commons/beanutils/BeanMap.java
+++ b/src/main/java/org/apache/commons/beanutils/BeanMap.java
@@ -447,16 +447,11 @@ public class BeanMap extends AbstractMap<Object, Object>
implements Cloneable {
}
catch ( final InvocationTargetException e ) {
final IllegalArgumentException iae = new
IllegalArgumentException(e.getMessage());
- if (!BeanUtils.initCause(iae, e)) {
- logInfo(e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
catch ( final InstantiationException e ) {
final IllegalArgumentException iae = new
IllegalArgumentException(e.getMessage());
- if (!BeanUtils.initCause(iae, e)) {
- logInfo(e);
- }
BeanUtils.initCause(iae, e);
throw iae;
}
@@ -761,9 +756,7 @@ public class BeanMap extends AbstractMap<Object, Object>
implements Cloneable {
}
catch ( final InvocationTargetException | IllegalAccessException e
) {
final IllegalArgumentException iae = new
IllegalArgumentException(e.getMessage());
- if (!BeanUtils.initCause(iae, e)) {
- logInfo(e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
return oldValue;
diff --git
a/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
b/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
index 4d715499..27729721 100644
---
a/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
+++
b/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
@@ -166,32 +166,24 @@ public class BeanPropertyValueChangeClosure implements
Closure {
if (!ignoreNull) {
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
log.warn("WARNING: " + errorMsg + e);
} catch (final IllegalAccessException e) {
final String errorMsg = "Unable to access the property provided.";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
} catch (final InvocationTargetException e) {
final String errorMsg = "Exception occurred in property's getter";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
} catch (final NoSuchMethodException e) {
final String errorMsg = "Property not found";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
}
diff --git
a/src/main/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
b/src/main/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
index 56a198ea..a15d0f6b 100644
---
a/src/main/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
+++
b/src/main/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
@@ -201,32 +201,24 @@ public class BeanPropertyValueEqualsPredicate implements
Predicate {
if (!ignoreNull) {
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
log.warn("WARNING: " + errorMsg + e);
} catch (final IllegalAccessException e) {
final String errorMsg = "Unable to access the property provided.";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
} catch (final InvocationTargetException e) {
final String errorMsg = "Exception occurred in property's getter";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
} catch (final NoSuchMethodException e) {
final String errorMsg = "Property not found.";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
diff --git
a/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java
b/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java
index 96d1aa20..c21c47cd 100644
---
a/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java
+++
b/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java
@@ -179,33 +179,25 @@ public class BeanToPropertyValueTransformer implements
Transformer {
if (!ignoreNull) {
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
log.warn("WARNING: " + errorMsg + e);
} catch (final IllegalAccessException e) {
final String errorMsg = "Unable to access the property provided.";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
} catch (final InvocationTargetException e) {
final String errorMsg = "Exception occurred in property's getter";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
} catch (final NoSuchMethodException e) {
final String errorMsg = "No property found for name [" +
propertyName + "]";
final IllegalArgumentException iae = new
IllegalArgumentException(errorMsg);
- if (!BeanUtils.initCause(iae, e)) {
- log.error(errorMsg, e);
- }
+ BeanUtils.initCause(iae, e);
throw iae;
}
diff --git a/src/main/java/org/apache/commons/beanutils/BeanUtils.java
b/src/main/java/org/apache/commons/beanutils/BeanUtils.java
index ab8f6751..eb122e9e 100644
--- a/src/main/java/org/apache/commons/beanutils/BeanUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/BeanUtils.java
@@ -424,7 +424,7 @@ public class BeanUtils {
*
* @param throwable The throwable.
* @param cause The cause of the throwable.
- * @return true if the cause was initialized, otherwise false.
+ * @return always true in 1.10.0.
* @since 1.8.0
* @deprecated Use {@link Throwable#initCause(Throwable)}.
* @see Throwable#initCause(Throwable)
diff --git a/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
b/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
index d652da60..57407f96 100644
--- a/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
@@ -825,7 +825,7 @@ public class BeanUtilsBean {
*
* @param throwable The throwable.
* @param cause The cause of the throwable.
- * @return true if the cause was initialized, otherwise false.
+ * @return always true in 1.10.0.
* @since 1.8.0
* @deprecated Use {@link Throwable#initCause(Throwable)}.
* @see Throwable#initCause(Throwable)
diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
index 52ad4f32..f81ebe11 100644
--- a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
@@ -1381,9 +1381,7 @@ public class PropertyUtilsBean {
final IllegalArgumentException e = new IllegalArgumentException(
"Cannot invoke " + method.getDeclaringClass().getName() + "."
+ method.getName() + " on bean class '" + bean.getClass() + "' - " +
cause.getMessage() + " - had objects of type \"" + valueString.append("\" but
expected signature
\"").append(expectedString.toString()).append("\"").toString()
);
- if (!BeanUtils.initCause(e, cause)) {
- log.error("Method invocation failed", cause);
- }
+ BeanUtils.initCause(e, cause);
throw e;
}
