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 2024/08/31 13:19:12 UTC
(commons-beanutils) branch 1.X updated (1586d989 -> 05b27719)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
from 1586d989 Deprecate BeanUtilsBean.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable)
new 32ec816c BeanUtils.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable)
new 05b27719 BeanUtils.initCause() will never return false
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/changes/changes.xml | 1 +
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 | 8 ++++++--
.../java/org/apache/commons/beanutils/BeanUtilsBean.java | 2 +-
.../org/apache/commons/beanutils/PropertyUtilsBean.java | 4 +---
8 files changed, 23 insertions(+), 51 deletions(-)
(commons-beanutils) 01/02: BeanUtils.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable)
Posted by gg...@apache.org.
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 32ec816c86a278ed68b18cf8019a731703c0187a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 31 09:15:02 2024 -0400
BeanUtils.initCause(Throwable, Throwable) for removal, use
Throwable.initCause(Throwable)
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/beanutils/BeanUtils.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8387b11b..69cb1410 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -40,6 +40,7 @@
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump commons-logging:commons-logging from 1.2 to 1.3.4.</action>
<!-- REMOVE -->
<action dev="ggregory" type="update" due-to="Gary Gregory">Deprecate BeanUtilsBean.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable).</action>
+ <action dev="ggregory" type="update" due-to="Gary Gregory">Deprecate BeanUtils.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable).</action>
</release>
<release version="1.9.4" date="2019-06-12" description="The primary reason for this release is a bugfix for
CVE-2014-0114. More specifically, our goal with BEANUTILS-520
diff --git a/src/main/java/org/apache/commons/beanutils/BeanUtils.java b/src/main/java/org/apache/commons/beanutils/BeanUtils.java
index 8707804a..ab8f6751 100644
--- a/src/main/java/org/apache/commons/beanutils/BeanUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/BeanUtils.java
@@ -426,9 +426,13 @@ public class BeanUtils {
* @param cause The cause of the throwable.
* @return true if the cause was initialized, otherwise false.
* @since 1.8.0
+ * @deprecated Use {@link Throwable#initCause(Throwable)}.
+ * @see Throwable#initCause(Throwable)
*/
+ @Deprecated
public static boolean initCause(final Throwable throwable, final Throwable cause) {
- return BeanUtilsBean.getInstance().initCause(throwable, cause);
+ throwable.initCause(cause);
+ return true;
}
/**
(commons-beanutils) 02/02: BeanUtils.initCause() will never return false
Posted by gg...@apache.org.
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 <ga...@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;
}