This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git
The following commit(s) were added to refs/heads/master by this push:
new e3d6394 Use Byte.valueOf rather than new Byte etc
e3d6394 is described below
commit e3d6394daddb1389dcdf053fc12f9ab66ddf0d59
Author: Sebb <s...@apache.org>
AuthorDate: Fri Jun 19 13:37:51 2020 +0100
Use Byte.valueOf rather than new Byte etc
---
.../commons/validator/GenericTypeValidator.java | 8 ++++----
.../validator/routines/DoubleValidator.java | 2 +-
.../commons/validator/routines/FloatValidator.java | 2 +-
.../org/apache/commons/validator/FloatTest.java | 4 ++--
.../org/apache/commons/validator/IntegerTest.java | 4 ++--
.../org/apache/commons/validator/LongTest.java | 4 ++--
.../org/apache/commons/validator/ShortTest.java | 4 ++--
.../routines/AbstractNumberValidatorTest.java | 12 ++++++------
.../validator/routines/ByteValidatorTest.java | 14 +++++++-------
.../validator/routines/DoubleValidatorTest.java | 6 +++---
.../validator/routines/FloatValidatorTest.java | 22 +++++++++++-----------
.../validator/routines/IntegerValidatorTest.java | 14 +++++++-------
.../validator/routines/LongValidatorTest.java | 6 +++---
.../validator/routines/ShortValidatorTest.java | 14 +++++++-------
14 files changed, 58 insertions(+), 58 deletions(-)
diff --git
a/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
b/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
index c074bb9..d3d72a9 100644
--- a/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
+++ b/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
@@ -260,7 +260,7 @@ public class GenericTypeValidator implements Serializable {
}
try {
- return new Float(value);
+ return Float.valueOf(value);
} catch (NumberFormatException e) {
return null;
}
@@ -292,7 +292,7 @@ public class GenericTypeValidator implements Serializable {
if (pos.getErrorIndex() == -1 && pos.getIndex() == value.length()
&&
num.doubleValue() >= (Float.MAX_VALUE * -1) &&
num.doubleValue() <= Float.MAX_VALUE) {
- result = new Float(num.floatValue());
+ result = Float.valueOf(num.floatValue());
}
}
@@ -311,7 +311,7 @@ public class GenericTypeValidator implements Serializable {
}
try {
- return new Double(value);
+ return Double.valueOf(value);
} catch (NumberFormatException e) {
return null;
}
@@ -343,7 +343,7 @@ public class GenericTypeValidator implements Serializable {
if (pos.getErrorIndex() == -1 && pos.getIndex() == value.length()
&&
num.doubleValue() >= (Double.MAX_VALUE * -1) &&
num.doubleValue() <= Double.MAX_VALUE) {
- result = new Double(num.doubleValue());
+ result = Double.valueOf(num.doubleValue());
}
}
diff --git
a/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
b/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
index 750fbe5..d24a3d8 100644
--- a/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
@@ -246,7 +246,7 @@ public class DoubleValidator extends
AbstractNumberValidator {
if (value instanceof Double) {
return value;
}
- return new Double(((Number)value).doubleValue());
+ return Double.valueOf(((Number)value).doubleValue());
}
}
diff --git
a/src/main/java/org/apache/commons/validator/routines/FloatValidator.java
b/src/main/java/org/apache/commons/validator/routines/FloatValidator.java
index 1d681c5..612aa95 100644
--- a/src/main/java/org/apache/commons/validator/routines/FloatValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/FloatValidator.java
@@ -263,7 +263,7 @@ public class FloatValidator extends AbstractNumberValidator
{
}
}
- return new Float((float)doubleValue);
+ return Float.valueOf((float)doubleValue);
}
diff --git a/src/test/java/org/apache/commons/validator/FloatTest.java
b/src/test/java/org/apache/commons/validator/FloatTest.java
index a9a5c99..8b57a27 100644
--- a/src/test/java/org/apache/commons/validator/FloatTest.java
+++ b/src/test/java/org/apache/commons/validator/FloatTest.java
@@ -47,7 +47,7 @@ public class FloatTest extends AbstractNumberTest {
public void testFloatMin() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Float(Float.MIN_VALUE).toString());
+ info.setValue(Float.valueOf(Float.MIN_VALUE).toString());
valueTest(info, true);
}
@@ -58,7 +58,7 @@ public class FloatTest extends AbstractNumberTest {
public void testFloatMax() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Float(Float.MAX_VALUE).toString());
+ info.setValue(Float.valueOf(Float.MAX_VALUE).toString());
valueTest(info, true);
}
diff --git a/src/test/java/org/apache/commons/validator/IntegerTest.java
b/src/test/java/org/apache/commons/validator/IntegerTest.java
index e8ef09f..14806a7 100644
--- a/src/test/java/org/apache/commons/validator/IntegerTest.java
+++ b/src/test/java/org/apache/commons/validator/IntegerTest.java
@@ -50,7 +50,7 @@ public class IntegerTest extends AbstractNumberTest {
public void testIntMin() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Integer(Integer.MIN_VALUE).toString());
+ info.setValue(Integer.valueOf(Integer.MIN_VALUE).toString());
valueTest(info, true);
}
@@ -61,7 +61,7 @@ public class IntegerTest extends AbstractNumberTest {
public void testIntegerMax() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Integer(Integer.MAX_VALUE).toString());
+ info.setValue(Integer.valueOf(Integer.MAX_VALUE).toString());
valueTest(info, true);
}
diff --git a/src/test/java/org/apache/commons/validator/LongTest.java
b/src/test/java/org/apache/commons/validator/LongTest.java
index 522eaad..09660af 100644
--- a/src/test/java/org/apache/commons/validator/LongTest.java
+++ b/src/test/java/org/apache/commons/validator/LongTest.java
@@ -47,7 +47,7 @@ public class LongTest extends AbstractNumberTest {
public void testLongMin() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Long(Long.MIN_VALUE).toString());
+ info.setValue(Long.valueOf(Long.MIN_VALUE).toString());
valueTest(info, true);
}
@@ -58,7 +58,7 @@ public class LongTest extends AbstractNumberTest {
public void testLongMax() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Long(Long.MAX_VALUE).toString());
+ info.setValue(Long.valueOf(Long.MAX_VALUE).toString());
valueTest(info, true);
}
diff --git a/src/test/java/org/apache/commons/validator/ShortTest.java
b/src/test/java/org/apache/commons/validator/ShortTest.java
index 260ded8..d4d1015 100644
--- a/src/test/java/org/apache/commons/validator/ShortTest.java
+++ b/src/test/java/org/apache/commons/validator/ShortTest.java
@@ -36,7 +36,7 @@ public class ShortTest extends AbstractNumberTest {
public void testShortMin() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Short(Short.MIN_VALUE).toString());
+ info.setValue(Short.valueOf(Short.MIN_VALUE).toString());
valueTest(info, true);
}
@@ -47,7 +47,7 @@ public class ShortTest extends AbstractNumberTest {
public void testShortMax() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
- info.setValue(new Short(Short.MAX_VALUE).toString());
+ info.setValue(Short.valueOf(Short.MAX_VALUE).toString());
valueTest(info, true);
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
index e81131a..1d88bcc 100644
---
a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
@@ -189,12 +189,12 @@ public abstract class AbstractNumberValidatorTest extends
TestCase {
* Test Range/Min/Max
*/
public void testRangeMinMax() {
- Number number9 = new Integer(9);
- Number number10 = new Integer(10);
- Number number11 = new Integer(11);
- Number number19 = new Integer(19);
- Number number20 = new Integer(20);
- Number number21 = new Integer(21);
+ Number number9 = Integer.valueOf(9);
+ Number number10 = Integer.valueOf(10);
+ Number number11 = Integer.valueOf(11);
+ Number number19 = Integer.valueOf(19);
+ Number number20 = Integer.valueOf(20);
+ Number number21 = Integer.valueOf(21);
// Test isInRange()
assertFalse("isInRange() < min", strictValidator.isInRange(number9 ,
number10, number20));
diff --git
a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
index 107e25a..7cfdc84 100644
--- a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
@@ -43,10 +43,10 @@ public class ByteValidatorTest extends
AbstractNumberValidatorTest {
testPattern = "#,###";
// testValidateMinMax()
- max = new Byte(Byte.MAX_VALUE);
- maxPlusOne = new Long(max.longValue() + 1);
- min = new Byte(Byte.MIN_VALUE);
- minMinusOne = new Long(min.longValue() - 1);
+ max = Byte.valueOf(Byte.MAX_VALUE);
+ maxPlusOne = Long.valueOf(max.longValue() + 1);
+ min = Byte.valueOf(Byte.MIN_VALUE);
+ minMinusOne = Long.valueOf(min.longValue() - 1);
// testInvalidStrict()
invalidStrict = new String[] {null, "", "X", "X12", "12X", "1X2",
"1.2"};
@@ -55,8 +55,8 @@ public class ByteValidatorTest extends
AbstractNumberValidatorTest {
invalid = new String[] {null, "", "X", "X12"};
// testValid()
- testNumber = new Byte((byte)123);
- testZero = new Byte((byte)0);
+ testNumber = Byte.valueOf((byte)123);
+ testZero = Byte.valueOf((byte)0);
validStrict = new String[] {"0", "123", ",123"};
validStrictCompare = new Number[] {testZero, testNumber, testNumber};
valid = new String[] {"0", "123", ",123", ",123.5",
"123X"};
@@ -84,7 +84,7 @@ public class ByteValidatorTest extends
AbstractNumberValidatorTest {
String localeVal = ".123";
String defaultVal = ",123";
String XXXX = "XXXX";
- Byte expected = new Byte((byte)123);
+ Byte expected = Byte.valueOf((byte)123);
assertEquals("validate(A) default", expected,
ByteValidator.getInstance().validate(defaultVal));
assertEquals("validate(A) locale ", expected,
ByteValidator.getInstance().validate(localeVal, locale));
assertEquals("validate(A) pattern", expected,
ByteValidator.getInstance().validate(patternVal, pattern));
diff --git
a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
index 4b4b277..f002bc9 100644
---
a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
@@ -55,8 +55,8 @@ public class DoubleValidatorTest extends
AbstractNumberValidatorTest {
invalid = new String[] {null, "", "X", "X12"};
// testValid()
- testNumber = new Double(1234.5);
- testZero = new Double(0);
+ testNumber = Double.valueOf(1234.5);
+ testZero = Double.valueOf(0);
validStrict = new String[] {"0", "1234.5", "1,234.5"};
validStrictCompare = new Number[] {testZero, testNumber, testNumber};
valid = new String[] {"0", "1234.5", "1,234.5",
"1,234.5", "1234.5X"};
@@ -84,7 +84,7 @@ public class DoubleValidatorTest extends
AbstractNumberValidatorTest {
String localeVal = "12.345";
String defaultVal = "12,345";
String XXXX = "XXXX";
- Double expected = new Double(12345);
+ Double expected = Double.valueOf(12345);
assertEquals("validate(A) default", expected,
DoubleValidator.getInstance().validate(defaultVal));
assertEquals("validate(A) locale ", expected,
DoubleValidator.getInstance().validate(localeVal, locale));
assertEquals("validate(A) pattern", expected,
DoubleValidator.getInstance().validate(patternVal, pattern));
diff --git
a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
index 7cae8df..ccf2703 100644
---
a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
@@ -44,10 +44,10 @@ public class FloatValidatorTest extends
AbstractNumberValidatorTest {
testPattern = "#,###.#";
// testValidateMinMax()
- max = new Float(Float.MAX_VALUE);
- maxPlusOne = new Double(max.doubleValue() * 10);
- min = new Float(Float.MAX_VALUE * -1);
- minMinusOne = new Double(min.doubleValue() * 10);
+ max = Float.valueOf(Float.MAX_VALUE);
+ maxPlusOne = Double.valueOf(max.doubleValue() * 10);
+ min = Float.valueOf(Float.MAX_VALUE * -1);
+ minMinusOne = Double.valueOf(min.doubleValue() * 10);
// testInvalidStrict()
invalidStrict = new String[] {null, "", "X", "X12", "12X", "1X2"};
@@ -56,8 +56,8 @@ public class FloatValidatorTest extends
AbstractNumberValidatorTest {
invalid = new String[] {null, "", "X", "X12"};
// testValid()
- testNumber = new Float(1234.5);
- testZero = new Float(0);
+ testNumber = Float.valueOf(1234.5f);
+ testZero = Float.valueOf(0);
validStrict = new String[] {"0", "1234.5", "1,234.5"};
validStrictCompare = new Number[] {testZero, testNumber, testNumber};
valid = new String[] {"0", "1234.5", "1,234.5",
"1,234.5", "1234.5X"};
@@ -85,7 +85,7 @@ public class FloatValidatorTest extends
AbstractNumberValidatorTest {
String germanPatternVal = "1.23.45";
String defaultVal = "12,345";
String XXXX = "XXXX";
- Float expected = new Float(12345);
+ Float expected = Float.valueOf(12345);
assertEquals("validate(A) default", expected,
FloatValidator.getInstance().validate(defaultVal));
assertEquals("validate(A) locale ", expected,
FloatValidator.getInstance().validate(localeVal, locale));
assertEquals("validate(A) pattern", expected,
FloatValidator.getInstance().validate(patternVal, pattern));
@@ -116,22 +116,22 @@ public class FloatValidatorTest extends
AbstractNumberValidatorTest {
DecimalFormat fmt = new DecimalFormat(pattern);
// Validate Smallest +ve value
- Float smallestPositive = new Float(Float.MIN_VALUE);
+ Float smallestPositive = Float.valueOf(Float.MIN_VALUE);
String strSmallestPositive = fmt.format(smallestPositive);
assertEquals("Smallest +ve", smallestPositive,
FloatValidator.getInstance().validate(strSmallestPositive, pattern));
// Validate Smallest -ve value
- Float smallestNegative = new Float(Float.MIN_VALUE * -1);
+ Float smallestNegative = Float.valueOf(Float.MIN_VALUE * -1);
String strSmallestNegative = fmt.format(smallestNegative);
assertEquals("Smallest -ve", smallestNegative,
FloatValidator.getInstance().validate(strSmallestNegative, pattern));
// Validate Too Small +ve
- Double tooSmallPositive = new Double(((double)Float.MIN_VALUE /
(double)10));
+ Double tooSmallPositive = Double.valueOf(((double)Float.MIN_VALUE /
(double)10));
String strTooSmallPositive = fmt.format(tooSmallPositive);
assertFalse("Too small +ve",
FloatValidator.getInstance().isValid(strTooSmallPositive, pattern));
// Validate Too Small -ve
- Double tooSmallNegative = new Double(tooSmallPositive.doubleValue() *
-1);
+ Double tooSmallNegative =
Double.valueOf(tooSmallPositive.doubleValue() * -1);
String strTooSmallNegative = fmt.format(tooSmallNegative);
assertFalse("Too small -ve",
FloatValidator.getInstance().isValid(strTooSmallNegative, pattern));
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
index 80c0964..2a56be8 100644
---
a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
@@ -43,10 +43,10 @@ public class IntegerValidatorTest extends
AbstractNumberValidatorTest {
testPattern = "#,###";
// testValidateMinMax()
- max = new Integer(Integer.MAX_VALUE);
- maxPlusOne = new Long(max.longValue() + 1);
- min = new Integer(Integer.MIN_VALUE);
- minMinusOne = new Long(min.longValue() - 1);
+ max = Integer.valueOf(Integer.MAX_VALUE);
+ maxPlusOne = Long.valueOf(max.longValue() + 1);
+ min = Integer.valueOf(Integer.MIN_VALUE);
+ minMinusOne = Long.valueOf(min.longValue() - 1);
// testInvalidStrict()
invalidStrict = new String[] {null, "", "X", "X12", "12X", "1X2",
"1.2"};
@@ -55,8 +55,8 @@ public class IntegerValidatorTest extends
AbstractNumberValidatorTest {
invalid = new String[] {null, "", "X", "X12"};
// testValid()
- testNumber = new Integer(1234);
- testZero = new Integer(0);
+ testNumber = Integer.valueOf(1234);
+ testZero = Integer.valueOf(0);
validStrict = new String[] {"0", "1234", "1,234"};
validStrictCompare = new Number[] {testZero, testNumber, testNumber};
valid = new String[] {"0", "1234", "1,234", "1,234.5",
"1234X"};
@@ -83,7 +83,7 @@ public class IntegerValidatorTest extends
AbstractNumberValidatorTest {
String localeVal = "12.345";
String defaultVal = "12,345";
String XXXX = "XXXX";
- Integer expected = new Integer(12345);
+ Integer expected = Integer.valueOf(12345);
assertEquals("validate(A) default", expected,
IntegerValidator.getInstance().validate(defaultVal));
assertEquals("validate(A) locale ", expected,
IntegerValidator.getInstance().validate(localeVal, locale));
assertEquals("validate(A) pattern", expected,
IntegerValidator.getInstance().validate(patternVal, pattern));
diff --git
a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
index e544f63..68114ae 100644
--- a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
@@ -55,8 +55,8 @@ public class LongValidatorTest extends
AbstractNumberValidatorTest {
invalid = new String[] {null, "", "X", "X12"};
// testValid()
- testNumber = new Long(1234);
- testZero = new Long(0);
+ testNumber = Long.valueOf(1234);
+ testZero = Long.valueOf(0);
validStrict = new String[] {"0", "1234", "1,234"};
validStrictCompare = new Number[] {testZero, testNumber, testNumber};
valid = new String[] {"0", "1234", "1,234", "1,234.5",
"1234X"};
@@ -84,7 +84,7 @@ public class LongValidatorTest extends
AbstractNumberValidatorTest {
String localeVal = "12.345";
String defaultVal = "12,345";
String XXXX = "XXXX";
- Long expected = new Long(12345);
+ Long expected = Long.valueOf(12345);
assertEquals("validate(A) default", expected,
LongValidator.getInstance().validate(defaultVal));
assertEquals("validate(A) locale ", expected,
LongValidator.getInstance().validate(localeVal, locale));
assertEquals("validate(A) pattern", expected,
LongValidator.getInstance().validate(patternVal, pattern));
diff --git
a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
index fdb3647..9372300 100644
---
a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
@@ -43,10 +43,10 @@ public class ShortValidatorTest extends
AbstractNumberValidatorTest {
testPattern = "#,###";
// testValidateMinMax()
- max = new Short(Short.MAX_VALUE);
- maxPlusOne = new Long(max.longValue() + 1);
- min = new Short(Short.MIN_VALUE);
- minMinusOne = new Long(min.longValue() - 1);
+ max = Short.valueOf(Short.MAX_VALUE);
+ maxPlusOne = Long.valueOf(max.longValue() + 1);
+ min = Short.valueOf(Short.MIN_VALUE);
+ minMinusOne = Long.valueOf(min.longValue() - 1);
// testInvalidStrict()
invalidStrict = new String[] {null, "", "X", "X12", "12X", "1X2",
"1.2"};
@@ -55,8 +55,8 @@ public class ShortValidatorTest extends
AbstractNumberValidatorTest {
invalid = new String[] {null, "", "X", "X12"};
// testValid()
- testNumber = new Short((short)1234);
- testZero = new Short((short)0);
+ testNumber = Short.valueOf((short)1234);
+ testZero = Short.valueOf((short)0);
validStrict = new String[] {"0", "1234", "1,234"};
validStrictCompare = new Number[] {testZero, testNumber, testNumber};
valid = new String[] {"0", "1234", "1,234", "1,234.5",
"1234X"};
@@ -84,7 +84,7 @@ public class ShortValidatorTest extends
AbstractNumberValidatorTest {
String localeVal = "12.345";
String defaultVal = "12,345";
String XXXX = "XXXX";
- Short expected = new Short((short)12345);
+ Short expected = Short.valueOf((short)12345);
assertEquals("validate(A) default", expected,
ShortValidator.getInstance().validate(defaultVal));
assertEquals("validate(A) locale ", expected,
ShortValidator.getInstance().validate(localeVal, locale));
assertEquals("validate(A) pattern", expected,
ShortValidator.getInstance().validate(patternVal, pattern));
