From 4d40d5cfebf8feae98283990d7d74b209fc347bf Mon Sep 17 00:00:00 2001 From: singingbush Date: Tue, 5 Sep 2023 11:46:59 +0100 Subject: [PATCH] BEANUTILS-562 replace commons-logging with log4j-api --- pom.xml | 6 +++--- .../org/apache/commons/beanutils2/BeanPredicate.java | 6 +++--- .../beanutils2/BeanPropertyValueChangeConsumer.java | 6 +++--- .../beanutils2/BeanPropertyValueEqualsPredicate.java | 6 +++--- .../beanutils2/BeanToPropertyValueTransformer.java | 6 +++--- .../org/apache/commons/beanutils2/BeanUtilsBean.java | 10 +++++----- .../apache/commons/beanutils2/ConvertUtilsBean.java | 6 +++--- .../commons/beanutils2/DefaultBeanIntrospector.java | 6 +++--- .../beanutils2/FluentPropertyBeanIntrospector.java | 6 +++--- .../org/apache/commons/beanutils2/LazyDynaBean.java | 10 +++++----- .../org/apache/commons/beanutils2/MethodUtils.java | 6 +++--- .../apache/commons/beanutils2/PropertyUtilsBean.java | 6 +++--- .../beanutils2/converters/AbstractConverter.java | 10 +++++----- .../commons/beanutils2/locale/BaseLocaleConverter.java | 6 +++--- .../commons/beanutils2/locale/LocaleBeanUtilsBean.java | 6 +++--- .../beanutils2/locale/LocaleConvertUtilsBean.java | 6 +++--- .../locale/converters/DateLocaleConverter.java | 6 +++--- .../locale/converters/DecimalLocaleConverter.java | 6 +++--- .../locale/converters/StringLocaleConverter.java | 6 +++--- .../commons/beanutils2/BeanificationTestCase.java | 4 ---- .../commons/beanutils2/bugs/Jira157TestCase.java | 6 +++--- .../commons/beanutils2/bugs/Jira273TestCase.java | 6 +++--- .../commons/beanutils2/bugs/Jira298TestCase.java | 6 +++--- .../commons/beanutils2/bugs/Jira339TestCase.java | 6 +++--- .../commons/beanutils2/bugs/Jira349TestCase.java | 6 +++--- .../apache/commons/beanutils2/bugs/Jira87TestCase.java | 6 +++--- .../converters/DateLocaleConverterTestCase.java | 6 +++--- .../beanutils2/locale/LocaleBeanUtilsTestCase.java | 6 +++--- .../beanutils2/locale/LocaleBeanificationTestCase.java | 3 --- 29 files changed, 87 insertions(+), 94 deletions(-) diff --git a/pom.xml b/pom.xml index 653049f73..edd3d9795 100644 --- a/pom.xml +++ b/pom.xml @@ -332,9 +332,9 @@ - commons-logging - commons-logging - 1.2 + org.apache.logging.log4j + log4j-api + 2.20.0 org.apache.commons diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java index 6bf1a62ad..ea30f64b5 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java @@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.function.Predicate; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

