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
The following commit(s) were added to refs/heads/master by this push: new 52f5cd08 chore: fix warnings and to-dos (#92) 52f5cd08 is described below commit 52f5cd08d5af397687623d94f722809157e4effc Author: Seth Falco <s...@falco.fun> AuthorDate: Thu Feb 1 19:11:28 2024 +0000 chore: fix warnings and to-dos (#92) --- .../apache/commons/beanutils2/BeanComparator.java | 5 +---- .../org/apache/commons/beanutils2/BeanMap.java | 4 ++-- .../apache/commons/beanutils2/WrapDynaClass.java | 14 ++++++-------- .../sql/converters/SqlTimeConverter.java | 6 ------ .../sql/converters/SqlTimestampConverter.java | 6 ------ .../apache/commons/beanutils2/BeanMapTestCase.java | 1 - .../commons/beanutils2/BeanificationTestCase.java | 22 ++++++++++++++++++---- .../beanutils2/DynaBeanMapDecoratorTestCase.java | 2 +- .../commons/beanutils2/bugs/Jira357TestCase.java | 6 +----- 9 files changed, 29 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/apache/commons/beanutils2/BeanComparator.java b/src/main/java/org/apache/commons/beanutils2/BeanComparator.java index be67e5bb..d2dcfd7c 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanComparator.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanComparator.java @@ -195,11 +195,8 @@ public class BeanComparator<T, V> implements Comparator<T>, Serializable { if (property == null) { return beanComparator.property == null; } - if (!property.equals(beanComparator.property)) { - return false; - } - return true; + return property.equals(beanComparator.property); } /** diff --git a/src/main/java/org/apache/commons/beanutils2/BeanMap.java b/src/main/java/org/apache/commons/beanutils2/BeanMap.java index 651bcdcc..3af278ff 100644 --- a/src/main/java/org/apache/commons/beanutils2/BeanMap.java +++ b/src/main/java/org/apache/commons/beanutils2/BeanMap.java @@ -330,8 +330,8 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable { } } } - final Object[] answer = { value }; - return answer; + + return new Object[] { value }; } catch (final InvocationTargetException e) { final IllegalArgumentException iae = new IllegalArgumentException(e.getMessage()); if (!BeanUtils.initCause(iae, e)) { diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java index 037be852..0dc6a221 100644 --- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java +++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java @@ -301,15 +301,13 @@ public class WrapDynaClass implements DynaClass { propertiesMap.put(properties[i].getName(), properties[i]); } + int j = regulars.length; - for (final Map.Entry<?, ?> entry : mappeds.entrySet()) { - final PropertyDescriptor descriptor = - (PropertyDescriptor) entry.getValue(); - properties[j] = - new DynaProperty(descriptor.getName(), - Map.class); - propertiesMap.put(properties[j].getName(), - properties[j]); + + for (final Object value : mappeds.values()) { + final PropertyDescriptor descriptor = (PropertyDescriptor) value; + properties[j] = new DynaProperty(descriptor.getName(), Map.class); + propertiesMap.put(properties[j].getName(), properties[j]); j++; } } diff --git a/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverter.java index 58a957d2..ad275d52 100644 --- a/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverter.java @@ -62,12 +62,6 @@ public final class SqlTimeConverter extends DateTimeConverter<Time> { } /** - * Gets a {@code DateFormat} for the Locale. - * - * @param locale TODO - * @param timeZone TODO - * - * @return The DateFormat. * @since 1.8.0 */ @Override diff --git a/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverter.java index c745a938..0836ff3a 100644 --- a/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverter.java +++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverter.java @@ -62,12 +62,6 @@ public final class SqlTimestampConverter extends DateTimeConverter<Timestamp> { } /** - * Gets a {@code DateFormat} for the Locale. - * - * @param locale TODO - * @param timeZone TODO - * - * @return The DateFormat. * @since 1.8.0 */ @Override diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java index 7c66ac05..91c0f1cf 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java @@ -31,7 +31,6 @@ import junit.textui.TestRunner; /** * Test cases for BeanMap */ -@SuppressWarnings("deprecation") public class BeanMapTestCase extends AbstractMapTest<String, Object> { public static class BeanThrowingExceptions extends BeanWithProperties { diff --git a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java index 228689b7..9181875b 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java @@ -17,6 +17,8 @@ package org.apache.commons.beanutils2; +import static org.junit.Assert.assertNotEquals; + import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.Map; @@ -287,7 +289,7 @@ public class BeanificationTestCase extends TestCase { ccll.set(beanOne); assertEquals("Start thread gets right instance", beanOne, ccll.get()); ccll.unset(); - assertTrue("Unset works", !beanOne.equals(ccll.get())); + assertNotEquals("Unset works", beanOne, ccll.get()); } /** @@ -327,9 +329,21 @@ public class BeanificationTestCase extends TestCase { thread.join(); assertEquals("Signal not set by test thread", 2, signal.getSignal()); - assertTrue("Different BeanUtilsBean instances per context classloader", BeanUtilsBean.getInstance() != signal.getBean()); - assertTrue("Different ConvertUtilsBean instances per context classloader", ConvertUtilsBean.getInstance() != signal.getConvertUtils()); - assertTrue("Different PropertyUtilsBean instances per context classloader", PropertyUtilsBean.getInstance() != signal.getPropertyUtils()); + assertNotEquals( + "Different BeanUtilsBean instances per context classloader", + BeanUtilsBean.getInstance(), + signal.getBean() + ); + assertNotEquals( + "Different ConvertUtilsBean instances per context classloader", + ConvertUtilsBean.getInstance(), + signal.getConvertUtils() + ); + assertNotEquals( + "Different PropertyUtilsBean instances per context classloader", + PropertyUtilsBean.getInstance(), + signal.getPropertyUtils() + ); } /** Tests whether class loaders and beans are released from memory */ diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java index 5d13bb57..303186eb 100644 --- a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java @@ -369,4 +369,4 @@ public class DynaBeanMapDecoratorTestCase extends TestCase { i++; } } -} \ No newline at end of file +} diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java index 74e0c0c3..f722e591 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java @@ -181,11 +181,7 @@ public class Jira357TestCase extends TestCase { * Test {@link PropertyUtils#getPropertyDescriptors(Class)} */ public void testPropertyUtils_getPropertyDescriptors_Bar() throws Exception { - - // FIXME the isBar() method returning AbstractTestBean.class as the - // declaring class instead of ConcreteTestBean.class - // causing this test to fail - so its commented out for now - // checkReadMethod("bar", ConcreteTestBean.class); + checkReadMethod("bar", ConcreteTestBean.class); } /**