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 2014/10/15 22:15:22 UTC
svn commit: r1632171 [8/20] - in /commons/proper/beanutils/trunk/src:
main/java/org/apache/commons/beanutils/
main/java/org/apache/commons/beanutils/converters/
main/java/org/apache/commons/beanutils/expression/
main/java/org/apache/commons/beanutils/l...
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -61,7 +61,7 @@ public class IntegerLocaleConverter exte
*
* @param locPattern Indicate whether the pattern is localized or not
*/
- public IntegerLocaleConverter(boolean locPattern) {
+ public IntegerLocaleConverter(final boolean locPattern) {
this(Locale.getDefault(), locPattern);
}
@@ -73,7 +73,7 @@ public class IntegerLocaleConverter exte
*
* @param locale The locale
*/
- public IntegerLocaleConverter(Locale locale) {
+ public IntegerLocaleConverter(final Locale locale) {
this(locale, false);
}
@@ -86,7 +86,7 @@ public class IntegerLocaleConverter exte
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public IntegerLocaleConverter(Locale locale, boolean locPattern) {
+ public IntegerLocaleConverter(final Locale locale, final boolean locPattern) {
this(locale, (String) null, locPattern);
}
@@ -99,7 +99,7 @@ public class IntegerLocaleConverter exte
* @param locale The locale
* @param pattern The convertion pattern
*/
- public IntegerLocaleConverter(Locale locale, String pattern) {
+ public IntegerLocaleConverter(final Locale locale, final String pattern) {
this(locale, pattern, false);
}
@@ -113,7 +113,7 @@ public class IntegerLocaleConverter exte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public IntegerLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ public IntegerLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
super(locale, pattern, locPattern);
}
@@ -127,7 +127,7 @@ public class IntegerLocaleConverter exte
*
* @param defaultValue The default value to be returned
*/
- public IntegerLocaleConverter(Object defaultValue) {
+ public IntegerLocaleConverter(final Object defaultValue) {
this(defaultValue, false);
}
@@ -141,7 +141,7 @@ public class IntegerLocaleConverter exte
* @param defaultValue The default value to be returned
* @param locPattern Indicate whether the pattern is localized or not
*/
- public IntegerLocaleConverter(Object defaultValue, boolean locPattern) {
+ public IntegerLocaleConverter(final Object defaultValue, final boolean locPattern) {
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -154,7 +154,7 @@ public class IntegerLocaleConverter exte
* @param defaultValue The default value to be returned
* @param locale The locale
*/
- public IntegerLocaleConverter(Object defaultValue, Locale locale) {
+ public IntegerLocaleConverter(final Object defaultValue, final Locale locale) {
this(defaultValue, locale, false);
}
@@ -168,7 +168,7 @@ public class IntegerLocaleConverter exte
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public IntegerLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) {
+ public IntegerLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
this(defaultValue, locale, null, locPattern);
}
@@ -182,7 +182,7 @@ public class IntegerLocaleConverter exte
* @param locale The locale
* @param pattern The convertion pattern
*/
- public IntegerLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ public IntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -197,7 +197,7 @@ public class IntegerLocaleConverter exte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public IntegerLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ public IntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
super(defaultValue, locale, pattern, locPattern);
}
@@ -215,7 +215,7 @@ public class IntegerLocaleConverter exte
* @throws ParseException if an error occurs parsing a String to a Number
*/
@Override
- protected Object parse(Object value, String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
final Number parsed = (Number) super.parse(value, pattern);
if (parsed.longValue() != parsed.intValue()) {
throw new ConversionException("Suplied number is not of type Integer: " + parsed.longValue());
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -58,7 +58,7 @@ public class LongLocaleConverter extends
*
* @param locPattern Indicate whether the pattern is localized or not
*/
- public LongLocaleConverter(boolean locPattern) {
+ public LongLocaleConverter(final boolean locPattern) {
this(Locale.getDefault(), locPattern);
}
@@ -70,7 +70,7 @@ public class LongLocaleConverter extends
*
* @param locale The locale
*/
- public LongLocaleConverter(Locale locale) {
+ public LongLocaleConverter(final Locale locale) {
this(locale, false);
}
@@ -83,7 +83,7 @@ public class LongLocaleConverter extends
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public LongLocaleConverter(Locale locale, boolean locPattern) {
+ public LongLocaleConverter(final Locale locale, final boolean locPattern) {
this(locale, (String) null, locPattern);
}
@@ -96,7 +96,7 @@ public class LongLocaleConverter extends
* @param locale The locale
* @param pattern The convertion pattern
*/
- public LongLocaleConverter(Locale locale, String pattern) {
+ public LongLocaleConverter(final Locale locale, final String pattern) {
this(locale, pattern, false);
}
@@ -110,7 +110,7 @@ public class LongLocaleConverter extends
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public LongLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ public LongLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
super(locale, pattern, locPattern);
}
@@ -124,7 +124,7 @@ public class LongLocaleConverter extends
*
* @param defaultValue The default value to be returned
*/
- public LongLocaleConverter(Object defaultValue) {
+ public LongLocaleConverter(final Object defaultValue) {
this(defaultValue, false);
}
@@ -138,7 +138,7 @@ public class LongLocaleConverter extends
* @param defaultValue The default value to be returned
* @param locPattern Indicate whether the pattern is localized or not
*/
- public LongLocaleConverter(Object defaultValue, boolean locPattern) {
+ public LongLocaleConverter(final Object defaultValue, final boolean locPattern) {
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -151,7 +151,7 @@ public class LongLocaleConverter extends
* @param defaultValue The default value to be returned
* @param locale The locale
*/
- public LongLocaleConverter(Object defaultValue, Locale locale) {
+ public LongLocaleConverter(final Object defaultValue, final Locale locale) {
this(defaultValue, locale, false);
}
@@ -165,7 +165,7 @@ public class LongLocaleConverter extends
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public LongLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) {
+ public LongLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
this(defaultValue, locale, null, locPattern);
}
@@ -179,7 +179,7 @@ public class LongLocaleConverter extends
* @param locale The locale
* @param pattern The convertion pattern
*/
- public LongLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ public LongLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -194,7 +194,7 @@ public class LongLocaleConverter extends
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public LongLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ public LongLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
super(defaultValue, locale, pattern, locPattern);
}
@@ -213,9 +213,9 @@ public class LongLocaleConverter extends
* @since 1.8.0
*/
@Override
- protected Object parse(Object value, String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
- Object result = super.parse(value, pattern);
+ final Object result = super.parse(value, pattern);
if (result == null || result instanceof Long) {
return result;
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -58,7 +58,7 @@ public class ShortLocaleConverter extend
*
* @param locPattern Indicate whether the pattern is localized or not
*/
- public ShortLocaleConverter(boolean locPattern) {
+ public ShortLocaleConverter(final boolean locPattern) {
this(Locale.getDefault(), locPattern);
}
@@ -70,7 +70,7 @@ public class ShortLocaleConverter extend
*
* @param locale The locale
*/
- public ShortLocaleConverter(Locale locale) {
+ public ShortLocaleConverter(final Locale locale) {
this(locale, false);
}
@@ -83,7 +83,7 @@ public class ShortLocaleConverter extend
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public ShortLocaleConverter(Locale locale, boolean locPattern) {
+ public ShortLocaleConverter(final Locale locale, final boolean locPattern) {
this(locale, (String) null, locPattern);
}
@@ -96,7 +96,7 @@ public class ShortLocaleConverter extend
* @param locale The locale
* @param pattern The convertion pattern
*/
- public ShortLocaleConverter(Locale locale, String pattern) {
+ public ShortLocaleConverter(final Locale locale, final String pattern) {
this(locale, pattern, false);
}
@@ -110,7 +110,7 @@ public class ShortLocaleConverter extend
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public ShortLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ public ShortLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
super(locale, pattern, locPattern);
}
@@ -124,7 +124,7 @@ public class ShortLocaleConverter extend
*
* @param defaultValue The default value to be returned
*/
- public ShortLocaleConverter(Object defaultValue) {
+ public ShortLocaleConverter(final Object defaultValue) {
this(defaultValue, false);
}
@@ -138,7 +138,7 @@ public class ShortLocaleConverter extend
* @param defaultValue The default value to be returned
* @param locPattern Indicate whether the pattern is localized or not
*/
- public ShortLocaleConverter(Object defaultValue, boolean locPattern) {
+ public ShortLocaleConverter(final Object defaultValue, final boolean locPattern) {
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -151,7 +151,7 @@ public class ShortLocaleConverter extend
* @param defaultValue The default value to be returned
* @param locale The locale
*/
- public ShortLocaleConverter(Object defaultValue, Locale locale) {
+ public ShortLocaleConverter(final Object defaultValue, final Locale locale) {
this(defaultValue, locale, false);
}
@@ -165,7 +165,7 @@ public class ShortLocaleConverter extend
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public ShortLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) {
+ public ShortLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
this(defaultValue, locale, null, locPattern);
}
@@ -179,7 +179,7 @@ public class ShortLocaleConverter extend
* @param locale The locale
* @param pattern The convertion pattern
*/
- public ShortLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ public ShortLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -194,7 +194,7 @@ public class ShortLocaleConverter extend
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public ShortLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ public ShortLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
super(defaultValue, locale, pattern, locPattern);
}
@@ -213,15 +213,15 @@ public class ShortLocaleConverter extend
* @since 1.8.0
*/
@Override
- protected Object parse(Object value, String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
- Object result = super.parse(value, pattern);
+ final Object result = super.parse(value, pattern);
if (result == null || result instanceof Short) {
return result;
}
- Number parsed = (Number)result;
+ final Number parsed = (Number)result;
if (parsed.longValue() != parsed.shortValue()) {
throw new ConversionException("Supplied number is not of type Short: " + parsed.longValue());
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -58,7 +58,7 @@ public class SqlDateLocaleConverter exte
*
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlDateLocaleConverter(boolean locPattern) {
+ public SqlDateLocaleConverter(final boolean locPattern) {
this(Locale.getDefault(), locPattern);
}
@@ -70,7 +70,7 @@ public class SqlDateLocaleConverter exte
*
* @param locale The locale
*/
- public SqlDateLocaleConverter(Locale locale) {
+ public SqlDateLocaleConverter(final Locale locale) {
this(locale, false);
}
@@ -83,7 +83,7 @@ public class SqlDateLocaleConverter exte
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlDateLocaleConverter(Locale locale, boolean locPattern) {
+ public SqlDateLocaleConverter(final Locale locale, final boolean locPattern) {
this(locale, (String) null, locPattern);
}
@@ -96,7 +96,7 @@ public class SqlDateLocaleConverter exte
* @param locale The locale
* @param pattern The convertion pattern
*/
- public SqlDateLocaleConverter(Locale locale, String pattern) {
+ public SqlDateLocaleConverter(final Locale locale, final String pattern) {
this(locale, pattern, false);
}
@@ -110,7 +110,7 @@ public class SqlDateLocaleConverter exte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlDateLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ public SqlDateLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
super(locale, pattern, locPattern);
}
@@ -124,7 +124,7 @@ public class SqlDateLocaleConverter exte
*
* @param defaultValue The default value to be returned
*/
- public SqlDateLocaleConverter(Object defaultValue) {
+ public SqlDateLocaleConverter(final Object defaultValue) {
this(defaultValue, false);
}
@@ -138,7 +138,7 @@ public class SqlDateLocaleConverter exte
* @param defaultValue The default value to be returned
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlDateLocaleConverter(Object defaultValue, boolean locPattern) {
+ public SqlDateLocaleConverter(final Object defaultValue, final boolean locPattern) {
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -151,7 +151,7 @@ public class SqlDateLocaleConverter exte
* @param defaultValue The default value to be returned
* @param locale The locale
*/
- public SqlDateLocaleConverter(Object defaultValue, Locale locale) {
+ public SqlDateLocaleConverter(final Object defaultValue, final Locale locale) {
this(defaultValue, locale, false);
}
@@ -165,7 +165,7 @@ public class SqlDateLocaleConverter exte
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlDateLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) {
+ public SqlDateLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
this(defaultValue, locale, null, locPattern);
}
@@ -179,7 +179,7 @@ public class SqlDateLocaleConverter exte
* @param locale The locale
* @param pattern The convertion pattern
*/
- public SqlDateLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ public SqlDateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -194,7 +194,7 @@ public class SqlDateLocaleConverter exte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlDateLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ public SqlDateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
super(defaultValue, locale, pattern, locPattern);
}
@@ -215,7 +215,7 @@ public class SqlDateLocaleConverter exte
* @throws ParseException if an error occurs parsing a String to a Number
*/
@Override
- protected Object parse(Object value, String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
return new Date(((java.util.Date) super.parse(value, pattern)).getTime());
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -58,7 +58,7 @@ public class SqlTimeLocaleConverter exte
*
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimeLocaleConverter(boolean locPattern) {
+ public SqlTimeLocaleConverter(final boolean locPattern) {
this(Locale.getDefault(), locPattern);
}
@@ -70,7 +70,7 @@ public class SqlTimeLocaleConverter exte
*
* @param locale The locale
*/
- public SqlTimeLocaleConverter(Locale locale) {
+ public SqlTimeLocaleConverter(final Locale locale) {
this(locale, false);
}
@@ -83,7 +83,7 @@ public class SqlTimeLocaleConverter exte
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimeLocaleConverter(Locale locale, boolean locPattern) {
+ public SqlTimeLocaleConverter(final Locale locale, final boolean locPattern) {
this(locale, (String) null, locPattern);
}
@@ -96,7 +96,7 @@ public class SqlTimeLocaleConverter exte
* @param locale The locale
* @param pattern The convertion pattern
*/
- public SqlTimeLocaleConverter(Locale locale, String pattern) {
+ public SqlTimeLocaleConverter(final Locale locale, final String pattern) {
this(locale, pattern, false);
}
@@ -110,7 +110,7 @@ public class SqlTimeLocaleConverter exte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimeLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ public SqlTimeLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
super(locale, pattern, locPattern);
}
@@ -124,7 +124,7 @@ public class SqlTimeLocaleConverter exte
*
* @param defaultValue The default value to be returned
*/
- public SqlTimeLocaleConverter(Object defaultValue) {
+ public SqlTimeLocaleConverter(final Object defaultValue) {
this(defaultValue, false);
}
@@ -138,7 +138,7 @@ public class SqlTimeLocaleConverter exte
* @param defaultValue The default value to be returned
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimeLocaleConverter(Object defaultValue, boolean locPattern) {
+ public SqlTimeLocaleConverter(final Object defaultValue, final boolean locPattern) {
this(defaultValue, Locale.getDefault(), false);
}
@@ -151,7 +151,7 @@ public class SqlTimeLocaleConverter exte
* @param defaultValue The default value to be returned
* @param locale The locale
*/
- public SqlTimeLocaleConverter(Object defaultValue, Locale locale) {
+ public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale) {
this(defaultValue, locale, false);
}
@@ -165,7 +165,7 @@ public class SqlTimeLocaleConverter exte
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimeLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) {
+ public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
this(defaultValue, locale, null, locPattern);
}
@@ -179,7 +179,7 @@ public class SqlTimeLocaleConverter exte
* @param locale The locale
* @param pattern The convertion pattern
*/
- public SqlTimeLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -194,7 +194,7 @@ public class SqlTimeLocaleConverter exte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimeLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ public SqlTimeLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
super(defaultValue, locale, pattern, locPattern);
}
@@ -214,7 +214,7 @@ public class SqlTimeLocaleConverter exte
* @throws ParseException if an error occurs parsing a String to a Number
*/
@Override
- protected Object parse(Object value, String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
return new Time(((java.util.Date) super.parse(value, pattern)).getTime());
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -58,7 +58,7 @@ public class SqlTimestampLocaleConverter
*
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimestampLocaleConverter(boolean locPattern) {
+ public SqlTimestampLocaleConverter(final boolean locPattern) {
this(Locale.getDefault(), locPattern);
}
@@ -70,7 +70,7 @@ public class SqlTimestampLocaleConverter
*
* @param locale The locale
*/
- public SqlTimestampLocaleConverter(Locale locale) {
+ public SqlTimestampLocaleConverter(final Locale locale) {
this(locale, (String) null);
}
@@ -83,7 +83,7 @@ public class SqlTimestampLocaleConverter
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimestampLocaleConverter(Locale locale, boolean locPattern) {
+ public SqlTimestampLocaleConverter(final Locale locale, final boolean locPattern) {
this(locale, (String) null);
}
@@ -96,7 +96,7 @@ public class SqlTimestampLocaleConverter
* @param locale The locale
* @param pattern The convertion pattern
*/
- public SqlTimestampLocaleConverter(Locale locale, String pattern) {
+ public SqlTimestampLocaleConverter(final Locale locale, final String pattern) {
this(locale, pattern, false);
}
@@ -110,7 +110,7 @@ public class SqlTimestampLocaleConverter
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimestampLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ public SqlTimestampLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
super(locale, pattern, locPattern);
}
@@ -124,7 +124,7 @@ public class SqlTimestampLocaleConverter
*
* @param defaultValue The default value to be returned
*/
- public SqlTimestampLocaleConverter(Object defaultValue) {
+ public SqlTimestampLocaleConverter(final Object defaultValue) {
this(defaultValue, false);
}
@@ -137,7 +137,7 @@ public class SqlTimestampLocaleConverter
* @param defaultValue The default value to be returned
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimestampLocaleConverter(Object defaultValue, boolean locPattern) {
+ public SqlTimestampLocaleConverter(final Object defaultValue, final boolean locPattern) {
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -150,7 +150,7 @@ public class SqlTimestampLocaleConverter
* @param defaultValue The default value to be returned
* @param locale The locale
*/
- public SqlTimestampLocaleConverter(Object defaultValue, Locale locale) {
+ public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale) {
this(defaultValue, locale, false);
}
@@ -164,7 +164,7 @@ public class SqlTimestampLocaleConverter
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimestampLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) {
+ public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
this(defaultValue, locale, null, locPattern);
}
@@ -178,7 +178,7 @@ public class SqlTimestampLocaleConverter
* @param locale The locale
* @param pattern The convertion pattern
*/
- public SqlTimestampLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -193,7 +193,7 @@ public class SqlTimestampLocaleConverter
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public SqlTimestampLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ public SqlTimestampLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
super(defaultValue, locale, pattern, locPattern);
}
@@ -213,7 +213,7 @@ public class SqlTimestampLocaleConverter
* @throws ParseException if an error occurs parsing a String to a Number
*/
@Override
- protected Object parse(Object value, String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
return new Timestamp(((java.util.Date) super.parse(value, pattern)).getTime());
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -73,7 +73,7 @@ public class StringLocaleConverter exten
*
* @param locPattern Indicate whether the pattern is localized or not
*/
- public StringLocaleConverter(boolean locPattern) {
+ public StringLocaleConverter(final boolean locPattern) {
this(Locale.getDefault(), locPattern);
}
@@ -85,7 +85,7 @@ public class StringLocaleConverter exten
*
* @param locale The locale
*/
- public StringLocaleConverter(Locale locale) {
+ public StringLocaleConverter(final Locale locale) {
this(locale, false);
}
@@ -98,7 +98,7 @@ public class StringLocaleConverter exten
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public StringLocaleConverter(Locale locale, boolean locPattern) {
+ public StringLocaleConverter(final Locale locale, final boolean locPattern) {
this(locale, (String) null, locPattern);
}
@@ -111,7 +111,7 @@ public class StringLocaleConverter exten
* @param locale The locale
* @param pattern The convertion pattern
*/
- public StringLocaleConverter(Locale locale, String pattern) {
+ public StringLocaleConverter(final Locale locale, final String pattern) {
this(locale, pattern, false);
}
@@ -125,7 +125,7 @@ public class StringLocaleConverter exten
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public StringLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ public StringLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
super(locale, pattern, locPattern);
}
@@ -139,7 +139,7 @@ public class StringLocaleConverter exten
*
* @param defaultValue The default value to be returned
*/
- public StringLocaleConverter(Object defaultValue) {
+ public StringLocaleConverter(final Object defaultValue) {
this(defaultValue, false);
}
@@ -153,7 +153,7 @@ public class StringLocaleConverter exten
* @param defaultValue The default value to be returned
* @param locPattern Indicate whether the pattern is localized or not
*/
- public StringLocaleConverter(Object defaultValue, boolean locPattern) {
+ public StringLocaleConverter(final Object defaultValue, final boolean locPattern) {
this(defaultValue, Locale.getDefault(), locPattern);
}
@@ -166,7 +166,7 @@ public class StringLocaleConverter exten
* @param defaultValue The default value to be returned
* @param locale The locale
*/
- public StringLocaleConverter(Object defaultValue, Locale locale) {
+ public StringLocaleConverter(final Object defaultValue, final Locale locale) {
this(defaultValue, locale, false);
}
@@ -180,7 +180,7 @@ public class StringLocaleConverter exten
* @param locale The locale
* @param locPattern Indicate whether the pattern is localized or not
*/
- public StringLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) {
+ public StringLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) {
this(defaultValue, locale, null, locPattern);
}
@@ -194,7 +194,7 @@ public class StringLocaleConverter exten
* @param locale The locale
* @param pattern The convertion pattern
*/
- public StringLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ public StringLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -209,7 +209,7 @@ public class StringLocaleConverter exten
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- public StringLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ public StringLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
super(defaultValue, locale, pattern, locPattern);
}
@@ -229,7 +229,7 @@ public class StringLocaleConverter exten
* @throws ParseException if an error occurs
*/
@Override
- protected Object parse(Object value, String pattern) throws ParseException {
+ protected Object parse(final Object value, final String pattern) throws ParseException {
String result = null;
@@ -249,7 +249,7 @@ public class StringLocaleConverter exten
}
else if (value instanceof Date) { // java.util.Date, java.sql.Date, java.sql.Time, java.sql.Timestamp
- SimpleDateFormat dateFormat =
+ final SimpleDateFormat dateFormat =
new SimpleDateFormat(pattern, locale);
result = dateFormat.format(value);
@@ -272,9 +272,9 @@ public class StringLocaleConverter exten
* successfully
* @throws ParseException if an error occurs parsing a String to a Number
*/
- private DecimalFormat getDecimalFormat(Locale locale, String pattern) {
+ private DecimalFormat getDecimalFormat(final Locale locale, final String pattern) {
- DecimalFormat numberFormat = (DecimalFormat) NumberFormat.getInstance(locale);
+ final DecimalFormat numberFormat = (DecimalFormat) NumberFormat.getInstance(locale);
// if some constructors default pattern to null, it makes only sense to handle null pattern gracefully
if (pattern != null) {
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/A.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/A.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/A.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/A.java Wed Oct 15 20:15:17 2014
@@ -29,7 +29,7 @@ public class A {
boolean called = false;
- public void foo(OutputStream os)
+ public void foo(final OutputStream os)
{
called = true;
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractChild.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractChild.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractChild.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractChild.java Wed Oct 15 20:15:17 2014
@@ -24,7 +24,7 @@ public class AbstractChild implements Ch
private String name;
- protected void setName(String name)
+ protected void setName(final String name)
{
this.name = name;
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractParent.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractParent.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractParent.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AbstractParent.java Wed Oct 15 20:15:17 2014
@@ -32,24 +32,24 @@ public abstract class AbstractParent {
/**
* Method which matches signature but which has wrong parameters
*/
- public String testAddChild(String badParameter) {
+ public String testAddChild(final String badParameter) {
return null;
}
/**
* Method which matches signature but which has wrong parameters
*/
- public String testAddChild2(String ignore, String badParameter) {
+ public String testAddChild2(final String ignore, final String badParameter) {
return null;
}
- public String testAddChild(Child child) {
+ public String testAddChild(final Child child) {
this.child = child;
return child.getName();
}
- public String testAddChild2(String ignore, Child child) {
+ public String testAddChild2(final String ignore, final Child child) {
this.child = child;
return child.getName();
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AlphaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AlphaBean.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AlphaBean.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/AlphaBean.java Wed Oct 15 20:15:17 2014
@@ -26,7 +26,7 @@ public class AlphaBean extends AbstractP
public AlphaBean() {}
- public AlphaBean(String name) {
+ public AlphaBean(final String name) {
setName(name);
}
@@ -34,12 +34,12 @@ public class AlphaBean extends AbstractP
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
/**
* Used for testing that correct exception is thrown.
*/
- public void bogus(String badParameter){}
+ public void bogus(final String badParameter){}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java Wed Oct 15 20:15:17 2014
@@ -87,7 +87,7 @@ public class BasicDynaBeanTestCase exten
*
* @param name Name of the test case
*/
- public BasicDynaBeanTestCase(String name) {
+ public BasicDynaBeanTestCase(final String name) {
super(name);
@@ -104,7 +104,7 @@ public class BasicDynaBeanTestCase exten
public void setUp() throws Exception {
// Instantiate a new DynaBean instance
- DynaClass dynaClass = createDynaClass();
+ final DynaClass dynaClass = createDynaClass();
bean = dynaClass.newInstance();
// Initialize the DynaBean's property values (like TestBean)
@@ -112,12 +112,12 @@ public class BasicDynaBeanTestCase exten
bean.set("booleanSecond", new Boolean(true));
bean.set("doubleProperty", new Double(321.0));
bean.set("floatProperty", new Float((float) 123.0));
- int intArray[] = { 0, 10, 20, 30, 40 };
+ final int intArray[] = { 0, 10, 20, 30, 40 };
bean.set("intArray", intArray);
- int intIndexed[] = { 0, 10, 20, 30, 40 };
+ final int intIndexed[] = { 0, 10, 20, 30, 40 };
bean.set("intIndexed", intIndexed);
bean.set("intProperty", new Integer(123));
- List<String> listIndexed = new ArrayList<String>();
+ final List<String> listIndexed = new ArrayList<String>();
listIndexed.add("String 0");
listIndexed.add("String 1");
listIndexed.add("String 2");
@@ -125,20 +125,20 @@ public class BasicDynaBeanTestCase exten
listIndexed.add("String 4");
bean.set("listIndexed", listIndexed);
bean.set("longProperty", new Long(321));
- HashMap<String, String> mappedProperty = new HashMap<String, String>();
+ final HashMap<String, String> mappedProperty = new HashMap<String, String>();
mappedProperty.put("First Key", "First Value");
mappedProperty.put("Second Key", "Second Value");
bean.set("mappedProperty", mappedProperty);
- HashMap<String, Integer> mappedIntProperty = new HashMap<String, Integer>();
+ final HashMap<String, Integer> mappedIntProperty = new HashMap<String, Integer>();
mappedIntProperty.put("One", new Integer(1));
mappedIntProperty.put("Two", new Integer(2));
bean.set("mappedIntProperty", mappedIntProperty);
// Property "nullProperty" is not initialized, so it should return null
bean.set("shortProperty", new Short((short) 987));
- String stringArray[] =
+ final String stringArray[] =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringArray", stringArray);
- String stringIndexed[] =
+ final String stringIndexed[] =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringIndexed", stringIndexed);
bean.set("stringProperty", "This is a string");
@@ -177,20 +177,20 @@ public class BasicDynaBeanTestCase exten
public void testGetDescriptorArguments() {
try {
- DynaProperty descriptor =
+ final DynaProperty descriptor =
bean.getDynaClass().getDynaProperty("unknown");
assertNull("Unknown property descriptor should be null",
descriptor);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t + " instead of returning null");
}
try {
bean.getDynaClass().getDynaProperty(null);
fail("Should throw IllegalArgumentException");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// Expected response
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t + " instead of IllegalArgumentException");
}
@@ -284,11 +284,11 @@ public class BasicDynaBeanTestCase exten
*/
public void testGetDescriptors() {
- DynaProperty pd[] = bean.getDynaClass().getDynaProperties();
+ final DynaProperty pd[] = bean.getDynaClass().getDynaProperties();
assertNotNull("Got descriptors", pd);
- int count[] = new int[properties.length];
+ final int count[] = new int[properties.length];
for (int i = 0; i < pd.length; i++) {
- String name = pd[i].getName();
+ final String name = pd[i].getName();
for (int j = 0; j < properties.length; j++) {
if (name.equals(properties[j])) {
count[j]++;
@@ -314,9 +314,9 @@ public class BasicDynaBeanTestCase exten
try {
bean.get("intArray", -1);
fail("Should throw IndexOutOfBoundsException");
- } catch (IndexOutOfBoundsException e) {
+ } catch (final IndexOutOfBoundsException e) {
// Expected response
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t + " instead of IndexOutOfBoundsException");
}
@@ -340,7 +340,7 @@ public class BasicDynaBeanTestCase exten
value instanceof Integer);
assertEquals("intArray returned correct " + i, i * 10,
((Integer) value).intValue());
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("intArray " + i + " threw " + t);
}
@@ -351,7 +351,7 @@ public class BasicDynaBeanTestCase exten
value instanceof Integer);
assertEquals("intIndexed returned correct " + i, i * 10,
((Integer) value).intValue());
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("intIndexed " + i + " threw " + t);
}
@@ -362,7 +362,7 @@ public class BasicDynaBeanTestCase exten
value instanceof String);
assertEquals("listIndexed returned correct " + i,
"String " + i, (String) value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("listIndexed " + i + " threw " + t);
}
@@ -373,7 +373,7 @@ public class BasicDynaBeanTestCase exten
value instanceof String);
assertEquals("stringArray returned correct " + i,
"String " + i, (String) value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("stringArray " + i + " threw " + t);
}
@@ -384,7 +384,7 @@ public class BasicDynaBeanTestCase exten
value instanceof String);
assertEquals("stringIndexed returned correct " + i,
"String " + i, (String) value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("stringIndexed " + i + " threw " + t);
}
@@ -401,9 +401,9 @@ public class BasicDynaBeanTestCase exten
try {
- Object value = bean.get("mappedProperty", "unknown");
+ final Object value = bean.get("mappedProperty", "unknown");
assertNull("Should not return a value", value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t + " instead of returning null");
}
@@ -421,21 +421,21 @@ public class BasicDynaBeanTestCase exten
try {
value = bean.get("mappedProperty", "First Key");
assertEquals("Can find first value", "First Value", value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Finding first value threw " + t);
}
try {
value = bean.get("mappedProperty", "Second Key");
assertEquals("Can find second value", "Second Value", value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Finding second value threw " + t);
}
try {
value = bean.get("mappedProperty", "Third Key");
assertNull("Can not find third value", value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Finding third value threw " + t);
}
@@ -450,9 +450,9 @@ public class BasicDynaBeanTestCase exten
try {
bean.get(null);
fail("Should throw IllegalArgumentException");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// Expected response
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t + " instead of IllegalArgumentException");
}
@@ -465,12 +465,12 @@ public class BasicDynaBeanTestCase exten
public void testGetSimpleBoolean() {
try {
- Object value = bean.get("booleanProperty");
+ final Object value = bean.get("booleanProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", (value instanceof Boolean));
assertTrue("Got correct value",
((Boolean) value).booleanValue() == true);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -483,13 +483,13 @@ public class BasicDynaBeanTestCase exten
public void testGetSimpleDouble() {
try {
- Object value = bean.get("doubleProperty");
+ final Object value = bean.get("doubleProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", (value instanceof Double));
assertEquals("Got correct value",
((Double) value).doubleValue(),
321.0, 0.005);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -502,14 +502,14 @@ public class BasicDynaBeanTestCase exten
public void testGetSimpleFloat() {
try {
- Object value = bean.get("floatProperty");
+ final Object value = bean.get("floatProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", (value instanceof Float));
assertEquals("Got correct value",
((Float) value).floatValue(),
(float) 123.0,
(float) 0.005);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -522,13 +522,13 @@ public class BasicDynaBeanTestCase exten
public void testGetSimpleInt() {
try {
- Object value = bean.get("intProperty");
+ final Object value = bean.get("intProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", (value instanceof Integer));
assertEquals("Got correct value",
((Integer) value).intValue(),
123);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -541,13 +541,13 @@ public class BasicDynaBeanTestCase exten
public void testGetSimpleLong() {
try {
- Object value = bean.get("longProperty");
+ final Object value = bean.get("longProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", (value instanceof Long));
assertEquals("Got correct value",
((Long) value).longValue(),
321);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -560,13 +560,13 @@ public class BasicDynaBeanTestCase exten
public void testGetSimpleShort() {
try {
- Object value = bean.get("shortProperty");
+ final Object value = bean.get("shortProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", (value instanceof Short));
assertEquals("Got correct value",
((Short) value).shortValue(),
(short) 987);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -579,13 +579,13 @@ public class BasicDynaBeanTestCase exten
public void testGetSimpleString() {
try {
- Object value = bean.get("stringProperty");
+ final Object value = bean.get("stringProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", (value instanceof String));
assertEquals("Got correct value",
(String) value,
"This is a string");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -600,7 +600,7 @@ public class BasicDynaBeanTestCase exten
try {
assertTrue("Can see first key",
bean.contains("mappedProperty", "First Key"));
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -608,7 +608,7 @@ public class BasicDynaBeanTestCase exten
try {
assertTrue("Can not see unknown key",
!bean.contains("mappedProperty", "Unknown Key"));
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -626,7 +626,7 @@ public class BasicDynaBeanTestCase exten
bean.remove("mappedProperty", "First Key");
assertTrue("Can not see first key",
!bean.contains("mappedProperty", "First Key"));
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -636,7 +636,7 @@ public class BasicDynaBeanTestCase exten
bean.remove("mappedProperty", "Unknown Key");
assertTrue("Can not see unknown key",
!bean.contains("mappedProperty", "Unknown Key"));
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Exception: " + t);
}
@@ -649,25 +649,25 @@ public class BasicDynaBeanTestCase exten
public void testSerialization() {
// Serialize the test bean
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
- ObjectOutputStream oos = new ObjectOutputStream(baos);
+ final ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(bean);
oos.flush();
oos.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Exception during serialization: " + e);
}
// Deserialize the test bean
try {
bean = null;
- ByteArrayInputStream bais =
+ final ByteArrayInputStream bais =
new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
+ final ObjectInputStream ois = new ObjectInputStream(bais);
bean = (DynaBean) ois.readObject();
bais.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Exception during deserialization: " + e);
}
@@ -700,7 +700,7 @@ public class BasicDynaBeanTestCase exten
// Ensure that we can create a new instance of the same DynaClass
try {
bean = bean.getDynaClass().newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Exception creating new instance: " + e);
}
testGetDescriptorArguments();
@@ -725,9 +725,9 @@ public class BasicDynaBeanTestCase exten
try {
bean.set("intArray", -1, new Integer(0));
fail("Should throw IndexOutOfBoundsException");
- } catch (IndexOutOfBoundsException e) {
+ } catch (final IndexOutOfBoundsException e) {
// Expected response
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t + " instead of IndexOutOfBoundsException");
}
@@ -749,7 +749,7 @@ public class BasicDynaBeanTestCase exten
value instanceof Integer);
assertEquals("Returned correct new value 0", 1,
((Integer) value).intValue());
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t);
}
@@ -761,7 +761,7 @@ public class BasicDynaBeanTestCase exten
value instanceof Integer);
assertEquals("Returned correct new value 1", 11,
((Integer) value).intValue());
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t);
}
@@ -773,7 +773,7 @@ public class BasicDynaBeanTestCase exten
value instanceof String);
assertEquals("Returned correct new value 2", "New Value 2",
(String) value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t);
}
@@ -785,7 +785,7 @@ public class BasicDynaBeanTestCase exten
value instanceof String);
assertEquals("Returned correct new value 3", "New Value 3",
(String) value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t);
}
@@ -797,7 +797,7 @@ public class BasicDynaBeanTestCase exten
value instanceof String);
assertEquals("Returned correct new value 4", "New Value 4",
(String) value);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw " + t);
}
@@ -815,7 +815,7 @@ public class BasicDynaBeanTestCase exten
assertEquals("Can replace old value",
"New First Value",
(String) bean.get("mappedProperty", "First Key"));
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Finding fourth value threw " + t);
}
@@ -824,7 +824,7 @@ public class BasicDynaBeanTestCase exten
assertEquals("Can set new value",
"Fourth Value",
(String) bean.get("mappedProperty", "Fourth Key"));
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Finding fourth value threw " + t);
}
@@ -838,14 +838,14 @@ public class BasicDynaBeanTestCase exten
public void testSetSimpleBoolean() {
try {
- boolean oldValue =
+ final boolean oldValue =
((Boolean) bean.get("booleanProperty")).booleanValue();
- boolean newValue = !oldValue;
+ final boolean newValue = !oldValue;
bean.set("booleanProperty", new Boolean(newValue));
assertTrue("Matched new value",
newValue ==
((Boolean) bean.get("booleanProperty")).booleanValue());
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -858,15 +858,15 @@ public class BasicDynaBeanTestCase exten
public void testSetSimpleDouble() {
try {
- double oldValue =
+ final double oldValue =
((Double) bean.get("doubleProperty")).doubleValue();
- double newValue = oldValue + 1.0;
+ final double newValue = oldValue + 1.0;
bean.set("doubleProperty", new Double(newValue));
assertEquals("Matched new value",
newValue,
((Double) bean.get("doubleProperty")).doubleValue(),
0.005);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -879,15 +879,15 @@ public class BasicDynaBeanTestCase exten
public void testSetSimpleFloat() {
try {
- float oldValue =
+ final float oldValue =
((Float) bean.get("floatProperty")).floatValue();
- float newValue = oldValue + (float) 1.0;
+ final float newValue = oldValue + (float) 1.0;
bean.set("floatProperty", new Float(newValue));
assertEquals("Matched new value",
newValue,
((Float) bean.get("floatProperty")).floatValue(),
(float) 0.005);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -900,14 +900,14 @@ public class BasicDynaBeanTestCase exten
public void testSetSimpleInt() {
try {
- int oldValue =
+ final int oldValue =
((Integer) bean.get("intProperty")).intValue();
- int newValue = oldValue + 1;
+ final int newValue = oldValue + 1;
bean.set("intProperty", new Integer(newValue));
assertEquals("Matched new value",
newValue,
((Integer) bean.get("intProperty")).intValue());
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -920,14 +920,14 @@ public class BasicDynaBeanTestCase exten
public void testSetSimpleLong() {
try {
- long oldValue =
+ final long oldValue =
((Long) bean.get("longProperty")).longValue();
- long newValue = oldValue + 1;
+ final long newValue = oldValue + 1;
bean.set("longProperty", new Long(newValue));
assertEquals("Matched new value",
newValue,
((Long) bean.get("longProperty")).longValue());
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -940,14 +940,14 @@ public class BasicDynaBeanTestCase exten
public void testSetSimpleShort() {
try {
- short oldValue =
+ final short oldValue =
((Short) bean.get("shortProperty")).shortValue();
- short newValue = (short) (oldValue + 1);
+ final short newValue = (short) (oldValue + 1);
bean.set("shortProperty", new Short(newValue));
assertEquals("Matched new value",
newValue,
((Short) bean.get("shortProperty")).shortValue());
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -960,13 +960,13 @@ public class BasicDynaBeanTestCase exten
public void testSetSimpleString() {
try {
- String oldValue = (String) bean.get("stringProperty");
- String newValue = oldValue + " Extra Value";
+ final String oldValue = (String) bean.get("stringProperty");
+ final String newValue = oldValue + " Extra Value";
bean.set("stringProperty", newValue);
assertEquals("Matched new value",
newValue,
(String) bean.get("stringProperty"));
- } catch (Throwable e) {
+ } catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -982,10 +982,10 @@ public class BasicDynaBeanTestCase exten
*/
protected DynaClass createDynaClass() {
- int intArray[] = new int[0];
- String stringArray[] = new String[0];
+ final int intArray[] = new int[0];
+ final String stringArray[] = new String[0];
- DynaClass dynaClass = new BasicDynaClass
+ final DynaClass dynaClass = new BasicDynaClass
("TestDynaClass", null,
new DynaProperty[]{
new DynaProperty("booleanProperty", Boolean.TYPE),
@@ -1016,14 +1016,14 @@ public class BasicDynaBeanTestCase exten
* @param name Name of the property to be retrieved
* @param type Expected class type of this property
*/
- protected void testGetDescriptorBase(String name, Class<?> type) {
+ protected void testGetDescriptorBase(final String name, final Class<?> type) {
try {
- DynaProperty descriptor =
+ final DynaProperty descriptor =
bean.getDynaClass().getDynaProperty(name);
assertNotNull("Got descriptor", descriptor);
assertEquals("Got correct type", type, descriptor.getType());
- } catch (Throwable t) {
+ } catch (final Throwable t) {
fail("Threw an exception: " + t);
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java Wed Oct 15 20:15:17 2014
@@ -49,7 +49,7 @@ public class BeanComparatorTestCase exte
*
* @param name Name of the test case
*/
- public BeanComparatorTestCase(String name) {
+ public BeanComparatorTestCase(final String name) {
super(name);
}
@@ -95,9 +95,9 @@ public class BeanComparatorTestCase exte
* tests comparing two beans via their name using the default Comparator
*/
public void testSimpleCompare() {
- BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
+ final BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
"name");
- int result = beanComparator.compare(alphaBean1, alphaBean2);
+ final int result = beanComparator.compare(alphaBean1, alphaBean2);
assertTrue("Comparator did not sort properly. Result:" + result,
result == -1);
}
@@ -106,9 +106,9 @@ public class BeanComparatorTestCase exte
* tests comparing two beans via their name using the default Comparator, but the inverse
*/
public void testSimpleCompareInverse() {
- BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
+ final BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
"name");
- int result = beanComparator.compare(alphaBean2, alphaBean1);
+ final int result = beanComparator.compare(alphaBean2, alphaBean1);
assertTrue("Comparator did not sort properly. Result:" + result,
result == 1);
}
@@ -119,9 +119,9 @@ public class BeanComparatorTestCase exte
public void testCompareIdentical() {
alphaBean1 = new AlphaBean("alphabean");
alphaBean2 = new AlphaBean("alphabean");
- BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
+ final BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
"name");
- int result = beanComparator.compare(alphaBean1, alphaBean2);
+ final int result = beanComparator.compare(alphaBean1, alphaBean2);
assertTrue("Comparator did not sort properly. Result:" + result,
result == 0);
}
@@ -130,9 +130,9 @@ public class BeanComparatorTestCase exte
* tests comparing one bean against itself.
*/
public void testCompareBeanAgainstSelf() {
- BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
+ final BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>(
"name");
- int result = beanComparator.compare(alphaBean1, alphaBean1);
+ final int result = beanComparator.compare(alphaBean1, alphaBean1);
assertTrue("Comparator did not sort properly. Result:" + result,
result == 0);
}
@@ -143,12 +143,12 @@ public class BeanComparatorTestCase exte
*/
public void testCompareWithNulls() {
try {
- BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>("name");
+ final BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>("name");
beanComparator.compare(alphaBean2, null);
fail("Should not be able to compare a null value.");
}
- catch (Exception e) {
+ catch (final Exception e) {
// expected result
}
}
@@ -158,13 +158,13 @@ public class BeanComparatorTestCase exte
*/
public void testCompareOnMissingProperty() {
try {
- BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>("bogusName");
+ final BeanComparator<AlphaBean> beanComparator = new BeanComparator<AlphaBean>("bogusName");
beanComparator.compare(alphaBean2, alphaBean1);
fail("should not be able to compare");
}
- catch (Exception e) {
+ catch (final Exception e) {
assertTrue("Wrong exception was thrown: " + e, e.toString().indexOf("Unknown property") > -1);
}
}
@@ -174,13 +174,13 @@ public class BeanComparatorTestCase exte
*/
public void testCompareOnBooleanProperty() {
try {
- TestBean testBeanA = new TestBean();
- TestBean testBeanB = new TestBean();
+ final TestBean testBeanA = new TestBean();
+ final TestBean testBeanB = new TestBean();
testBeanA.setBooleanProperty(true);
testBeanB.setBooleanProperty(false);
- BeanComparator<TestBean> beanComparator = new BeanComparator<TestBean>("booleanProperty");
+ final BeanComparator<TestBean> beanComparator = new BeanComparator<TestBean>("booleanProperty");
beanComparator.compare(testBeanA, testBeanB);
// **** java.lang.Boolean implements Comparable from JDK 1.5 onwards
@@ -188,7 +188,7 @@ public class BeanComparatorTestCase exte
// fail("BeanComparator should throw an exception when comparing two booleans.");
}
- catch (ClassCastException cce){
+ catch (final ClassCastException cce){
// Expected result
}
}
@@ -197,13 +197,13 @@ public class BeanComparatorTestCase exte
* tests comparing two beans on a boolean property, then changing the property and testing
*/
public void testSetProperty() {
- TestBean testBeanA = new TestBean();
- TestBean testBeanB = new TestBean();
+ final TestBean testBeanA = new TestBean();
+ final TestBean testBeanB = new TestBean();
testBeanA.setDoubleProperty(5.5);
testBeanB.setDoubleProperty(1.0);
- BeanComparator<TestBean> beanComparator = new BeanComparator<TestBean>(
+ final BeanComparator<TestBean> beanComparator = new BeanComparator<TestBean>(
"doubleProperty");
int result = beanComparator.compare(testBeanA, testBeanB);
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java Wed Oct 15 20:15:17 2014
@@ -41,7 +41,7 @@ public class BeanIntrospectionDataTestCa
* @return the array with property descriptors
*/
private static PropertyDescriptor[] fetchDescriptors() {
- PropertyUtilsBean pub = new PropertyUtilsBean();
+ final PropertyUtilsBean pub = new PropertyUtilsBean();
pub.addBeanIntrospector(new FluentPropertyBeanIntrospector());
return pub.getPropertyDescriptors(BEAN_CLASS);
}
@@ -61,7 +61,7 @@ public class BeanIntrospectionDataTestCa
* @param bid the data object
* @return the test property descriptor
*/
- private static PropertyDescriptor fetchTestDescriptor(BeanIntrospectionData bid) {
+ private static PropertyDescriptor fetchTestDescriptor(final BeanIntrospectionData bid) {
return bid.getDescriptor(TEST_PROP);
}
@@ -69,8 +69,8 @@ public class BeanIntrospectionDataTestCa
* Tests whether a write method can be queried if it is defined in the descriptor.
*/
public void testGetWriteMethodDefined() {
- BeanIntrospectionData data = setUpData();
- PropertyDescriptor pd = fetchTestDescriptor(data);
+ final BeanIntrospectionData data = setUpData();
+ final PropertyDescriptor pd = fetchTestDescriptor(data);
assertNotNull("No write method", pd.getWriteMethod());
assertEquals("Wrong write method", pd.getWriteMethod(),
data.getWriteMethod(BEAN_CLASS, pd));
@@ -81,9 +81,9 @@ public class BeanIntrospectionDataTestCa
* property descriptor.
*/
public void testGetWriteMethodUndefined() throws Exception {
- BeanIntrospectionData data = setUpData();
- PropertyDescriptor pd = fetchTestDescriptor(data);
- Method writeMethod = pd.getWriteMethod();
+ final BeanIntrospectionData data = setUpData();
+ final PropertyDescriptor pd = fetchTestDescriptor(data);
+ final Method writeMethod = pd.getWriteMethod();
pd.setWriteMethod(null);
assertEquals("Wrong write method", writeMethod,
data.getWriteMethod(BEAN_CLASS, pd));
@@ -95,12 +95,12 @@ public class BeanIntrospectionDataTestCa
* which should normally not happen in practice.)
*/
public void testGetWriteMethodNonExisting() throws Exception {
- PropertyDescriptor pd = new PropertyDescriptor(TEST_PROP,
+ final PropertyDescriptor pd = new PropertyDescriptor(TEST_PROP,
BEAN_CLASS.getMethod("getFluentGetProperty"), BEAN_CLASS.getMethod(
"setFluentGetProperty", String.class));
- Map<String, String> methods = new HashMap<String, String>();
+ final Map<String, String> methods = new HashMap<String, String>();
methods.put(TEST_PROP, "hashCode");
- BeanIntrospectionData data = new BeanIntrospectionData(
+ final BeanIntrospectionData data = new BeanIntrospectionData(
new PropertyDescriptor[] { pd }, methods);
pd.setWriteMethod(null);
assertNull("Got a write method", data.getWriteMethod(BEAN_CLASS, pd));
@@ -110,8 +110,8 @@ public class BeanIntrospectionDataTestCa
* Tests getWriteMethod() for a property for which no write method is known.
*/
public void testGetWriteMethodUnknown() {
- BeanIntrospectionData data = setUpData();
- PropertyDescriptor pd = data.getDescriptor("class");
+ final BeanIntrospectionData data = setUpData();
+ final PropertyDescriptor pd = data.getDescriptor("class");
assertNull("Got a write method", data.getWriteMethod(BEAN_CLASS, pd));
}
}