This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit 8cc4713956a2c798b24537b69397c7efbd5e83a4 Author: Gary Gregory <[email protected]> AuthorDate: Sun Aug 16 18:13:40 2026 -0400 Revert "Javadoc" This reverts commit 59becdbc6c0ddfd713abdbf53840a31933f2f1ce. --- pom.xml | 2 +- src/changes/changes.xml | 1 - .../beanutils2/MappedPropertyDescriptor.java | 2 +- .../org/apache/commons/beanutils2/BeanMapTest.java | 25 +++++++++++++++++++++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7db1bc95..85022304 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ <commons.jacoco.complexityRatio>0.61</commons.jacoco.complexityRatio> <commons.jacoco.lineRatio>0.72</commons.jacoco.lineRatio> <!-- Dependencies --> - <commons.collections.version>4.6.0</commons.collections.version> + <commons.collections.version>4.5.0</commons.collections.version> <!-- TEMP until 2.0.0 is done. --> <commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications> </properties> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 229c6bc2..ee0bf6e4 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -62,7 +62,6 @@ <action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 85 to 103 #378, #387, #394, #395.</action> <action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-lang3 from 3.17.0 to 3.20.0 #357.</action> <action type="update" dev="ggregory" due-to="Gary Gregory">Bump commons-logging:commons-logging from 1.3.5 to 1.4.0.</action> - <action type="update" dev="ggregory" due-to="Gary Gregory">[test] Bump org.apache.commons:commons-collections4 from 4.5.0 to 4.6.0.</action> <!-- REMOVE --> <action dev="ggregory" type="remove" due-to="Gary Gregory">Remove unused ConstructorUtils in favor of Apache Commons Lang's org.apache.commons.lang3.ConstructorUtils. ConstructorUtils is unused in this component (org.apache.commons:commons-lang3).</action> <action dev="ggregory" type="remove" due-to="Gary Gregory">Remove unused org.apache.commons.beanutils2.MethodUtils.invoke*(*) methods in favor of Apache Commons Lang's org.apache.commons.lang3.reflect.MethodUtils (org.apache.commons:commons-lang3).</action> diff --git a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java index 012a3fbd..9a5b07e4 100644 --- a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java +++ b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java @@ -42,7 +42,7 @@ import java.util.Objects; public class MappedPropertyDescriptor extends PropertyDescriptor { /** - * Holds a {@link Method} in a {@link SoftReference} so that it doesn't prevent any ClassLoader being garbage collected, but tries to re-create the + * Holds a {@link Method} in a {@link SoftReference} so that it it doesn't prevent any ClassLoader being garbage collected, but tries to re-create the * method if the method reference has been released. * * See https://issues.apache.org/jira/browse/BEANUTILS-291 diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java b/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java index ae9c9270..071eb45c 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTest.java @@ -413,6 +413,27 @@ class BeanMapTest extends AbstractMapTest<BeanMap, String, Object> { assertEquals(Double.valueOf("6"), beanMap.getTypeTransformer(Double.TYPE).apply("6"), "Double.TYPE"); } + /** + * Need to override this method because the "clear()" method on the bean map just returns the bean properties to their default states. It does not actually + * remove the mappings as per the map contract. The default testClear() methods checks that the clear method throws an UnsupportedOperationException since + * this class is not add/remove modifiable. In our case though, we do not always throw that exception. + */ + @Override + @Test + public void testMapClear() { + // TODO: make sure a call to BeanMap.clear returns the bean to its + // default initialization values. + } + + /** + * Need to override this method because the "put()" method on the bean doesn't work for this type of Map. + */ + @Override + @Test + public void testMapPut() { + // see testBeanMapPutAllWriteable + } + @Test void testMethodAccessor() throws Exception { final BeanMap map = (BeanMap) makeFullMap(); @@ -427,9 +448,11 @@ class BeanMapTest extends AbstractMapTest<BeanMap, String, Object> { assertEquals(method, map.getWriteMethod("someIntegerValue")); } - @Test + @Override + // TODO @Test public void testReplaceAll() { assumeFalse(getMap().keySet().stream().anyMatch(k -> getMap().getWriteMethod(k) == null)); + super.testReplaceAll(); } /**
