You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/10/08 18:42:51 UTC
svn commit: r1843183 [1/2] - in /commons/proper/beanutils/trunk/src:
changes/ main/java/org/apache/commons/beanutils2/
main/java/org/apache/commons/beanutils2/locale/
main/java/org/apache/commons/beanutils2/locale/converters/
test/java/org/apache/commo...
Author: ggregory
Date: Mon Oct 8 18:42:50 2018
New Revision: 1843183
URL: http://svn.apache.org/viewvc?rev=1843183&view=rev
Log:
[BEANUTILS-514] Remove deprecated code for 2.0.0.
Modified:
commons/proper/beanutils/trunk/src/changes/changes.xml
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanIntrospectionDataTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosureTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/DefaultIntrospectionContextTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospectorTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/PropsFirstPropertyUtilsBean.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/SuppressPropertiesBeanIntrospectorTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/TestBean.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/ThrowExceptionConverter.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira18TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira456TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira463TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira61TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira92TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/CalendarConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/StringConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/converters/URLConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/expression/DefaultResolverTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java
Modified: commons/proper/beanutils/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/changes/changes.xml?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/changes/changes.xml (original)
+++ commons/proper/beanutils/trunk/src/changes/changes.xml Mon Oct 8 18:42:50 2018
@@ -45,6 +45,9 @@
<action issue="BEANUTILS-512" dev="ggregory" type="update" due-to="Gary Gregory">
Add Automatic-Module-Name entry to MANIFEST.MF.
</action>
+ <action issue="BEANUTILS-514" dev="ggregory" type="update" due-to="Gary Gregory">
+ Remove deprecated code for 2.0.0.
+ </action>
</release>
<release version="1.9.3" date="2016-09-21" description="Bug fix release, now builds with Java 8">
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java Mon Oct 8 18:42:50 2018
@@ -35,7 +35,7 @@ import java.util.Set;
* <p>This rather technical base class implements the methods of the
* {@code Map} interface on top of a {@code DynaBean}. It was introduced
* to handle generic parameters in a meaningful way without breaking
- * backwards compatibility of the {@link DynaBeanMapDecorator} class: A
+ * backwards compatibility of the 1.x {@code DynaBeanMapDecorator} class: A
* map wrapping a {@code DynaBean} should be of type {@code Map<String, Object>}.
* However, when using these generic parameters in {@code DynaBeanMapDecorator}
* this would be an incompatible change (as method signatures would have to
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java Mon Oct 8 18:42:50 2018
@@ -67,68 +67,6 @@ public class BeanMap extends AbstractMap
private static final Map<Class<? extends Object>, Transformer> typeTransformers =
Collections.unmodifiableMap(createTypeTransformers());
- /**
- * This HashMap has been made unmodifiable to prevent issues when
- * loaded in a shared ClassLoader environment.
- *
- * @see "http://issues.apache.org/jira/browse/BEANUTILS-112"
- * @deprecated Use {@link BeanMap#getTypeTransformer(Class)} method
- */
- @Deprecated
- public static HashMap defaultTransformers = new HashMap() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void clear() {
- throw new UnsupportedOperationException();
- }
- @Override
- public boolean containsKey(final Object key) {
- return typeTransformers.containsKey(key);
- }
- @Override
- public boolean containsValue(final Object value) {
- return typeTransformers.containsValue(value);
- }
- @Override
- public Set entrySet() {
- return typeTransformers.entrySet();
- }
- @Override
- public Object get(final Object key) {
- return typeTransformers.get(key);
- }
- @Override
- public boolean isEmpty() {
- return false;
- }
- @Override
- public Set keySet() {
- return typeTransformers.keySet();
- }
- @Override
- public Object put(final Object key, final Object value) {
- throw new UnsupportedOperationException();
- }
- @Override
- public void putAll(final Map m) {
- throw new UnsupportedOperationException();
- }
- @Override
- public Object remove(final Object key) {
- throw new UnsupportedOperationException();
- }
- @Override
- public int size() {
- return typeTransformers.size();
- }
- @Override
- public Collection values() {
- return typeTransformers.values();
- }
- };
-
private static Map<Class<? extends Object>, Transformer> createTypeTransformers() {
final Map<Class<? extends Object>, Transformer> defTransformers =
new HashMap<>();
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java Mon Oct 8 18:42:50 2018
@@ -17,12 +17,12 @@
package org.apache.commons.beanutils2;
+import java.lang.reflect.InvocationTargetException;
+
import org.apache.commons.collections4.Predicate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.lang.reflect.InvocationTargetException;
-
/**
* <p>Predicate implementation that applies the given <code>Predicate</code>
* to the result of calling the given property getter.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java Mon Oct 8 18:42:50 2018
@@ -17,12 +17,12 @@
package org.apache.commons.beanutils2;
+import java.lang.reflect.InvocationTargetException;
+
import org.apache.commons.collections4.Closure;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.lang.reflect.InvocationTargetException;
-
/**
* <p><code>Closure</code> that sets a property.</p>
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java Mon Oct 8 18:42:50 2018
@@ -17,12 +17,12 @@
package org.apache.commons.beanutils2;
+import java.lang.reflect.InvocationTargetException;
+
import org.apache.commons.collections4.Transformer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.lang.reflect.InvocationTargetException;
-
/**
* <p><code>Transformer</code> that outputs a property value.</p>
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java Mon Oct 8 18:42:50 2018
@@ -40,44 +40,7 @@ public class BeanUtils {
// ------------------------------------------------------ Private Variables
- /**
- * The debugging detail level for this component.
- *
- * Note that this static variable will have unexpected side-effects if
- * this class is deployed in a shared classloader within a container.
- * However as it is actually completely ignored by this class due to its
- * deprecated status, it doesn't do any actual harm.
- *
- * @deprecated BeanUtils now uses commons-logging for all log messages.
- * Use your favorite logging tool to configure logging for
- * this class.
- */
- @Deprecated
- private static int debug = 0;
-
- /**
- * The <code>debug</code> static property is no longer used
- * @return debug property
- * @deprecated BeanUtils now uses commons-logging for all log messages.
- * Use your favorite logging tool to configure logging for
- * this class.
- */
- @Deprecated
- public static int getDebug() {
- return debug;
- }
-
- /**
- * The <code>debug</code> static property is no longer used
- * @param newDebug debug property
- * @deprecated BeanUtils now uses commons-logging for all log messages.
- * Use your favorite logging tool to configure logging for
- * this class.
- */
- @Deprecated
- public static void setDebug(final int newDebug) {
- debug = newDebug;
- }
+
// --------------------------------------------------------- Class Methods
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java Mon Oct 8 18:42:50 2018
@@ -34,188 +34,7 @@ public class ConvertUtils {
// ------------------------------------------------------ Static Properties
- /**
- * Gets the default value for Boolean conversions.
- * @return The default Boolean value
- * @deprecated Register replacement converters for Boolean.TYPE and
- * Boolean.class instead
- */
- @Deprecated
- public static boolean getDefaultBoolean() {
- return ConvertUtilsBean.getInstance().getDefaultBoolean();
- }
-
- /**
- * Sets the default value for Boolean conversions.
- * @param newDefaultBoolean The default Boolean value
- * @deprecated Register replacement converters for Boolean.TYPE and
- * Boolean.class instead
- */
- @Deprecated
- public static void setDefaultBoolean(final boolean newDefaultBoolean) {
- ConvertUtilsBean.getInstance().setDefaultBoolean(newDefaultBoolean);
- }
-
-
- /**
- * Gets the default value for Byte conversions.
- * @return The default Byte value
- * @deprecated Register replacement converters for Byte.TYPE and
- * Byte.class instead
- */
- @Deprecated
- public static byte getDefaultByte() {
- return ConvertUtilsBean.getInstance().getDefaultByte();
- }
-
- /**
- * Sets the default value for Byte conversions.
- * @param newDefaultByte The default Byte value
- * @deprecated Register replacement converters for Byte.TYPE and
- * Byte.class instead
- */
- @Deprecated
- public static void setDefaultByte(final byte newDefaultByte) {
- ConvertUtilsBean.getInstance().setDefaultByte(newDefaultByte);
- }
-
-
- /**
- * Gets the default value for Character conversions.
- * @return The default Character value
- * @deprecated Register replacement converters for Character.TYPE and
- * Character.class instead
- */
- @Deprecated
- public static char getDefaultCharacter() {
- return ConvertUtilsBean.getInstance().getDefaultCharacter();
- }
-
- /**
- * Sets the default value for Character conversions.
- * @param newDefaultCharacter The default Character value
- * @deprecated Register replacement converters for Character.TYPE and
- * Character.class instead
- */
- @Deprecated
- public static void setDefaultCharacter(final char newDefaultCharacter) {
- ConvertUtilsBean.getInstance().setDefaultCharacter(newDefaultCharacter);
- }
-
-
- /**
- * Gets the default value for Double conversions.
- * @return The default Double value
- * @deprecated Register replacement converters for Double.TYPE and
- * Double.class instead
- */
- @Deprecated
- public static double getDefaultDouble() {
- return ConvertUtilsBean.getInstance().getDefaultDouble();
- }
-
- /**
- * Sets the default value for Double conversions.
- * @param newDefaultDouble The default Double value
- * @deprecated Register replacement converters for Double.TYPE and
- * Double.class instead
- */
- @Deprecated
- public static void setDefaultDouble(final double newDefaultDouble) {
- ConvertUtilsBean.getInstance().setDefaultDouble(newDefaultDouble);
- }
-
-
- /**
- * Get the default value for Float conversions.
- * @return The default Float value
- * @deprecated Register replacement converters for Float.TYPE and
- * Float.class instead
- */
- @Deprecated
- public static float getDefaultFloat() {
- return ConvertUtilsBean.getInstance().getDefaultFloat();
- }
-
- /**
- * Sets the default value for Float conversions.
- * @param newDefaultFloat The default Float value
- * @deprecated Register replacement converters for Float.TYPE and
- * Float.class instead
- */
- @Deprecated
- public static void setDefaultFloat(final float newDefaultFloat) {
- ConvertUtilsBean.getInstance().setDefaultFloat(newDefaultFloat);
- }
-
-
- /**
- * Gets the default value for Integer conversions.
- * @return The default Integer value
- * @deprecated Register replacement converters for Integer.TYPE and
- * Integer.class instead
- */
- @Deprecated
- public static int getDefaultInteger() {
- return ConvertUtilsBean.getInstance().getDefaultInteger();
- }
-
- /**
- * Sets the default value for Integer conversions.
- * @param newDefaultInteger The default Integer value
- * @deprecated Register replacement converters for Integer.TYPE and
- * Integer.class instead
- */
- @Deprecated
- public static void setDefaultInteger(final int newDefaultInteger) {
- ConvertUtilsBean.getInstance().setDefaultInteger(newDefaultInteger);
- }
-
-
- /**
- * Gets the default value for Long conversions.
- * @return The default Long value
- * @deprecated Register replacement converters for Long.TYPE and
- * Long.class instead
- */
- @Deprecated
- public static long getDefaultLong() {
- return ConvertUtilsBean.getInstance().getDefaultLong();
- }
-
- /**
- * Sets the default value for Long conversions.
- * @param newDefaultLong The default Long value
- * @deprecated Register replacement converters for Long.TYPE and
- * Long.class instead
- */
- @Deprecated
- public static void setDefaultLong(final long newDefaultLong) {
- ConvertUtilsBean.getInstance().setDefaultLong(newDefaultLong);
- }
-
-
- /**
- * Gets the default value for Short conversions.
- * @return The default Short value
- * @deprecated Register replacement converters for Short.TYPE and
- * Short.class instead
- */
- @Deprecated
- public static short getDefaultShort() {
- return ConvertUtilsBean.getInstance().getDefaultShort();
- }
-
- /**
- * Sets the default value for Short conversions.
- * @param newDefaultShort The default Short value
- * @deprecated Register replacement converters for Short.TYPE and
- * Short.class instead
- */
- @Deprecated
- public static void setDefaultShort(final short newDefaultShort) {
- ConvertUtilsBean.getInstance().setDefaultShort(newDefaultShort);
- }
+
// --------------------------------------------------------- Public Classes
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java Mon Oct 8 18:42:50 2018
@@ -165,273 +165,6 @@ public class ConvertUtilsBean {
// --------------------------------------------------------- Public Methods
/**
- * The default value for Boolean conversions.
- * @deprecated Register replacement converters for Boolean.TYPE and
- * Boolean.class instead
- */
- @Deprecated
- private Boolean defaultBoolean = Boolean.FALSE;
-
- /**
- * Gets the default value for Boolean conversions.
- * @return The default Boolean value
- * @deprecated Register replacement converters for Boolean.TYPE and
- * Boolean.class instead
- */
- @Deprecated
- public boolean getDefaultBoolean() {
- return defaultBoolean.booleanValue();
- }
-
- /**
- * Sets the default value for Boolean conversions.
- * @param newDefaultBoolean The default Boolean value
- * @deprecated Register replacement converters for Boolean.TYPE and
- * Boolean.class instead
- */
- @Deprecated
- public void setDefaultBoolean(final boolean newDefaultBoolean) {
- defaultBoolean = newDefaultBoolean ? Boolean.TRUE : Boolean.FALSE;
- register(new BooleanConverter(defaultBoolean), Boolean.TYPE);
- register(new BooleanConverter(defaultBoolean), Boolean.class);
- }
-
-
- /**
- * The default value for Byte conversions.
- * @deprecated Register replacement converters for Byte.TYPE and
- * Byte.class instead
- */
- @Deprecated
- private Byte defaultByte = Byte.valueOf((byte) 0);
-
- /**
- * Gets the default value for Byte conversions.
- * @return The default Byte value
- * @deprecated Register replacement converters for Byte.TYPE and
- * Byte.class instead
- */
- @Deprecated
- public byte getDefaultByte() {
- return defaultByte.byteValue();
- }
-
- /**
- * Sets the default value for Byte conversions.
- * @param newDefaultByte The default Byte value
- * @deprecated Register replacement converters for Byte.TYPE and
- * Byte.class instead
- */
- @Deprecated
- public void setDefaultByte(final byte newDefaultByte) {
- defaultByte = Byte.valueOf(newDefaultByte);
- register(new ByteConverter(defaultByte), Byte.TYPE);
- register(new ByteConverter(defaultByte), Byte.class);
- }
-
-
- /**
- * The default value for Character conversions.
- * @deprecated Register replacement converters for Character.TYPE and
- * Character.class instead
- */
- @Deprecated
- private Character defaultCharacter = Character.valueOf(' ');
-
- /**
- * Gets the default value for Character conversions.
- * @return The default Character value
- * @deprecated Register replacement converters for Character.TYPE and
- * Character.class instead
- */
- @Deprecated
- public char getDefaultCharacter() {
- return defaultCharacter.charValue();
- }
-
- /**
- * Sets the default value for Character conversions.
- * @param newDefaultCharacter The default Character value
- * @deprecated Register replacement converters for Character.TYPE and
- * Character.class instead
- */
- @Deprecated
- public void setDefaultCharacter(final char newDefaultCharacter) {
- defaultCharacter = Character.valueOf(newDefaultCharacter);
- register(new CharacterConverter(defaultCharacter),
- Character.TYPE);
- register(new CharacterConverter(defaultCharacter),
- Character.class);
- }
-
-
- /**
- * The default value for Double conversions.
- * @deprecated Register replacement converters for Double.TYPE and
- * Double.class instead
- */
- @Deprecated
- private Double defaultDouble = Double.valueOf(0.0);
-
- /**
- * Gets the default value for Double conversions.
- * @return The default Double value
- * @deprecated Register replacement converters for Double.TYPE and
- * Double.class instead
- */
- @Deprecated
- public double getDefaultDouble() {
- return defaultDouble.doubleValue();
- }
-
- /**
- * Sets the default value for Double conversions.
- * @param newDefaultDouble The default Double value
- * @deprecated Register replacement converters for Double.TYPE and
- * Double.class instead
- */
- @Deprecated
- public void setDefaultDouble(final double newDefaultDouble) {
- defaultDouble = Double.valueOf(newDefaultDouble);
- register(new DoubleConverter(defaultDouble), Double.TYPE);
- register(new DoubleConverter(defaultDouble), Double.class);
- }
-
-
- /**
- * The default value for Float conversions.
- * @deprecated Register replacement converters for Float.TYPE and
- * Float.class instead
- */
- @Deprecated
- private Float defaultFloat = Float.valueOf((float) 0.0);
-
- /**
- * Gets the default value for Float conversions.
- * @return The default Float value
- * @deprecated Register replacement converters for Float.TYPE and
- * Float.class instead
- */
- @Deprecated
- public float getDefaultFloat() {
- return defaultFloat.floatValue();
- }
-
- /**
- * Sets the default value for Float conversions.
- * @param newDefaultFloat The default Float value
- * @deprecated Register replacement converters for Float.TYPE and
- * Float.class instead
- */
- @Deprecated
- public void setDefaultFloat(final float newDefaultFloat) {
- defaultFloat = Float.valueOf(newDefaultFloat);
- register(new FloatConverter(defaultFloat), Float.TYPE);
- register(new FloatConverter(defaultFloat), Float.class);
- }
-
-
- /**
- * The default value for Integer conversions.
- * @deprecated Register replacement converters for Integer.TYPE and
- * Integer.class instead
- */
- @Deprecated
- private Integer defaultInteger = Integer.valueOf(0);
-
- /**
- * Gets the default value for Integer conversions.
- * @return The default Integer value
- * @deprecated Register replacement converters for Integer.TYPE and
- * Integer.class instead
- */
- @Deprecated
- public int getDefaultInteger() {
- return defaultInteger.intValue();
- }
-
- /**
- * Sets the default value for Integer conversions.
- * @param newDefaultInteger The default Integer value
- * @deprecated Register replacement converters for Integer.TYPE and
- * Integer.class instead
- */
- @Deprecated
- public void setDefaultInteger(final int newDefaultInteger) {
- defaultInteger = Integer.valueOf(newDefaultInteger);
- register(new IntegerConverter(defaultInteger), Integer.TYPE);
- register(new IntegerConverter(defaultInteger), Integer.class);
- }
-
-
- /**
- * The default value for Long conversions.
- * @deprecated Register replacement converters for Long.TYPE and
- * Long.class instead
- */
- @Deprecated
- private Long defaultLong = Long.valueOf(0);
-
- /**
- * Gets the default value for Long conversions.
- * @return The default Long value
- * @deprecated Register replacement converters for Long.TYPE and
- * Long.class instead
- */
- @Deprecated
- public long getDefaultLong() {
- return defaultLong.longValue();
- }
-
- /**
- * Sets the default value for Long conversions.
- * @param newDefaultLong The default Long value
- * @deprecated Register replacement converters for Long.TYPE and
- * Long.class instead
- */
- @Deprecated
- public void setDefaultLong(final long newDefaultLong) {
- defaultLong = Long.valueOf(newDefaultLong);
- register(new LongConverter(defaultLong), Long.TYPE);
- register(new LongConverter(defaultLong), Long.class);
- }
-
-
- /**
- * The default value for Short conversions.
- * @deprecated Register replacement converters for Short.TYPE and
- * Short.class instead
- */
- @Deprecated
- private static Short defaultShort = Short.valueOf((short) 0);
-
- /**
- * Gets the default value for Short conversions.
- * @return The default Short value
- * @deprecated Register replacement converters for Short.TYPE and
- * Short.class instead
- */
- @Deprecated
- public short getDefaultShort() {
- return defaultShort.shortValue();
- }
-
- /**
- * Sets the default value for Short conversions.
- * @param newDefaultShort The default Short value
- * @deprecated Register replacement converters for Short.TYPE and
- * Short.class instead
- */
- @Deprecated
- public void setDefaultShort(final short newDefaultShort) {
- defaultShort = Short.valueOf(newDefaultShort);
- register(new ShortConverter(defaultShort), Short.TYPE);
- register(new ShortConverter(defaultShort), Short.class);
- }
-
-
-
- /**
* Convert the specified value into a String. If the specified value
* is an array, the first element (converted to a String) will be
* returned. The registered {@link Converter} for the
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java Mon Oct 8 18:42:50 2018
@@ -25,8 +25,8 @@ import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.ArrayList;
-import java.util.List;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java Mon Oct 8 18:42:50 2018
@@ -42,98 +42,13 @@ public class PropertyUtils {
// ----------------------------------------------------- Manifest Constants
- /**
- * The delimiter that preceeds the zero-relative subscript for an
- * indexed reference.
- *
- * @deprecated The notation used for property name expressions is now
- * dependant on the {@link org.apache.commons.beanutils2.expression.Resolver}
- * implementation being used.
- */
- @Deprecated
- public static final char INDEXED_DELIM = '[';
-
-
- /**
- * The delimiter that follows the zero-relative subscript for an
- * indexed reference.
- *
- * @deprecated The notation used for property name expressions is now
- * dependant on the {@link org.apache.commons.beanutils2.expression.Resolver}
- * implementation being used.
- */
- @Deprecated
- public static final char INDEXED_DELIM2 = ']';
-
-
- /**
- * The delimiter that preceeds the key of a mapped property.
- *
- * @deprecated The notation used for property name expressions is now
- * dependant on the {@link org.apache.commons.beanutils2.expression.Resolver}
- * implementation being used.
- */
- @Deprecated
- public static final char MAPPED_DELIM = '(';
-
-
- /**
- * The delimiter that follows the key of a mapped property.
- *
- * @deprecated The notation used for property name expressions is now
- * dependant on the {@link org.apache.commons.beanutils2.expression.Resolver}
- * implementation being used.
- */
- @Deprecated
- public static final char MAPPED_DELIM2 = ')';
-
-
- /**
- * The delimiter that separates the components of a nested reference.
- *
- * @deprecated The notation used for property name expressions is now
- * dependant on the {@link org.apache.commons.beanutils2.expression.Resolver}
- * implementation being used.
- */
- @Deprecated
- public static final char NESTED_DELIM = '.';
+
// ------------------------------------------------------- Static Variables
- /**
- * The debugging detail level for this component.
- *
- * Note that this static variable will have unexpected side-effects if
- * this class is deployed in a shared classloader within a container.
- * However as it is actually completely ignored by this class due to its
- * deprecated status, it doesn't do any actual harm.
- *
- * @deprecated The <code>debug</code> static property is no longer used
- */
- @Deprecated
- private static int debug = 0;
-
- /**
- * The <code>debug</code> static property is no longer used
- * @return debug property
- * @deprecated The <code>debug</code> static property is no longer used
- */
- @Deprecated
- public static int getDebug() {
- return debug;
- }
-
- /**
- * The <code>debug</code> static property is no longer used
- * @param newDebug debug property
- * @deprecated The <code>debug</code> static property is no longer used
- */
- @Deprecated
- public static void setDebug(final int newDebug) {
- debug = newDebug;
- }
+
// --------------------------------------------------------- Public Methods
@@ -381,24 +296,6 @@ public class PropertyUtils {
}
-
- /**
- * <p>Return the mapped property descriptors for this bean.</p>
- *
- * <p>For more details see <code>PropertyUtilsBean</code>.</p>
- *
- * @param bean Bean to be introspected
- * @return the mapped property descriptors
- * @see PropertyUtilsBean#getMappedPropertyDescriptors(Object)
- * @deprecated This method should not be exposed
- */
- @Deprecated
- public static Map<Class<?>, Map> getMappedPropertyDescriptors(final Object bean) {
-
- return PropertyUtilsBean.getInstance().getMappedPropertyDescriptors(bean);
-
- }
-
/**
* <p>Return the value of the (possibly nested) property of the specified
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java Mon Oct 8 18:42:50 2018
@@ -21,11 +21,8 @@ package org.apache.commons.beanutils2;
import java.beans.PropertyDescriptor;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.WeakHashMap;
@@ -86,16 +83,6 @@ public class WrapDynaClass implements Dy
private final PropertyUtilsBean propertyUtilsBean;
/**
- * The JavaBean <code>Class</code> which is represented by this
- * <code>WrapDynaClass</code>.
- *
- * @deprecated No longer initialized, use getBeanClass() method instead
- */
- @Deprecated
- protected Class<?> beanClass = null;
-
-
- /**
* The set of PropertyDescriptors for this bean class.
*/
protected PropertyDescriptor[] descriptors = null;
@@ -155,113 +142,7 @@ public class WrapDynaClass implements Dy
return CLASSLOADER_CACHE.get();
}
- /**
- * The set of <code>WrapDynaClass</code> instances that have ever been
- * created, keyed by the underlying bean Class. The keys to this map
- * are Class objects, and the values are corresponding WrapDynaClass
- * objects.
- * <p>
- * This static variable is safe even when this code is deployed via a
- * shared classloader because it is keyed via a Class object. The same
- * class loaded via two different classloaders will result in different
- * entries in this map.
- * <p>
- * Note, however, that this HashMap can result in a memory leak. When
- * this class is in a shared classloader it will retain references to
- * classes loaded via a webapp classloader even after the webapp has been
- * undeployed. That will prevent the entire classloader and all the classes
- * it refers to and all their static members from being freed.
- *
- ************* !!!!!!!!!!!! PLEASE NOTE !!!!!!!!!!!! *************
- *
- * THE FOLLOWING IS A NASTY HACK TO SO THAT BEANUTILS REMAINS BINARY
- * COMPATIBLE WITH PREVIOUS RELEASES.
- *
- * There are two issues here:
- *
- * 1) Memory Issues: The static HashMap caused memory problems (See BEANUTILS-59)
- * to resolve this it has been moved into a ContextClassLoaderLocal instance
- * (named CLASSLOADER_CACHE above) which holds one copy per
- * ClassLoader in a WeakHashMap.
- *
- * 2) Binary Compatibility: As the "dynaClasses" static HashMap is "protected"
- * removing it breaks BeanUtils binary compatibility with previous versions.
- * To resolve this all the methods have been overriden to delegate to the
- * Map for the ClassLoader in the ContextClassLoaderLocal.
- *
- * @deprecated The dynaClasses Map will be removed in a subsequent release
- */
- @Deprecated
- protected static HashMap<Object, Object> dynaClasses = new HashMap<Object, Object>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void clear() {
- getDynaClassesMap().clear();
- }
- @Override
- public boolean containsKey(final Object key) {
- return getDynaClassesMap().containsKey(key);
- }
- @Override
- public boolean containsValue(final Object value) {
- return getDynaClassesMap().containsValue(value);
- }
- @Override
- public Set<Map.Entry<Object, Object>> entrySet() {
- return getDynaClassesMap().entrySet();
- }
- @Override
- public boolean equals(final Object o) {
- return getDynaClassesMap().equals(o);
- }
- @Override
- public Object get(final Object key) {
- return getDynaClassesMap().get(key);
- }
- @Override
- public int hashCode() {
- return getDynaClassesMap().hashCode();
- }
- @Override
- public boolean isEmpty() {
- return getDynaClassesMap().isEmpty();
- }
- @Override
- public Set<Object> keySet() {
- // extract the classes from the key to stay backwards compatible
- final Set<Object> result = new HashSet<>();
- for (final CacheKey k : getClassesCache().keySet()) {
- result.add(k.beanClass);
- }
- return result;
- }
- @Override
- public Object put(final Object key, final Object value) {
- return getClassesCache().put(
- new CacheKey((Class<?>) key, PropertyUtilsBean.getInstance()),
- (WrapDynaClass) value);
- }
- @Override
- public void putAll(final Map<? extends Object, ? extends Object> m) {
- for (final Map.Entry<? extends Object, ? extends Object> e : m.entrySet()) {
- put(e.getKey(), e.getValue());
- }
- }
- @Override
- public Object remove(final Object key) {
- return getDynaClassesMap().remove(key);
- }
- @Override
- public int size() {
- return getDynaClassesMap().size();
- }
- @Override
- public Collection<Object> values() {
- return getDynaClassesMap().values();
- }
- };
+
// ------------------------------------------------------ DynaClass Methods
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java Mon Oct 8 18:42:50 2018
@@ -621,152 +621,6 @@ public class LocaleBeanUtils extends Bea
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().invokeSetter(target, propName, key, index, newValue);
}
-
- /**
- * Resolve any nested expression to get the actual target bean.
- *
- * @deprecated moved into <code>LocaleBeanUtilsBean</code>
- * @param bean The bean
- * @param name The property name
- * @return The property's descriptor
- *
- * @throws IllegalAccessException if the caller does not have
- * access to the property accessor method
- * @throws InvocationTargetException if the property accessor method
- * throws an exception
- */
- @Deprecated
- protected static Descriptor calculate(final Object bean, final String name)
- throws IllegalAccessException, InvocationTargetException {
-
- final org.apache.commons.beanutils2.locale.LocaleBeanUtilsBean.Descriptor descriptor
- = LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().calculate(bean, name);
- return new Descriptor(
- descriptor.getTarget(),
- descriptor.getName(),
- descriptor.getPropName(),
- descriptor.getKey(),
- descriptor.getIndex());
- }
-
- /** @deprecated moved into <code>LocaleBeanUtils</code> */
- @Deprecated
- protected static class Descriptor {
-
- private int index = -1; // Indexed subscript value (if any)
- private String name;
- private String propName; // Simple name of target property
- private String key; // Mapped key value (if any)
- private Object target;
-
- /**
- * Construct a descriptor instance for the target bean and property.
- *
- * @param target The target bean
- * @param name The property name (includes indexed/mapped expr)
- * @param propName The property name
- * @param key The mapped property key (if any)
- * @param index The indexed property index (if any)
- */
- public Descriptor(final Object target, final String name, final String propName, final String key, final int index) {
-
- setTarget(target);
- setName(name);
- setPropName(propName);
- setKey(key);
- setIndex(index);
- }
-
- /**
- * Return the target bean.
- *
- * @return The descriptors target bean
- */
- public Object getTarget() {
- return target;
- }
-
- /**
- * Set the target bean.
- *
- * @param target The target bean
- */
- public void setTarget(final Object target) {
- this.target = target;
- }
-
- /**
- * Return the mapped property key.
- *
- * @return the mapped property key (if any)
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Set the mapped property key.
- *
- * @param key The mapped property key (if any)
- */
- public void setKey(final String key) {
- this.key = key;
- }
-
- /**
- * Return indexed property index.
- *
- * @return indexed property index (if any)
- */
- public int getIndex() {
- return index;
- }
-
- /**
- * Set the indexed property index.
- *
- * @param index The indexed property index (if any)
- */
- public void setIndex(final int index) {
- this.index = index;
- }
-
- /**
- * Return property name (includes indexed/mapped expr).
- *
- * @return The property name (includes indexed/mapped expr)
- */
- public String getName() {
- return name;
- }
-
- /**
- * Set the property name (includes indexed/mapped expr).
- *
- * @param name The property name (includes indexed/mapped expr)
- */
- public void setName(final String name) {
- this.name = name;
- }
-
- /**
- * Return the property name.
- *
- * @return The property name
- */
- public String getPropName() {
- return propName;
- }
-
- /**
- * Set the property name.
- *
- * @param propName The property name
- */
- public void setPropName(final String propName) {
- this.propName = propName;
- }
- }
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java Mon Oct 8 18:42:50 2018
@@ -894,172 +894,6 @@ public class LocaleBeanUtilsBean extends
(e, "Cannot set " + propName);
}
}
-
- /**
- * Resolve any nested expression to get the actual target property.
- *
- * @param bean The bean
- * @param name The property name
- * @return The property's descriptor
- *
- * @throws IllegalAccessException if the caller does not have
- * access to the property accessor method
- * @throws InvocationTargetException if the property accessor method
- * throws an exception
- * @deprecated Property name expressions are now processed by
- * the configured {@link Resolver} implementation and this method
- * is no longer used by BeanUtils.
- */
- @Deprecated
- protected Descriptor calculate(final Object bean, String name)
- throws IllegalAccessException, InvocationTargetException {
-
- // Resolve any nested expression to get the actual target bean
- Object target = bean;
- final Resolver resolver = getPropertyUtils().getResolver();
- while (resolver.hasNested(name)) {
- try {
- target = getPropertyUtils().getProperty(target, resolver.next(name));
- name = resolver.remove(name);
- } catch (final NoSuchMethodException e) {
- return null; // Skip this property setter
- }
- }
- if (log.isTraceEnabled()) {
- log.trace(" Target bean = " + target);
- log.trace(" Target name = " + name);
- }
-
- // Declare local variables we will require
- final String propName = resolver.getProperty(name); // Simple name of target property
- final int index = resolver.getIndex(name); // Indexed subscript value (if any)
- final String key = resolver.getKey(name); // Mapped key value (if any)
-
- return new Descriptor(target, name, propName, key, index);
- }
-
- /**
- * @deprecated Property name expressions are now processed by
- * the configured {@link Resolver} implementation and this class
- * is no longer used by BeanUtils.
- */
- @Deprecated
- protected class Descriptor {
-
- private int index = -1; // Indexed subscript value (if any)
- private String name;
- private String propName; // Simple name of target property
- private String key; // Mapped key value (if any)
- private Object target;
-
- /**
- * Construct a descriptor instance for the target bean and property.
- *
- * @param target The target bean
- * @param name The property name (includes indexed/mapped expr)
- * @param propName The property name
- * @param key The mapped property key (if any)
- * @param index The indexed property index (if any)
- */
- public Descriptor(final Object target, final String name, final String propName, final String key, final int index) {
-
- setTarget(target);
- setName(name);
- setPropName(propName);
- setKey(key);
- setIndex(index);
- }
-
- /**
- * Return the target bean.
- *
- * @return The descriptors target bean
- */
- public Object getTarget() {
- return target;
- }
-
- /**
- * Set the target bean.
- *
- * @param target The target bean
- */
- public void setTarget(final Object target) {
- this.target = target;
- }
-
- /**
- * Return the mapped property key.
- *
- * @return the mapped property key (if any)
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Set the mapped property key.
- *
- * @param key The mapped property key (if any)
- */
- public void setKey(final String key) {
- this.key = key;
- }
-
- /**
- * Return indexed property index.
- *
- * @return indexed property index (if any)
- */
- public int getIndex() {
- return index;
- }
-
- /**
- * Set the indexed property index.
- *
- * @param index The indexed property index (if any)
- */
- public void setIndex(final int index) {
- this.index = index;
- }
-
- /**
- * Return property name (includes indexed/mapped expr).
- *
- * @return The property name (includes indexed/mapped expr)
- */
- public String getName() {
- return name;
- }
-
- /**
- * Set the property name (includes indexed/mapped expr).
- *
- * @param name The property name (includes indexed/mapped expr)
- */
- public void setName(final String name) {
- this.name = name;
- }
-
- /**
- * Return the property name.
- *
- * @return The property name
- */
- public String getPropName() {
- return propName;
- }
-
- /**
- * Set the property name.
- *
- * @param propName The property name
- */
- public void setPropName(final String propName) {
- this.propName = propName;
- }
- }
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java Mon Oct 8 18:42:50 2018
@@ -18,9 +18,6 @@
package org.apache.commons.beanutils2.locale;
import java.util.Locale;
-import java.util.Map;
-
-import org.apache.commons.beanutils2.locale.LocaleConverter;
/**
* <p>Utility methods for converting locale-sensitive String scalar values to objects of the
@@ -315,37 +312,4 @@ public class LocaleConvertUtils {
return LocaleConvertUtilsBean.getInstance().lookup(clazz, locale);
}
-
- /**
- * <p>Look up and return any registered map instance for the specified locale.</p>
- *
- * <p>For more details see <code>LocaleConvertUtilsBean</code></p>
- *
- * @param locale The Locale
- * @return The map instance contains the all {@link LocaleConverter} types for
- * the specified locale.
- * @see LocaleConvertUtilsBean#lookup(Locale)
- * @deprecated This method will be modified to return a Map in the next release.
- */
- @Deprecated
- protected static Map<Class<?>, LocaleConverter> lookup(final Locale locale) {
- return LocaleConvertUtilsBean.getInstance().lookup(locale);
- }
-
- /**
- * <p>Create all {@link LocaleConverter} types for specified locale.</p>
- *
- * <p>For more details see <code>LocaleConvertUtilsBean</code></p>
- *
- * @param locale The Locale
- * @return The map instance contains the all {@link LocaleConverter} types
- * for the specified locale.
- * @see LocaleConvertUtilsBean#create(Locale)
- * @deprecated This method will be modified to return a Map in the next release.
- */
- @Deprecated
- protected static Map<Class<?>, LocaleConverter> create(final Locale locale) {
-
- return LocaleConvertUtilsBean.getInstance().create(locale);
- }
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java Mon Oct 8 18:42:50 2018
@@ -431,9 +431,7 @@ public class LocaleConvertUtilsBean {
* @param locale The Locale
* @return The map instance contains the all {@link LocaleConverter} types for
* the specified locale.
- * @deprecated This method will be modified to return a Map in the next release.
*/
- @Deprecated
protected Map<Class<?>, LocaleConverter> lookup(final Locale locale) {
Map<Class<?>, LocaleConverter> localeConverters;
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,13 +17,12 @@
package org.apache.commons.beanutils2.locale.converters;
+import java.math.BigDecimal;
+import java.text.ParseException;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-import java.math.BigDecimal;
-import java.text.ParseException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,13 +17,12 @@
package org.apache.commons.beanutils2.locale.converters;
+import java.math.BigInteger;
+import java.text.ParseException;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-import java.math.BigInteger;
-import java.text.ParseException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,12 +17,11 @@
package org.apache.commons.beanutils2.locale.converters;
+import java.text.ParseException;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-import java.text.ParseException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,15 +17,15 @@
package org.apache.commons.beanutils2.locale.converters;
-import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Locale;
+import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,12 +17,11 @@
package org.apache.commons.beanutils2.locale.converters;
+import java.text.ParseException;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-import java.text.ParseException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,12 +17,11 @@
package org.apache.commons.beanutils2.locale.converters;
+import java.text.ParseException;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-import java.text.ParseException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,8 +17,8 @@
package org.apache.commons.beanutils2.locale.converters;
-import java.util.Locale;
import java.text.ParseException;
+import java.util.Locale;
/**
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,12 +17,11 @@
package org.apache.commons.beanutils2.locale.converters;
+import java.text.ParseException;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-import java.text.ParseException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java Mon Oct 8 18:42:50 2018
@@ -17,10 +17,6 @@
package org.apache.commons.beanutils2.locale.converters;
-import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.DecimalFormat;
@@ -30,6 +26,11 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
+import org.apache.commons.beanutils2.ConversionException;
+import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java Mon Oct 8 18:42:50 2018
@@ -23,19 +23,13 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.beanutils2.BasicDynaClass;
-import org.apache.commons.beanutils2.DynaBean;
-import org.apache.commons.beanutils2.DynaClass;
-import org.apache.commons.beanutils2.DynaProperty;
-
-import junit.framework.TestCase;
import junit.framework.Test;
+import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java Mon Oct 8 18:42:50 2018
@@ -18,8 +18,6 @@
package org.apache.commons.beanutils2;
-import org.apache.commons.beanutils2.BeanComparator;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanIntrospectionDataTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanIntrospectionDataTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanIntrospectionDataTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanIntrospectionDataTestCase.java Mon Oct 8 18:42:50 2018
@@ -21,10 +21,6 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.beanutils2.BeanIntrospectionData;
-import org.apache.commons.beanutils2.FluentPropertyBeanIntrospector;
-import org.apache.commons.beanutils2.PropertyUtilsBean;
-
import junit.framework.TestCase;
/**
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java Mon Oct 8 18:42:50 2018
@@ -19,19 +19,15 @@ package org.apache.commons.beanutils2;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.HashMap;
import java.util.Map;
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
-import org.apache.commons.beanutils2.BeanMap;
-import org.apache.commons.beanutils2.PropertyUtils;
import org.apache.commons.beanutils2.bugs.other.Jira87BeanFactory;
import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections4.Transformer;
import org.apache.commons.collections.map.AbstractTestMap;
+import junit.framework.Test;
+import junit.textui.TestRunner;
+
/**
* Test cases for BeanMap
*
@@ -390,60 +386,6 @@ public class BeanMapTestCase extends Abs
}
/**
- * Test the default transformers via the public static Map instance
- */
- public void testGetDefaultTransformersMap() {
- assertEquals("Boolean.TYPE", Boolean.TRUE, ((Transformer)BeanMap.defaultTransformers.get(Boolean.TYPE)).transform("true"));
- assertEquals("Character.TYPE", new Character('B'), ((Transformer)BeanMap.defaultTransformers.get(Character.TYPE)).transform("BCD"));
- assertEquals("Byte.TYPE", new Byte((byte)1), ((Transformer)BeanMap.defaultTransformers.get(Byte.TYPE)).transform("1"));
- assertEquals("Short.TYPE", new Short((short)2), ((Transformer)BeanMap.defaultTransformers.get(Short.TYPE)).transform("2"));
- assertEquals("Integer.TYPE", new Integer(3), ((Transformer)BeanMap.defaultTransformers.get(Integer.TYPE)).transform("3"));
- assertEquals("Long.TYPE", new Long(4), ((Transformer)BeanMap.defaultTransformers.get(Long.TYPE)).transform("4"));
- assertEquals("Float.TYPE", new Float("5"), ((Transformer)BeanMap.defaultTransformers.get(Float.TYPE)).transform("5"));
- assertEquals("Double.TYPE", new Double("6"), ((Transformer)BeanMap.defaultTransformers.get(Double.TYPE)).transform("6"));
- }
-
- /**
- * Test the default transformers HashMap
- */
- public void testDefaultTransformersMap() {
- assertEquals("Size", 8, BeanMap.defaultTransformers.size());
- assertEquals("entrySet", 8, BeanMap.defaultTransformers.entrySet().size());
- assertEquals("keySet", 8, BeanMap.defaultTransformers.keySet().size());
- assertEquals("values", 8, BeanMap.defaultTransformers.values().size());
- assertFalse("isEmpty", BeanMap.defaultTransformers.isEmpty());
- assertTrue("containsKey(Double)", BeanMap.defaultTransformers.containsKey(Double.TYPE));
- assertFalse("containsKey(Object)", BeanMap.defaultTransformers.containsKey(Object.class));
- assertTrue("containsValue(double)", BeanMap.defaultTransformers.containsValue(BeanMap.defaultTransformers.get(Double.TYPE)));
- assertFalse("containsValue(Object)", BeanMap.defaultTransformers.containsValue(Object.class));
-
- try {
- BeanMap.defaultTransformers.clear();
- fail("clear() - expected UnsupportedOperationException");
- } catch(final UnsupportedOperationException e) {
- // expected result
- }
- try {
- BeanMap.defaultTransformers.put("FOO", null);
- fail("put() - expected UnsupportedOperationException");
- } catch(final UnsupportedOperationException e) {
- // expected result
- }
- try {
- BeanMap.defaultTransformers.putAll(new HashMap<>());
- fail("putAll() - expected UnsupportedOperationException");
- } catch(final UnsupportedOperationException e) {
- // expected result
- }
- try {
- BeanMap.defaultTransformers.remove("FOO");
- fail("remove() - expected UnsupportedOperationException");
- } catch(final UnsupportedOperationException e) {
- // expected result
- }
- }
-
- /**
* Test that the cause of exception thrown by a clone() is initialised.
*/
public void testExceptionThrowFromClone() {
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java Mon Oct 8 18:42:50 2018
@@ -17,14 +17,13 @@
package org.apache.commons.beanutils2;
-import junit.framework.TestCase;
-
-import org.apache.commons.beanutils2.BeanPredicate;
import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.collections4.functors.InstanceofPredicate;
import org.apache.commons.collections4.functors.NotPredicate;
import org.apache.commons.collections4.functors.NullPredicate;
+import junit.framework.TestCase;
+
/**
* @version $Id$
*/
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosureTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosureTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosureTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosureTestCase.java Mon Oct 8 18:42:50 2018
@@ -17,8 +17,6 @@
package org.apache.commons.beanutils2;
-import org.apache.commons.beanutils2.BeanPropertyValueChangeClosure;
-
import junit.framework.TestCase;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java Mon Oct 8 18:42:50 2018
@@ -17,8 +17,6 @@
package org.apache.commons.beanutils2;
-import org.apache.commons.beanutils2.BeanPropertyValueEqualsPredicate;
-
import junit.framework.TestCase;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java Mon Oct 8 18:42:50 2018
@@ -17,8 +17,6 @@
package org.apache.commons.beanutils2;
-import org.apache.commons.beanutils2.BeanToPropertyValueTransformer;
-
import junit.framework.TestCase;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java Mon Oct 8 18:42:50 2018
@@ -16,11 +16,6 @@
*/
package org.apache.commons.beanutils2;
-import org.apache.commons.beanutils2.BeanUtils;
-import org.apache.commons.beanutils2.BeanUtilsBean;
-import org.apache.commons.beanutils2.BeanUtilsBean2;
-import org.apache.commons.beanutils2.ConvertUtils;
-
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java?rev=1843183&r1=1843182&r2=1843183&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java Mon Oct 8 18:42:50 2018
@@ -23,12 +23,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.beanutils2.BasicDynaClass;
-import org.apache.commons.beanutils2.BeanUtilsBean;
-import org.apache.commons.beanutils2.DynaBean;
-import org.apache.commons.beanutils2.DynaClass;
-import org.apache.commons.beanutils2.DynaProperty;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;