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
The following commit(s) were added to refs/heads/1.X by this push:
new e4894f8e Use final
e4894f8e is described below
commit e4894f8e7d65142c73e781fc739ad0151854477c
Author: Gary D. Gregory <[email protected]>
AuthorDate: Wed Dec 25 18:37:35 2024 -0500
Use final
- Use direct references
- Add missing @Deprecated
- Merge test expressions with the same outcome
---
src/main/java/org/apache/commons/beanutils/ConstructorUtils.java | 6 +-----
src/main/java/org/apache/commons/beanutils/ConversionException.java | 1 +
src/main/java/org/apache/commons/beanutils/MethodUtils.java | 6 +-----
src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java | 4 ++--
src/main/java/org/apache/commons/beanutils/WrapDynaClass.java | 4 ++--
.../commons/beanutils/converters/BooleanArrayConverterTestCase.java | 4 ++--
.../commons/beanutils/converters/SqlTimeConverterTestCase.java | 2 +-
.../commons/beanutils/converters/SqlTimestampConverterTestCase.java | 2 +-
.../commons/beanutils/locale/LocaleBeanificationTestCase.java | 3 ++-
9 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
b/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
index 04849911..663fdf57 100644
--- a/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
@@ -90,12 +90,8 @@ public class ConstructorUtils {
public static <T> Constructor<T> getAccessibleConstructor(final
Constructor<T> ctor) {
// Make sure we have a method to check
- if (ctor == null) {
- return null;
- }
-
// If the requested method is not public we cannot call it
- if (!Modifier.isPublic(ctor.getModifiers())) {
+ if (ctor == null || !Modifier.isPublic(ctor.getModifiers())) {
return null;
}
diff --git
a/src/main/java/org/apache/commons/beanutils/ConversionException.java
b/src/main/java/org/apache/commons/beanutils/ConversionException.java
index 5cc33969..a2471704 100644
--- a/src/main/java/org/apache/commons/beanutils/ConversionException.java
+++ b/src/main/java/org/apache/commons/beanutils/ConversionException.java
@@ -32,6 +32,7 @@ public class ConversionException extends RuntimeException {
*
* @deprecated Use {@link Throwable#getCause()}}.
*/
+ @Deprecated
protected Throwable cause;
/**
diff --git a/src/main/java/org/apache/commons/beanutils/MethodUtils.java
b/src/main/java/org/apache/commons/beanutils/MethodUtils.java
index fa9ff556..d0fc5b8c 100644
--- a/src/main/java/org/apache/commons/beanutils/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/MethodUtils.java
@@ -206,12 +206,8 @@ public class MethodUtils {
public static Method getAccessibleMethod(Class<?> clazz, Method method) {
// Make sure we have a method to check
- if (method == null) {
- return null;
- }
-
// If the requested method is not public we cannot call it
- if (!Modifier.isPublic(method.getModifiers())) {
+ if (method == null || !Modifier.isPublic(method.getModifiers())) {
return null;
}
diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
index 4b398eb3..434230d1 100644
--- a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
@@ -136,9 +136,9 @@ public class PropertyUtilsBean {
* The cache of PropertyDescriptor arrays for beans we have already
* introspected, keyed by the java.lang.Class of this object.
*/
- private WeakFastHashMap<Class<?>, BeanIntrospectionData> descriptorsCache;
+ private final WeakFastHashMap<Class<?>, BeanIntrospectionData>
descriptorsCache;
- private WeakFastHashMap<Class<?>, FastHashMap> mappedDescriptorsCache;
+ private final WeakFastHashMap<Class<?>, FastHashMap>
mappedDescriptorsCache;
/** Log instance */
diff --git a/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
b/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
index dec0a632..8a01acf5 100644
--- a/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
@@ -269,12 +269,12 @@ public class WrapDynaClass implements DynaClass {
/**
* Name of the JavaBean class represented by this WrapDynaClass.
*/
- private String beanClassName;
+ private final String beanClassName;
/**
* Reference to the JavaBean class represented by this WrapDynaClass.
*/
- private Reference<Class<?>> beanClassRef;
+ private final Reference<Class<?>> beanClassRef;
/** Stores the associated {@code PropertyUtilsBean} instance. */
private final PropertyUtilsBean propertyUtilsBean;
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java
index 2af8999d..a9b45f1e 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java
@@ -57,7 +57,7 @@ public class BooleanArrayConverterTestCase extends TestCase {
final BooleanConverter bc = new BooleanConverter(
trueStrings, falseStrings, BooleanConverter.NO_DEFAULT);
final BooleanArrayConverter converter = new BooleanArrayConverter(
- bc, BooleanArrayConverter.NO_DEFAULT);
+ bc, AbstractArrayConverter.NO_DEFAULT);
final boolean[] results = (boolean[]) converter.convert(null, "NOPE,
sure, sure");
assertNotNull(results);
@@ -162,7 +162,7 @@ public class BooleanArrayConverterTestCase extends TestCase
{
trueStrings, falseStrings, BooleanConverter.NO_DEFAULT);
final BooleanArrayConverter converter = new BooleanArrayConverter(
- bc, BooleanArrayConverter.NO_DEFAULT);
+ bc, AbstractArrayConverter.NO_DEFAULT);
ConvertUtils.register(converter, BooleanArrayConverter.MODEL);
final boolean[] sample = {};
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
index d5200f43..d9c1e74e 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
@@ -63,7 +63,7 @@ public class SqlTimeConverterTestCase extends
DateConverterTestBase {
private boolean isUSTimeFormatWithNarrowNoBreakSpace() {
// Fix tests on Java 20 onwards. See
https://bugs.openjdk.org/browse/JDK-8324308 for background.
- DateFormat usDateFormat = DateFormat.getTimeInstance(DateFormat.SHORT,
Locale.US);
+ final DateFormat usDateFormat =
DateFormat.getTimeInstance(DateFormat.SHORT, Locale.US);
return ((SimpleDateFormat)
usDateFormat).toPattern().contains("\u202F");
}
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
index b84e2237..b03ed75b 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
@@ -69,7 +69,7 @@ public class SqlTimestampConverterTestCase extends
DateConverterTestBase {
private boolean isUSTimeFormatWithNarrowNoBreakSpace() {
// Fix tests on Java 20 onwards. See
https://bugs.openjdk.org/browse/JDK-8324308 for background.
- DateFormat usDateFormat = DateFormat.getTimeInstance(DateFormat.SHORT,
Locale.US);
+ final DateFormat usDateFormat =
DateFormat.getTimeInstance(DateFormat.SHORT, Locale.US);
return ((SimpleDateFormat)
usDateFormat).toPattern().contains("\u202F");
}
diff --git
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
index da547afa..064085f3 100644
---
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
@@ -23,6 +23,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.WeakHashMap;
+import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.beanutils.ContextClassLoaderLocal;
import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.beanutils.ConvertUtils;
@@ -361,7 +362,7 @@ public class LocaleBeanificationTestCase extends TestCase {
assertEquals("Signal not set by test thread", 2, signal.getSignal());
assertTrue(
"Different LocaleBeanUtilsBean instances per context
classloader",
- LocaleBeanUtilsBean.getInstance() != signal.getBean());
+ BeanUtilsBean.getInstance() != signal.getBean());
assertTrue(
"Different LocaleConvertUtilsBean instances per context
classloader",
LocaleConvertUtilsBean.getInstance() !=
signal.getConvertUtils());
