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-beanutils.git
commit 9cbcb9de51622cc14e18d4f441512cfec27b069b Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Fri Jan 31 16:49:51 2025 -0500 The class LocaleBeanUtils no longer extends BeanUtils (both classes only contains static methods) - Make class final - Make constructor private - Remove trailing whitespace --- src/changes/changes.xml | 3 +++ src/main/java/org/apache/commons/beanutils2/BeanUtils.java | 6 +++++- src/main/java/org/apache/commons/beanutils2/ConvertUtils.java | 2 +- src/main/java/org/apache/commons/beanutils2/MethodUtils.java | 4 ++-- .../java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java | 6 ++---- .../org/apache/commons/beanutils2/locale/LocaleConvertUtils.java | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 6a3c8d3f..3fb9b7b8 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,6 +43,9 @@ <action type="fix" dev="ggregory" due-to="Gary Gregory">The constructor org.apache.commons.beanutils2.ConvertUtils is now private (the class only contains static methods).</action> <action type="fix" dev="ggregory" due-to="Gary Gregory">The class org.apache.commons.beanutils2.ConstructorUtils 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.ConstructorUtils is now private (the class only contains static methods).</action> + <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> <!-- ADD --> <!-- UPDATE --> <action type="update" dev="ggregory" due-to="Gary Gregory">Bump org.apache.commons:commons-parent from 78 to 81.</action> diff --git a/src/main/java/org/apache/commons/beanutils2/BeanUtils.java b/src/main/java/org/apache/commons/beanutils2/BeanUtils.java index e2a5ac8e..1ef1f094 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanUtils.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanUtils.java @@ -34,7 +34,7 @@ import org.apache.commons.collections4.map.ConcurrentReferenceHashMap; * * @see BeanUtilsBean */ -public class BeanUtils { +public final class BeanUtils { /** An empty class array */ static final Class<?>[] EMPTY_CLASS_ARRAY = {}; @@ -359,4 +359,8 @@ public class BeanUtils { public static void setProperty(final Object bean, final String name, final Object value) throws IllegalAccessException, InvocationTargetException { BeanUtilsBean.getInstance().setProperty(bean, name, value); } + + private BeanUtils() { + // empty + } } diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java b/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java index 3be4b71d..a02c405e 100644 --- a/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java +++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java @@ -220,7 +220,7 @@ public final class ConvertUtils { public static <T> void register(final Converter<T> converter, final Class<T> clazz) { ConvertUtilsBean.getInstance().register(converter, clazz); } - + private ConvertUtils() { // empty } diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java index 8c3b28c8..ebbab981 100644 --- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java +++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java @@ -1064,7 +1064,7 @@ public final class MethodUtils { * @param parameterization the type of parameter being tested * @return true if the assignment is compatible. */ - public static final boolean isAssignmentCompatible(final Class<?> parameterType, final Class<?> parameterization) { + public static boolean isAssignmentCompatible(final Class<?> parameterType, final Class<?> parameterization) { // try plain assignment if (parameterType.isAssignableFrom(parameterization)) { return true; @@ -1170,7 +1170,7 @@ public final class MethodUtils { } return clazz; } - + private MethodUtils() { // empty } diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java index 435eee10..7ce09af4 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java @@ -20,8 +20,6 @@ package org.apache.commons.beanutils2.locale; import java.lang.reflect.InvocationTargetException; import java.util.Locale; -import org.apache.commons.beanutils2.BeanUtils; - /** * <p> * Utility methods for populating JavaBeans properties via reflection in a locale-dependent manner. @@ -31,7 +29,7 @@ import org.apache.commons.beanutils2.BeanUtils; * The implementations for these methods are provided by {@code LocaleBeanUtilsBean}. For more details see {@link LocaleBeanUtilsBean}. * </p> */ -public final class LocaleBeanUtils extends BeanUtils { +public final class LocaleBeanUtils { /** * <p> @@ -546,7 +544,7 @@ public final class LocaleBeanUtils extends BeanUtils { throws IllegalAccessException, InvocationTargetException { LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().setProperty(bean, name, value, pattern); } - + private LocaleBeanUtils() { // empty } diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java index 39b20348..f50beddd 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java @@ -352,7 +352,7 @@ public final class LocaleConvertUtils { public static void setDefaultLocale(final Locale locale) { LocaleConvertUtilsBean.getInstance().setDefaultLocale(locale); } - + private LocaleConvertUtils() { // empty }