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 2020/06/08 21:48:17 UTC
[commons-beanutils] branch master updated (13fda9e -> cf9c014)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git.
from 13fda9e Test major Java versions with GitHub actions as documented on https://github.com/actions/setup-java
new b9334ce Remove some whitespace.
new cf9c014 Fix build on Java 15-ea.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 13 ++++++++++++-
.../converters/BigDecimalLocaleConverter.java | 17 -----------------
.../converters/BigIntegerLocaleConverter.java | 17 -----------------
.../locale/converters/ByteLocaleConverter.java | 5 -----
.../locale/converters/DateLocaleConverter.java | 22 ----------------------
.../locale/converters/DecimalLocaleConverter.java | 20 --------------------
.../locale/converters/DoubleLocaleConverter.java | 18 ------------------
.../locale/converters/FloatLocaleConverter.java | 19 +------------------
.../locale/converters/IntegerLocaleConverter.java | 18 ------------------
.../locale/converters/LongLocaleConverter.java | 16 ----------------
.../locale/converters/ShortLocaleConverter.java | 16 ----------------
.../locale/converters/SqlDateLocaleConverter.java | 19 -------------------
.../locale/converters/SqlTimeLocaleConverter.java | 17 -----------------
.../converters/SqlTimestampLocaleConverter.java | 17 -----------------
.../locale/converters/StringLocaleConverter.java | 20 --------------------
15 files changed, 13 insertions(+), 241 deletions(-)
[commons-beanutils] 02/02: Fix build on Java 15-ea.
Posted by gg...@apache.org.
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
commit cf9c014d2e5cfcfb5326117692a0f9a6c56f1fd2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 8 17:48:12 2020 -0400
Fix build on Java 15-ea.
---
pom.xml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 812f5cf..81497cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,9 +344,20 @@
</dependencies>
<build>
- <defaultGoal>clean apache-rat:check verify javadoc:javadoc</defaultGoal>
+ <defaultGoal>clean apache-rat:check verify javadoc:javadoc</defaultGoal>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>5.1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
[commons-beanutils] 01/02: Remove some whitespace.
Posted by gg...@apache.org.
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
commit b9334cec535fdba30269622cb9303f24f1bdb1b3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 8 17:47:51 2020 -0400
Remove some whitespace.
---
.../converters/BigDecimalLocaleConverter.java | 17 -----------------
.../converters/BigIntegerLocaleConverter.java | 17 -----------------
.../locale/converters/ByteLocaleConverter.java | 5 -----
.../locale/converters/DateLocaleConverter.java | 22 ----------------------
.../locale/converters/DecimalLocaleConverter.java | 20 --------------------
.../locale/converters/DoubleLocaleConverter.java | 18 ------------------
.../locale/converters/FloatLocaleConverter.java | 19 +------------------
.../locale/converters/IntegerLocaleConverter.java | 18 ------------------
.../locale/converters/LongLocaleConverter.java | 16 ----------------
.../locale/converters/ShortLocaleConverter.java | 16 ----------------
.../locale/converters/SqlDateLocaleConverter.java | 19 -------------------
.../locale/converters/SqlTimeLocaleConverter.java | 17 -----------------
.../converters/SqlTimestampLocaleConverter.java | 17 -----------------
.../locale/converters/StringLocaleConverter.java | 20 --------------------
14 files changed, 1 insertion(+), 240 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
index 0cd6465..4bc99fa 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
@@ -30,23 +30,17 @@ import org.apache.commons.beanutils2.ConversionException;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
public BigDecimalLocaleConverter() {
-
this(false);
}
@@ -59,7 +53,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigDecimalLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -71,7 +64,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public BigDecimalLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -84,7 +76,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigDecimalLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -97,7 +88,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public BigDecimalLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -111,7 +101,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigDecimalLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -125,7 +114,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param defaultValue The default value to be returned
*/
public BigDecimalLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -139,7 +127,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigDecimalLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -152,7 +139,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -166,7 +152,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -180,7 +165,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -195,7 +179,6 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
index 5bb1a02..89fbf1a 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
@@ -30,23 +30,17 @@ import org.apache.commons.beanutils2.ConversionException;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
public BigIntegerLocaleConverter() {
-
this(false);
}
@@ -59,7 +53,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigIntegerLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -71,7 +64,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public BigIntegerLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -84,7 +76,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigIntegerLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -97,7 +88,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public BigIntegerLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -111,7 +101,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigIntegerLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -125,7 +114,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param defaultValue The default value to be returned
*/
public BigIntegerLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -139,7 +127,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigIntegerLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -152,7 +139,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -166,7 +152,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -180,7 +165,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -195,7 +179,6 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
index c4538e8..3a6fcd2 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
@@ -29,20 +29,15 @@ import org.apache.commons.beanutils2.ConversionException;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class ByteLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
public ByteLocaleConverter() {
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
index 7407a78..dc80004 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
@@ -36,13 +36,9 @@ import org.apache.commons.logging.LogFactory;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class DateLocaleConverter extends BaseLocaleConverter {
-
-
/** All logging goes through this logger */
private final Log log = LogFactory.getLog(DateLocaleConverter.class);
@@ -51,22 +47,17 @@ public class DateLocaleConverter extends BaseLocaleConverter {
/**
* Default Pattern Characters
- *
*/
private static final String DEFAULT_PATTERN_CHARS = DateLocaleConverter.initDefaultChars();
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
public DateLocaleConverter() {
-
this(false);
}
@@ -79,7 +70,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DateLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -91,7 +81,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locale The locale
*/
public DateLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -104,7 +93,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DateLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -117,7 +105,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param pattern The conversion pattern
*/
public DateLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -131,7 +118,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DateLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -145,7 +131,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param defaultValue The default value to be returned
*/
public DateLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -159,7 +144,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DateLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -172,7 +156,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locale The locale
*/
public DateLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -186,7 +169,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DateLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -200,7 +182,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param pattern The conversion pattern
*/
public DateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -215,7 +196,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
@@ -241,8 +221,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
isLenient = lenient;
}
-
-
/**
* Convert the specified locale-sensitive input object into an output object of the
* specified type.
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
index f051600..c8ee6da 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
@@ -36,26 +36,19 @@ import org.apache.commons.logging.LogFactory;
*
* @since 1.7
*/
-
public class DecimalLocaleConverter extends BaseLocaleConverter {
-
-
/** All logging goes through this logger */
private final Log log = LogFactory.getLog(DecimalLocaleConverter.class);
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
public DecimalLocaleConverter() {
-
this(false);
}
@@ -68,7 +61,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DecimalLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -80,7 +72,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locale The locale
*/
public DecimalLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -93,7 +84,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DecimalLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -106,7 +96,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param pattern The conversion pattern
*/
public DecimalLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -120,7 +109,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DecimalLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -134,7 +122,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param defaultValue The default value to be returned
*/
public DecimalLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -148,7 +135,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DecimalLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -161,7 +147,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locale The locale
*/
public DecimalLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -175,7 +160,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DecimalLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -189,7 +173,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param pattern The conversion pattern
*/
public DecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -204,13 +187,10 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
-
-
/**
* Convert the specified locale-sensitive input object into an output
* object of the specified type.
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
index 0f537b7..0b24208 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
@@ -27,23 +27,17 @@ import java.util.Locale;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class DoubleLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
public DoubleLocaleConverter() {
-
this(false);
}
@@ -56,7 +50,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DoubleLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -68,7 +61,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public DoubleLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -81,7 +73,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DoubleLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -94,7 +85,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public DoubleLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -108,7 +98,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DoubleLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -122,7 +111,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param defaultValue The default value to be returned
*/
public DoubleLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -136,7 +124,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DoubleLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -149,7 +136,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public DoubleLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -163,7 +149,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DoubleLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -177,7 +162,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public DoubleLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -192,7 +176,6 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public DoubleLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
@@ -216,6 +199,5 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
}
return result;
}
-
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
index 573d424..cc02691 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
@@ -29,23 +29,17 @@ import org.apache.commons.beanutils2.ConversionException;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class FloatLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
public FloatLocaleConverter() {
-
this(false);
}
@@ -58,7 +52,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public FloatLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -70,7 +63,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public FloatLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -83,7 +75,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public FloatLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -96,7 +87,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public FloatLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -110,7 +100,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public FloatLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -124,7 +113,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param defaultValue The default value to be returned
*/
public FloatLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -138,7 +126,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public FloatLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -151,7 +138,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public FloatLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -165,7 +151,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public FloatLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -179,7 +164,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public FloatLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -194,7 +178,6 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public FloatLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
@@ -212,7 +195,7 @@ public class FloatLocaleConverter extends DecimalLocaleConverter {
* @throws ParseException if an error occurs parsing a String to a Number
*/
@Override
-protected Object parse(final Object value, final String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
final Number parsed = (Number) super.parse(value, pattern);
final double doubleValue = parsed.doubleValue();
final double posDouble = doubleValue >= 0 ? doubleValue : doubleValue * -1;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
index 5dbbcaf..41cd8d5 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
@@ -29,24 +29,17 @@ import org.apache.commons.beanutils2.ConversionException;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class IntegerLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
* for the conversion.
- *
*/
-
public IntegerLocaleConverter() {
-
this(false);
}
@@ -59,7 +52,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public IntegerLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -71,7 +63,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public IntegerLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -84,7 +75,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public IntegerLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -97,7 +87,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public IntegerLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -111,7 +100,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public IntegerLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -125,7 +113,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param defaultValue The default value to be returned
*/
public IntegerLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -139,7 +126,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public IntegerLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -152,7 +138,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public IntegerLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -166,7 +151,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public IntegerLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -180,7 +164,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public IntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -195,7 +178,6 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public IntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
index bdb1259..04282a3 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
@@ -27,13 +27,9 @@ import java.util.Locale;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class LongLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
@@ -43,7 +39,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
*
*/
public LongLocaleConverter() {
-
this(false);
}
@@ -56,7 +51,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public LongLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -68,7 +62,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public LongLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -81,7 +74,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public LongLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -94,7 +86,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public LongLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -108,7 +99,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public LongLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -122,7 +112,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param defaultValue The default value to be returned
*/
public LongLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -136,7 +125,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public LongLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -149,7 +137,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public LongLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -163,7 +150,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public LongLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -177,7 +163,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public LongLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -192,7 +177,6 @@ public class LongLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public LongLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
index 3a2f3f3..b19c8fc 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
@@ -29,13 +29,9 @@ import org.apache.commons.beanutils2.ConversionException;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class ShortLocaleConverter extends DecimalLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
@@ -45,7 +41,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
*
*/
public ShortLocaleConverter() {
-
this(false);
}
@@ -58,7 +53,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public ShortLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -70,7 +64,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public ShortLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -83,7 +76,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public ShortLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -96,7 +88,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public ShortLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -110,7 +101,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public ShortLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -124,7 +114,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param defaultValue The default value to be returned
*/
public ShortLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -138,7 +127,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public ShortLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -151,7 +139,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locale The locale
*/
public ShortLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -165,7 +152,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public ShortLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -179,7 +165,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param pattern The conversion pattern
*/
public ShortLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -194,7 +179,6 @@ public class ShortLocaleConverter extends DecimalLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public ShortLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
index 139bde9..e7fd6a4 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
@@ -28,13 +28,9 @@ import java.util.Locale;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class SqlDateLocaleConverter extends DateLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
@@ -44,7 +40,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
*
*/
public SqlDateLocaleConverter() {
-
this(false);
}
@@ -57,7 +52,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlDateLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -69,7 +63,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locale The locale
*/
public SqlDateLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -82,7 +75,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlDateLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -95,7 +87,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param pattern The conversion pattern
*/
public SqlDateLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -109,7 +100,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlDateLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -123,7 +113,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param defaultValue The default value to be returned
*/
public SqlDateLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -137,7 +126,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlDateLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -150,7 +138,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locale The locale
*/
public SqlDateLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -164,7 +151,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlDateLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -178,7 +164,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param pattern The conversion pattern
*/
public SqlDateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -193,12 +178,9 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlDateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
-
-
/**
* Convert the specified locale-sensitive input object into an output object of the
* specified type.
@@ -213,7 +195,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
*/
@Override
protected Object parse(final Object value, final String pattern) throws ParseException {
-
return new Date(((java.util.Date) super.parse(value, pattern)).getTime());
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
index cff363a..e3f8acb 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
@@ -30,11 +30,8 @@ import java.util.Locale;
* if a conversion error occurs.</p>
*
*/
-
public class SqlTimeLocaleConverter extends DateLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
@@ -44,7 +41,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
*
*/
public SqlTimeLocaleConverter() {
-
this(false);
}
@@ -57,7 +53,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimeLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -69,7 +64,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param locale The locale
*/
public SqlTimeLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -95,7 +89,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param pattern The conversion pattern
*/
public SqlTimeLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -109,7 +102,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimeLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -123,7 +115,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param defaultValue The default value to be returned
*/
public SqlTimeLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -137,7 +128,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimeLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), false);
}
@@ -150,7 +140,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param locale The locale
*/
public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -164,7 +153,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -178,7 +166,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param pattern The conversion pattern
*/
public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -193,12 +180,9 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
-
-
/**
* Convert the specified locale-sensitive input object into an output object of the
* specified type.
@@ -213,7 +197,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
*/
@Override
protected Object parse(final Object value, final String pattern) throws ParseException {
-
return new Time(((java.util.Date) super.parse(value, pattern)).getTime());
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
index 2a3bd4e..ff0991a 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
@@ -28,13 +28,9 @@ import java.util.Locale;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class SqlTimestampLocaleConverter extends DateLocaleConverter {
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
@@ -44,7 +40,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
*
*/
public SqlTimestampLocaleConverter() {
-
this(false);
}
@@ -57,7 +52,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimestampLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -69,7 +63,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param locale The locale
*/
public SqlTimestampLocaleConverter(final Locale locale) {
-
this(locale, (String) null);
}
@@ -82,7 +75,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimestampLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null);
}
@@ -95,7 +87,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param pattern The conversion pattern
*/
public SqlTimestampLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -109,7 +100,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimestampLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -149,7 +139,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param locale The locale
*/
public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -163,7 +152,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -177,7 +165,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param pattern The conversion pattern
*/
public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -192,12 +179,9 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
-
-
/**
* Convert the specified locale-sensitive input object into an output object of the
* specified type.
@@ -212,7 +196,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
*/
@Override
protected Object parse(final Object value, final String pattern) throws ParseException {
-
return new Timestamp(((java.util.Date) super.parse(value, pattern)).getTime());
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
index 38c5474..5aa416a 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
@@ -38,18 +38,12 @@ import org.apache.commons.logging.LogFactory;
* optionally using a default value or throwing a
* {@link org.apache.commons.beanutils2.ConversionException}
* if a conversion error occurs.</p>
- *
*/
-
public class StringLocaleConverter extends BaseLocaleConverter {
-
-
/** All logging goes through this logger */
private final Log log = LogFactory.getLog(StringLocaleConverter.class); //msz fix
-
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils2.ConversionException}
@@ -59,7 +53,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
*
*/
public StringLocaleConverter() {
-
this(false);
}
@@ -72,7 +65,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public StringLocaleConverter(final boolean locPattern) {
-
this(Locale.getDefault(), locPattern);
}
@@ -84,7 +76,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locale The locale
*/
public StringLocaleConverter(final Locale locale) {
-
this(locale, false);
}
@@ -97,7 +88,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public StringLocaleConverter(final Locale locale, final boolean locPattern) {
-
this(locale, (String) null, locPattern);
}
@@ -110,7 +100,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param pattern The conversion pattern
*/
public StringLocaleConverter(final Locale locale, final String pattern) {
-
this(locale, pattern, false);
}
@@ -124,7 +113,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public StringLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
-
super(locale, pattern, locPattern);
}
@@ -138,7 +126,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param defaultValue The default value to be returned
*/
public StringLocaleConverter(final Object defaultValue) {
-
this(defaultValue, false);
}
@@ -152,7 +139,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public StringLocaleConverter(final Object defaultValue, final boolean locPattern) {
-
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -165,7 +151,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locale The locale
*/
public StringLocaleConverter(final Object defaultValue, final Locale locale) {
-
this(defaultValue, locale, false);
}
@@ -179,7 +164,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public StringLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
-
this(defaultValue, locale, null, locPattern);
}
@@ -193,7 +177,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param pattern The conversion pattern
*/
public StringLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
-
this(defaultValue, locale, pattern, false);
}
@@ -208,12 +191,9 @@ public class StringLocaleConverter extends BaseLocaleConverter {
* @param locPattern Indicate whether the pattern is localized or not
*/
public StringLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
-
super(defaultValue, locale, pattern, locPattern);
}
-
-
/**
* Convert the specified locale-sensitive input object into an output object of the
* specified type.