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 2023/02/18 13:53:19 UTC
[commons-beanutils] 01/05: Generics and prune whitespace
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 6408c00d1e7b79d9577d8a51fdff1b2718bda0df
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Feb 15 14:10:39 2023 -0500
Generics and prune whitespace
---
.../converters/ArrayConverterTestCase.java | 2 --
.../converters/BaseLocaleConverterTestCase.java | 21 +++++++++++----------
.../BigIntegerLocaleConverterTestCase.java | 1 -
.../converters/ByteLocaleConverterTestCase.java | 1 -
.../converters/CharacterConverterTestCase.java | 22 +++++++++++++---------
.../converters/ClassConverterTestCase.java | 1 -
.../beanutils2/converters/ClassReloader.java | 3 +--
.../converters/ClassReloaderTestCase.java | 6 ------
.../converters/DateConverterTestBase.java | 17 +++++++++--------
.../converters/DateLocaleConverterTestCase.java | 2 --
.../converters/DoubleLocaleConverterTestCase.java | 2 --
.../converters/DurationConverterTestCase.java | 9 ---------
.../converters/FileConverterTestCase.java | 10 ----------
13 files changed, 34 insertions(+), 63 deletions(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
index b30d5d32..6b746fb6 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
@@ -38,8 +38,6 @@ public class ArrayConverterTestCase extends TestCase {
return new TestSuite(ArrayConverterTestCase.class);
}
-
-
/**
* Constructs a new Array Converter test case.
* @param name Test Name
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
index 27fc1716..2e24f89e 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
* Base Test Case for the DecimalLocaleConverter classes. This class doesn't
* define any real tests; it just provides useful methods for the real
* test case classes to inherit.
+ * @param <T> The converter type.
*/
public class BaseLocaleConverterTestCase<T> extends TestCase {
@@ -122,14 +123,14 @@ public class BaseLocaleConverterTestCase<T> extends TestCase {
/**
* Test Converting Value WITH a pattern
*/
- protected void convertValueWithPattern(final BaseLocaleConverter converter, final Object value, final String pattern, final Object expectedValue) {
+ protected void convertValueWithPattern(final BaseLocaleConverter<T> converter, final Object value, final String pattern, final Object expectedValue) {
convertValueWithPattern(converter, "", value, pattern, expectedValue);
}
/**
* Test Converting Value WITH a pattern
*/
- protected void convertValueWithPattern(final BaseLocaleConverter converter, final String msgId, final Object value, final String pattern, final Object expectedValue) {
+ protected void convertValueWithPattern(final BaseLocaleConverter<T> converter, final String msgId, final Object value, final String pattern, final Object expectedValue) {
// Convert value with no pattern
try {
result = converter.convert(value, pattern);
@@ -142,14 +143,14 @@ public class BaseLocaleConverterTestCase<T> extends TestCase {
/**
* Test Converting Value WITHOUT a pattern
*/
- protected void convertValueNoPattern(final BaseLocaleConverter converter, final Object value, final Object expectedValue) {
+ protected void convertValueNoPattern(final BaseLocaleConverter<T> converter, final Object value, final Object expectedValue) {
convertValueNoPattern(converter, "", value, expectedValue);
}
/**
* Test Converting Value WITHOUT a pattern
*/
- protected void convertValueNoPattern(final BaseLocaleConverter converter, final String msgId, final Object value, final Object expectedValue) {
+ protected void convertValueNoPattern(final BaseLocaleConverter<T> converter, final String msgId, final Object value, final Object expectedValue) {
// Convert value with no pattern
try {
result = converter.convert(value);
@@ -163,14 +164,14 @@ public class BaseLocaleConverterTestCase<T> extends TestCase {
/**
* Test Converting Value To a specified Type
*/
- protected void convertValueToType(final BaseLocaleConverter converter, final Class<?> clazz, final Object value, final String pattern, final Object expectedValue) {
+ protected void convertValueToType(final BaseLocaleConverter<T> converter, final Class<T> clazz, final Object value, final String pattern, final Object expectedValue) {
convertValueToType(converter, "", clazz, value, pattern, expectedValue);
}
/**
* Test Converting Value To a specified Type
*/
- protected void convertValueToType(final BaseLocaleConverter converter, final String msgId, final Class<?> clazz, final Object value, final String pattern, final Object expectedValue) {
+ protected void convertValueToType(final BaseLocaleConverter<T> converter, final String msgId, final Class<T> clazz, final Object value, final String pattern, final Object expectedValue) {
// Convert value with no pattern
try {
result = converter.convert(clazz, value, pattern);
@@ -183,14 +184,14 @@ public class BaseLocaleConverterTestCase<T> extends TestCase {
/**
* Test Converting Null value.
*/
- protected void convertNull(final BaseLocaleConverter converter, final Object expectedValue) {
+ protected void convertNull(final BaseLocaleConverter<T> converter, final Object expectedValue) {
convertNull(converter, "", expectedValue);
}
/**
* Test Converting Null value.
*/
- protected void convertNull(final BaseLocaleConverter converter, final String msgId, final Object expectedValue) {
+ protected void convertNull(final BaseLocaleConverter<T> converter, final String msgId, final Object expectedValue) {
// Convert value with no pattern
try {
result = converter.convert(null);
@@ -208,14 +209,14 @@ public class BaseLocaleConverterTestCase<T> extends TestCase {
/**
* Test Converting an invalid value.
*/
- protected void convertInvalid(final BaseLocaleConverter converter, final Object expectedValue) {
+ protected void convertInvalid(final BaseLocaleConverter<T> converter, final Object expectedValue) {
convertInvalid(converter, "", expectedValue);
}
/**
* Test Converting an invalid value.
*/
- protected void convertInvalid(final BaseLocaleConverter converter, final String msgId, final Object expectedValue) {
+ protected void convertInvalid(final BaseLocaleConverter<T> converter, final String msgId, final Object expectedValue) {
// Convert value with no pattern
try {
result = converter.convert("xyz");
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
index e35cc3d1..76fcc241 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
@@ -25,7 +25,6 @@ import org.apache.commons.beanutils2.locale.converters.BigIntegerLocaleConverter
* Test Case for the BigIntegerLocaleConverter class.
*
*/
-
public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase<BigInteger> {
public BigIntegerLocaleConverterTestCase(final String name) {
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
index d2861835..144eaaed 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
@@ -23,7 +23,6 @@ import org.apache.commons.beanutils2.locale.converters.ByteLocaleConverter;
* Test Case for the ByteLocaleConverter class.
*
*/
-
public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase<Byte> {
public ByteLocaleConverterTestCase(final String name) {
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
index d5c40924..3310bfd7 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
@@ -24,7 +24,6 @@ import junit.framework.TestSuite;
/**
* Test Case for the CharacterConverter class.
- *
*/
public class CharacterConverterTestCase extends TestCase {
@@ -62,7 +61,7 @@ public class CharacterConverterTestCase extends TestCase {
* Tests whether the primitive char class can be passed as target type.
*/
public void testConvertToChar() {
- final Converter converter = new CharacterConverter();
+ final Converter<Character> converter = new CharacterConverter();
assertEquals("Wrong result", Character.valueOf('F'), converter.convert(Character.TYPE, "FOO"));
}
@@ -70,7 +69,7 @@ public class CharacterConverterTestCase extends TestCase {
* Test Conversion to Character
*/
public void testConvertToCharacter() {
- final Converter converter = new CharacterConverter();
+ final Converter<Character> converter = new CharacterConverter();
assertEquals("Character Test", Character.valueOf('N'), converter.convert(Character.class, Character.valueOf('N')));
assertEquals("String Test", Character.valueOf('F'), converter.convert(Character.class, "FOO"));
assertEquals("Integer Test", Character.valueOf('3'), converter.convert(Character.class, Integer.valueOf(321)));
@@ -81,7 +80,7 @@ public class CharacterConverterTestCase extends TestCase {
* provided.
*/
public void testConvertToCharacterNullNoDefault() {
- final Converter converter = new CharacterConverter();
+ final Converter<Character> converter = new CharacterConverter();
try {
converter.convert(Character.class, null);
fail("Expected a ConversionException for null value");
@@ -93,20 +92,25 @@ public class CharacterConverterTestCase extends TestCase {
/**
* Test Conversion to String
*/
+ @SuppressWarnings("unchecked") // testing raw conversion
public void testConvertToString() {
- final Converter converter = new CharacterConverter();
+ final Converter<Character> converter = new CharacterConverter();
+ @SuppressWarnings("rawtypes")
+ final Converter raw = converter;
- assertEquals("Character Test", "N", converter.convert(String.class, Character.valueOf('N')));
- assertEquals("String Test", "F", converter.convert(String.class, "FOO"));
- assertEquals("Integer Test", "3", converter.convert(String.class, Integer.valueOf(321)));
- assertEquals("Null Test", null, converter.convert(String.class, null));
+ assertEquals("Character Test", "N", raw.convert(String.class, Character.valueOf('N')));
+ assertEquals("String Test", "F", raw.convert(String.class, "FOO"));
+ assertEquals("Integer Test", "3", raw.convert(String.class, Integer.valueOf(321)));
+ assertEquals("Null Test", null, raw.convert(String.class, null));
}
/**
* Tries a conversion to an unsupported type.
*/
+ @SuppressWarnings("unchecked") // tests failure so allow mismatch
public void testConvertToUnsupportedType() {
+ @SuppressWarnings("rawtypes") // tests failure so allow mismatch
final Converter converter = new CharacterConverter();
try {
converter.convert(Integer.class, "Test");
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
index e04eb759..cdca5daf 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
@@ -24,7 +24,6 @@ import junit.framework.TestSuite;
/**
* Test Case for the ClassConverter class.
- *
*/
public class ClassConverterTestCase extends TestCase {
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloader.java b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloader.java
index 0b50c2d8..df125c09 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloader.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloader.java
@@ -42,10 +42,9 @@ import java.io.InputStream;
* present in the classpath for a container's "shared" classloader <i>and</i>
* been present in the component-specific classpath too, without any messing
* about with the way unit test code is compiled or executed.
- *
*/
-
public class ClassReloader extends ClassLoader {
+
public ClassReloader(final ClassLoader parent) {
super(parent);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
index 0dc6c1ce..062658bb 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
@@ -22,13 +22,9 @@ import junit.framework.TestSuite;
/**
* Tests for the ClassReloader utility class.
- *
*/
-
public class ClassReloaderTestCase extends TestCase {
-
-
public static class DummyClass {
}
@@ -36,8 +32,6 @@ public class ClassReloaderTestCase extends TestCase {
return new TestSuite(ClassReloaderTestCase.class);
}
-
-
public ClassReloaderTestCase(final String name) {
super(name);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
index 97863a43..d109ae54 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
@@ -219,7 +219,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
public void testDefaultStringToTypeConvert() {
// Create & Configure the Converter
- final DateTimeConverter converter = makeConverter();
+ final DateTimeConverter<T> converter = makeConverter();
converter.setUseLocaleFormat(false);
try {
converter.convert(getExpectedType(), "2006-10-23");
@@ -237,7 +237,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
final String pattern = "yyyy-MM-dd";
// Create & Configure the Converter
- final DateTimeConverter converter = makeConverter();
+ final DateTimeConverter<T> converter = makeConverter();
converter.setPattern(pattern);
// Valid String --> Type Conversion
@@ -260,7 +260,8 @@ public abstract class DateConverterTestBase<T> extends TestCase {
public void testInvalidType() {
// Create & Configure the Converter
- final DateTimeConverter converter = makeConverter();
+ @SuppressWarnings("unchecked") // we are creating a mismatch to assert a failure
+ final DateTimeConverter<Character> converter = (DateTimeConverter<Character>) makeConverter();
// Invalid Class Type
try {
@@ -283,7 +284,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
final String pattern = "M/d/yy"; // SHORT style date format for US Locale
// Create & Configure the Converter
- final DateTimeConverter converter = makeConverter();
+ final DateTimeConverter<T> converter = makeConverter();
converter.setUseLocaleFormat(true);
// Valid String --> Type Conversion
@@ -313,7 +314,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
// Create & Configure the Converter
final String[] patterns = {"yyyy-MM-dd", "yyyy/MM/dd"};
- final DateTimeConverter converter = makeConverter();
+ final DateTimeConverter<T> converter = makeConverter();
converter.setPatterns(patterns);
// First Pattern
@@ -368,7 +369,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
final String pattern = "yyyy-MM-dd";
// Create & Configure the Converter
- final DateTimeConverter converter = makeConverter();
+ final DateTimeConverter<T> converter = makeConverter();
converter.setPattern(pattern);
// Valid String --> Type Conversion
@@ -438,7 +439,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
final String pattern = "yyyy-MM-dd";
// Create & Configure the Converter
- final DateTimeConverter converter = makeConverter();
+ final DateTimeConverter<T> converter = makeConverter();
converter.setPattern(pattern);
// Create Values
@@ -564,7 +565,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
* @param expected The expected result
* @param value The value to convert
*/
- protected void validConversion(final Converter converter, final Object expected, final Object value) {
+ protected void validConversion(final Converter<T> converter, final Object expected, final Object value) {
final String valueType = value == null ? "null" : value.getClass().getName();
final String msg = "Converting '" + valueType + "' value '" + value + "'";
try {
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
index 0620609b..ad76a108 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
@@ -31,9 +31,7 @@ import org.apache.commons.logging.LogFactory;
/**
* Test Case for the DateLocaleConverter class.
- *
*/
-
public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase<Date> {
/** All logging goes through this logger */
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
index 87d5c867..4a992a97 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
@@ -21,9 +21,7 @@ import org.apache.commons.beanutils2.locale.converters.DoubleLocaleConverter;
/**
* Test Case for the DoubleLocaleConverter class.
- *
*/
-
public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase<Double> {
public DoubleLocaleConverterTestCase(final String name) {
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
index c90be77b..ab328b32 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
@@ -27,7 +27,6 @@ import junit.framework.TestSuite;
/**
* Test Case for the DurationConverter class.
- *
*/
public class DurationConverterTestCase extends TestCase {
@@ -35,12 +34,8 @@ public class DurationConverterTestCase extends TestCase {
return new TestSuite(DurationConverterTestCase.class);
}
-
-
private Converter converter = null;
-
-
public DurationConverterTestCase(final String name) {
super(name);
}
@@ -53,8 +48,6 @@ public class DurationConverterTestCase extends TestCase {
return new DurationConverter();
}
-
-
@Override
public void setUp() throws Exception {
converter = makeConverter();
@@ -65,8 +58,6 @@ public class DurationConverterTestCase extends TestCase {
converter = null;
}
-
-
public void testSimpleConversion() throws Exception {
final String[] message= {
"from String",
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
index 61553a67..42a72c67 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
@@ -27,21 +27,15 @@ import junit.framework.TestSuite;
/**
* Test Case for the FileConverter class.
- *
*/
-
public class FileConverterTestCase extends TestCase {
public static TestSuite suite() {
return new TestSuite(FileConverterTestCase.class);
}
-
-
private Converter converter = null;
-
-
public FileConverterTestCase(final String name) {
super(name);
}
@@ -54,8 +48,6 @@ public class FileConverterTestCase extends TestCase {
return new FileConverter();
}
-
-
@Override
public void setUp() throws Exception {
converter = makeConverter();
@@ -66,8 +58,6 @@ public class FileConverterTestCase extends TestCase {
converter = null;
}
-
-
public void testSimpleConversion() throws Exception {
final String[] message= {
"from String",