Predicate implementation that applies the given {@code Predicate} @@ -32,7 +32,7 @@ */ public class BeanPredicate implements Predicate { - private final Log log = LogFactory.getLog(this.getClass()); + private final Logger log = LogManager.getLogger(this.getClass()); /** Name of the property whose value will be predicated */ private String propertyName; diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java index ea66c526b..e12fd98a0 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java @@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.function.Consumer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -82,7 +82,7 @@ public class BeanPropertyValueChangeConsumer implements Consumer { /** For logging. Each subclass gets its own log instance. */ - private final Log log = LogFactory.getLog(this.getClass()); + private final Logger log = LogManager.getLogger(this.getClass()); /** * The name of the property which will be updated when this {@code Closure} executes. diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java index bf8355512..0ec586703 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java @@ -21,8 +21,8 @@ import java.util.Objects; import java.util.function.Predicate; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

{@code Predicate} that evaluates a property value against a specified value.

@@ -113,7 +113,7 @@ public class BeanPropertyValueEqualsPredicate implements Predicate { /** For logging. Each subclass gets its own log instance. */ - private final Log log = LogFactory.getLog(this.getClass()); + private final Logger log = LogManager.getLogger(this.getClass()); /** * The name of the property which will be evaluated when this {@code Predicate} is executed. diff --git a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java index c9bf91900..e823e056c 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java @@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.function.Function; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -74,7 +74,7 @@ public class BeanToPropertyValueTransformer implements Function { /** For logging. Each subclass gets its own log instance. */ - private final Log log = LogFactory.getLog(this.getClass()); + private final Logger log = LogManager.getLogger(this.getClass()); /** The name of the property that will be used in the transformation of the object. */ private final String propertyName; diff --git a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java index ca9ff0370..e8c436362 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java @@ -28,8 +28,8 @@ import java.util.Map; import org.apache.commons.beanutils2.expression.Resolver; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

JavaBean property population methods.

@@ -59,7 +59,7 @@ protected BeanUtilsBean initialValue() { /** * Logging for this instance */ - private static final Log LOG = LogFactory.getLog(BeanUtilsBean.class); + private static final Logger LOG = LogManager.getLogger(BeanUtilsBean.class); /** A reference to Throwable's initCause method, or null if it's not there in this JVM */ private static final Method INIT_CAUSE_METHOD = getInitCauseMethod(); @@ -94,13 +94,13 @@ private static Method getInitCauseMethod() { final Class[] paramsClasses = { Throwable.class }; return Throwable.class.getMethod("initCause", paramsClasses); } catch (final NoSuchMethodException e) { - final Log log = LogFactory.getLog(BeanUtils.class); + final Logger log = LogManager.getLogger(BeanUtils.class); if (log.isWarnEnabled()) { log.warn("Throwable does not have initCause() method in JDK 1.3"); } return null; } catch (final Throwable e) { - final Log log = LogFactory.getLog(BeanUtils.class); + final Logger log = LogManager.getLogger(BeanUtils.class); if (log.isWarnEnabled()) { log.warn("Error getting the Throwable initCause() method", e); } diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java index dc9ddaa02..9dd2206e6 100644 --- a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java +++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java @@ -80,8 +80,8 @@ import org.apache.commons.beanutils2.sql.converters.SqlDateConverter; import org.apache.commons.beanutils2.sql.converters.SqlTimeConverter; import org.apache.commons.beanutils2.sql.converters.SqlTimestampConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

Utility methods for converting String scalar values to objects of the @@ -177,7 +177,7 @@ public class ConvertUtilsBean { /** * The {@code Log} instance for this class. */ - private static final Log LOG = LogFactory.getLog(ConvertUtilsBean.class); + private static final Logger LOG = LogManager.getLogger(ConvertUtilsBean.class); /** * Get singleton instance diff --git a/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java index 154c28636..816d0d7d8 100644 --- a/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java +++ b/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java @@ -24,8 +24,8 @@ import java.lang.reflect.Method; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

@@ -54,7 +54,7 @@ public class DefaultBeanIntrospector implements BeanIntrospector { private static final Class[] LIST_CLASS_PARAMETER = new Class[] { java.util.List.class }; /** For logging. Each subclass gets its own log instance. */ - private final Log log = LogFactory.getLog(getClass()); + private final Logger log = LogManager.getLogger(getClass()); /** * Private constructor so that no instances can be created. diff --git a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java index 93c15aecc..174a70cbf 100644 --- a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java +++ b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java @@ -22,8 +22,8 @@ import java.lang.reflect.Method; import java.util.Locale; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

@@ -80,7 +80,7 @@ public class FluentPropertyBeanIntrospector implements BeanIntrospector { public static final String DEFAULT_WRITE_METHOD_PREFIX = "set"; /** The logger. */ - private final Log log = LogFactory.getLog(getClass()); + private final Logger log = LogManager.getLogger(getClass()); /** The prefix of write methods to search for. */ private final String writeMethodPrefix; diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java index 4425bd6bf..232005c19 100644 --- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java +++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

DynaBean which automatically adds properties to the {@code DynaClass} @@ -127,7 +127,7 @@ public class LazyDynaBean implements DynaBean, Serializable { /** * Commons Logging */ - private static transient Log LOG = LogFactory.getLog(LazyDynaBean.class); + private static transient Logger LOG = LogManager.getLogger(LazyDynaBean.class); /** BigInteger Zero */ protected static final BigInteger BigInteger_ZERO = new BigInteger("0"); @@ -701,9 +701,9 @@ protected boolean isDynaProperty(final String name) { /** *

Returns the {@code Log}. */ - private Log logger() { + private Logger logger() { if (LOG == null) { - LOG = LogFactory.getLog(LazyDynaBean.class); + LOG = LogManager.getLogger(LazyDynaBean.class); } return LOG; } diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java index 03f84b4b1..b25c95c89 100644 --- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java +++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.WeakHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

Utility reflection methods focused on methods in general rather than properties in particular.

@@ -113,7 +113,7 @@ public int hashCode() { } } - private static final Log LOG = LogFactory.getLog(MethodUtils.class); + private static final Logger LOG = LogManager.getLogger(MethodUtils.class); /** * Only log warning about accessibility work around once. diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java index 5e4213bc8..e8dfc8726 100644 --- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java +++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java @@ -32,8 +32,8 @@ import org.apache.commons.beanutils2.expression.DefaultResolver; import org.apache.commons.beanutils2.expression.Resolver; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Utility methods for using Java Reflection APIs to facilitate generic @@ -90,7 +90,7 @@ public class PropertyUtilsBean { /** Log instance */ - private static final Log LOG = LogFactory.getLog(PropertyUtilsBean.class); + private static final Logger LOG = LogManager.getLogger(PropertyUtilsBean.class); /** * Gets the PropertyUtils bean instance. diff --git a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java index 5fc0a3e5d..d5890a5a2 100644 --- a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java @@ -25,8 +25,8 @@ import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.ConvertUtils; import org.apache.commons.beanutils2.Converter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Base {@link Converter} implementation that provides the structure @@ -101,7 +101,7 @@ protected static String toTrim(final Object value) { /** * Logging for this instance. */ - private transient Log log; + private transient Logger log; /** * Should we return the default value on conversion errors? @@ -414,9 +414,9 @@ public boolean isUseDefault() { * * @return The Log instance. */ - Log log() { + Logger log() { if (log == null) { - log = LogFactory.getLog(getClass()); + log = LogManager.getLogger(getClass()); } return log; } diff --git a/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java index 55def0d88..4bb7e1ab9 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java @@ -22,8 +22,8 @@ import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.ConvertUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * The base class for all standard type locale-sensitive converters. It has {@link LocaleConverter} and {@link org.apache.commons.beanutils2.Converter} @@ -132,7 +132,7 @@ public B setUseDefault(final boolean useDefault) { } /** All logging goes through this logger */ - private static final Log LOG = LogFactory.getLog(BaseLocaleConverter.class); + private static final Logger LOG = LogManager.getLogger(BaseLocaleConverter.class); /** * Checks whether the result of a conversion is conform to the specified target type. If this is the case, the passed in result object is cast to the diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java index 2ac5e2490..0532ecc41 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java @@ -32,8 +32,8 @@ import org.apache.commons.beanutils2.MappedPropertyDescriptor; import org.apache.commons.beanutils2.PropertyUtilsBean; import org.apache.commons.beanutils2.expression.Resolver; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

Utility methods for populating JavaBeans properties @@ -56,7 +56,7 @@ protected LocaleBeanUtilsBean initialValue() { }; /** All logging goes through this logger */ - private static final Log LOG = LogFactory.getLog(LocaleBeanUtilsBean.class); + private static final Logger LOG = LogManager.getLogger(LocaleBeanUtilsBean.class); /** * Gets singleton instance diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java index c08b1afaf..d8084ea02 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java @@ -37,8 +37,8 @@ import org.apache.commons.beanutils2.sql.converters.locale.SqlDateLocaleConverter; import org.apache.commons.beanutils2.sql.converters.locale.SqlTimeLocaleConverter; import org.apache.commons.beanutils2.sql.converters.locale.SqlTimestampLocaleConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** *

Utility methods for converting locale-sensitive String scalar values to objects of the @@ -82,7 +82,7 @@ public class LocaleConvertUtilsBean { /** The {@code Log} instance for this class. */ - private static final Log LOG = LogFactory.getLog(LocaleConvertUtilsBean.class); + private static final Logger LOG = LogManager.getLogger(LocaleConvertUtilsBean.class); /** * Gets singleton instance. diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java index 4d3250207..4b03cf0ee 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java @@ -28,8 +28,8 @@ import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.locale.BaseLocaleConverter; import org.apache.commons.beanutils2.locale.LocaleConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter} implementation that converts an incoming locale-sensitive String into a @@ -84,7 +84,7 @@ public B setLenient(final boolean lenient) { private static final String DEFAULT_PATTERN_CHARS = DateLocaleConverter.initDefaultChars(); /** All logging goes through this logger */ - private static final Log LOG = LogFactory.getLog(DateLocaleConverter.class); + private static final Logger LOG = LogManager.getLogger(DateLocaleConverter.class); /** * Constructs a new builder. diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java index 1544ee3dd..95ef95fb3 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java @@ -25,8 +25,8 @@ import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.locale.BaseLocaleConverter; import org.apache.commons.beanutils2.locale.LocaleConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Standard {@link LocaleConverter} implementation that converts an incoming locale-sensitive String into a {@code java.lang.Number} object, optionally using a @@ -62,7 +62,7 @@ public DecimalLocaleConverter get() { } /** All logging goes through this logger */ - private static final Log LOG = LogFactory.getLog(DecimalLocaleConverter.class); + private static final Logger LOG = LogManager.getLogger(DecimalLocaleConverter.class); /** * Constructs a new builder. diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java index a129eb9fb..e7cb46252 100644 --- a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java @@ -29,8 +29,8 @@ import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.locale.BaseLocaleConverter; import org.apache.commons.beanutils2.locale.LocaleConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter} implementation that converts an incoming locale-sensitive object into a {@link String} @@ -60,7 +60,7 @@ public StringLocaleConverter get() { } /** All logging goes through this logger */ - private static final Log LOG = LogFactory.getLog(StringLocaleConverter.class); + private static final Logger LOG = LogManager.getLogger(StringLocaleConverter.class); /** * Constructs a new builder. diff --git a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java index 6f5012a50..72169f96b 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.WeakHashMap; -import org.apache.commons.logging.LogFactory; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -358,8 +356,6 @@ public void run() { beanUtils = BeanUtilsBean.getInstance(); convertUtils = ConvertUtilsBean.getInstance(); propertyUtils = PropertyUtilsBean.getInstance(); - // XXX Log keeps a reference around! - LogFactory.releaseAll(); } @Override diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java index f6ebd8c0e..68e74d295 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java @@ -22,8 +22,8 @@ import org.apache.commons.beanutils2.BeanUtils; import org.apache.commons.beanutils2.BeanUtilsBean; import org.apache.commons.beanutils2.SuppressPropertiesBeanIntrospector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import junit.framework.Test; import junit.framework.TestCase; @@ -61,7 +61,7 @@ public interface XY { String getY(); } - private static final Log LOG = LogFactory.getLog(Jira157TestCase.class); + private static final Logger LOG = LogManager.getLogger(Jira157TestCase.class); /** * Run the Test. diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java index 8306270d4..901438650 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java @@ -18,8 +18,8 @@ import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.beanutils2.bugs.other.Jira273BeanFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import junit.framework.Test; import junit.framework.TestCase; @@ -32,7 +32,7 @@ */ public class Jira273TestCase extends TestCase { - private static final Log LOG = LogFactory.getLog(Jira273TestCase.class); + private static final Logger LOG = LogManager.getLogger(Jira273TestCase.class); /** * Run the Test. diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java index 275e66ede..426486a2e 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java @@ -22,8 +22,8 @@ import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.beanutils2.bugs.other.Jira298BeanFactory; import org.apache.commons.beanutils2.bugs.other.Jira298BeanFactory.IX; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import junit.framework.Test; import junit.framework.TestCase; @@ -34,7 +34,7 @@ */ public class Jira298TestCase extends TestCase { - private static final Log LOG = LogFactory.getLog(Jira298TestCase.class); + private static final Logger LOG = LogManager.getLogger(Jira298TestCase.class); /** * Run the Test. diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java index 1c588facd..1127a8543 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java @@ -22,8 +22,8 @@ import org.apache.commons.beanutils2.BeanUtils; import org.apache.commons.beanutils2.PropertyUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import junit.framework.Test; import junit.framework.TestCase; @@ -60,7 +60,7 @@ public void setComparator(final Comparator comparator) { } - private static final Log LOG = LogFactory.getLog(Jira339TestCase.class); + private static final Logger LOG = LogManager.getLogger(Jira339TestCase.class); /** * Run the Test. diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java index 61cc79003..aced92b6f 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java @@ -17,8 +17,8 @@ package org.apache.commons.beanutils2.bugs; import org.apache.commons.beanutils2.PropertyUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import junit.framework.Test; import junit.framework.TestCase; @@ -59,7 +59,7 @@ public void setTestProperty(final boolean testProperty) { } } - private static final Log LOG = LogFactory.getLog(Jira349TestCase.class); + private static final Logger LOG = LogManager.getLogger(Jira349TestCase.class); /** * Run the Test. diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java index 2821fb3f1..984fec3ba 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java @@ -18,8 +18,8 @@ import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.beanutils2.bugs.other.Jira87BeanFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import junit.framework.Test; import junit.framework.TestCase; @@ -39,7 +39,7 @@ */ public class Jira87TestCase extends TestCase { - private static final Log LOG = LogFactory.getLog(Jira87TestCase.class); + private static final Logger LOG = LogManager.getLogger(Jira87TestCase.class); /** * Run the Test. diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java index 5bb0d33b1..a42b1cc32 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java @@ -26,8 +26,8 @@ import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.locale.converters.DateLocaleConverter; import org.apache.commons.beanutils2.locale.converters.DateLocaleConverter.Builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Test Case for the DateLocaleConverter class. @@ -35,7 +35,7 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase { /** All logging goes through this logger */ - private static final Log LOG = LogFactory.getLog(DateLocaleConverterTestCase.class); + private static final Logger LOG = LogManager.getLogger(DateLocaleConverterTestCase.class); protected String localizedDatePattern; protected String localizedDateValue; diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java index ecd075bf9..5066d7c70 100644 --- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java @@ -20,8 +20,8 @@ import static org.junit.jupiter.api.Assertions.fail; import org.apache.commons.beanutils2.TestBean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.junit.jupiter.api.Test; /** @@ -30,7 +30,7 @@ */ public class LocaleBeanUtilsTestCase { - private static final Log LOG = LogFactory.getLog(LocaleBeanUtilsTestCase.class); + private static final Logger LOG = LogManager.getLogger(LocaleBeanUtilsTestCase.class); /** * Test setting a nested indexed property diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java index b1be6c4e7..b2bf6c8dc 100644 --- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java @@ -36,7 +36,6 @@ import org.apache.commons.beanutils2.ConvertUtils; import org.apache.commons.beanutils2.PrimitiveBean; import org.apache.commons.beanutils2.locale.converters.LongLocaleConverter; -import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -396,8 +395,6 @@ class GetBeanUtilsBeanThread extends Thread { public void run() { beanUtils = LocaleBeanUtilsBean.getLocaleBeanUtilsInstance(); convertUtils = LocaleConvertUtilsBean.getInstance(); - // XXX Log keeps a reference around! - LogFactory.releaseAll(); } @Override