[BEANUTILS-514] Remove deprecated code for 2.0.0. Last deprecation from 1.x removed.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/beanutils/trunk@1843701 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0adbbf5..59ff11a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -29,7 +29,7 @@
</properties>
<body>
- <release version="2.0.0" date="2017-MM-DD" description="Update from Java 6 to 7, update from Apache Commons Collection 3 to 4.">
+ <release version="2.0.0" date="2018-MM-DD" description="Update from Java 6 to 7, update from Apache Commons Collection 3 to 4.">
<action issue="BEANUTILS-504" dev="ggregory" type="update" due-to="Gary Gregory">
Update from Java 6 to 7.
</action>
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java
index e3ab384..e7c4956 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/BooleanConverter.java
@@ -38,13 +38,6 @@
* ConvertUtils.register(bc, Boolean.class);
* ConvertUtils.register(bc, Boolean.TYPE);
* </pre>
- * <p>In addition, it is recommended that the BooleanArrayConverter also be
- * modified to recognise the same set of values:</p>
- * <pre>
- * Converter bac = new BooleanArrayConverter(bc, BooleanArrayConverter.NO_DEFAULT);
- * ConvertUtils.register(bac, bac.MODEL);
- * </pre>
- *
*
* <p>Case is ignored when converting values to true or false.</p>
*
@@ -81,10 +74,7 @@
* in which case this constructor acts like the no-argument one.
*/
public BooleanConverter(final Object defaultValue) {
- super();
- if (defaultValue != NO_DEFAULT) {
- setDefaultValue(defaultValue);
- }
+ super(defaultValue);
}
/**
@@ -136,27 +126,16 @@
*/
public BooleanConverter(final String[] trueStrings, final String[] falseStrings,
final Object defaultValue) {
- super();
+ super(defaultValue);
this.trueStrings = copyStrings(trueStrings);
this.falseStrings = copyStrings(falseStrings);
- if (defaultValue != NO_DEFAULT) {
- setDefaultValue(defaultValue);
- }
}
// ----------------------------------------------------- Static Variables
- /**
- * This is a special reference that can be passed as the "default object"
- * to the constructor to indicate that no default is desired. Note that
- * the value 'null' cannot be used for this purpose, as the caller may
- * want a null to be returned as the default.
- * @deprecated Use constructors without default value.
- */
- @Deprecated
- public static final Object NO_DEFAULT = new Object();
+
// ----------------------------------------------------- Instance Variables
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java
index b317dcf..58690e4 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java
@@ -75,7 +75,7 @@
final String[] trueStrings = {"sure"};
final String[] falseStrings = {"nope"};
final BooleanConverter converter = new BooleanConverter(
- trueStrings, falseStrings, BooleanConverter.NO_DEFAULT);
+ trueStrings, falseStrings);
testConversionValues(
converter,
new String[] {"sure", "Sure"},
