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
The following commit(s) were added to refs/heads/master by this push:
new 4d5e63e2 Use Long cache
4d5e63e2 is described below
commit 4d5e63e2a63428c54d8591a4c8b8a4ada8d8c818
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jan 8 11:23:42 2023 -0500
Use Long cache
---
.../commons/beanutils2/BasicDynaBeanTestCase.java | 4 +--
.../apache/commons/beanutils2/BeanMapTestCase.java | 2 +-
.../BeanToPropertyValueTransformerTestCase.java | 2 +-
.../commons/beanutils2/BeanUtilsBenchCase.java | 2 +-
.../commons/beanutils2/BeanUtilsTestCase.java | 30 +++++++++---------
.../commons/beanutils2/DynaBeanUtilsTestCase.java | 24 +++++++--------
.../beanutils2/DynaPropertyUtilsTestCase.java | 10 +++---
.../commons/beanutils2/MappedPropertyTestBean.java | 2 +-
.../commons/beanutils2/PropertyUtilsBenchCase.java | 2 +-
.../commons/beanutils2/PropertyUtilsTestCase.java | 8 ++---
.../apache/commons/beanutils2/TestResultSet.java | 2 +-
.../converters/ArrayConverterTestCase.java | 2 +-
.../converters/BigDecimalConverterTestCase.java | 2 +-
.../converters/BigIntegerConverterTestCase.java | 2 +-
.../converters/ByteConverterTestCase.java | 10 +++---
.../converters/DoubleConverterTestCase.java | 2 +-
.../converters/FloatConverterTestCase.java | 2 +-
.../converters/IntegerConverterTestCase.java | 10 +++---
.../converters/LongConverterTestCase.java | 36 +++++++++++-----------
.../converters/NumberConverterTestBase.java | 6 ++--
.../converters/ShortConverterTestCase.java | 10 +++---
.../converters/IntegerLocaleConverterTestCase.java | 2 +-
.../converters/LongLocaleConverterTestCase.java | 8 ++---
23 files changed, 90 insertions(+), 90 deletions(-)
diff --git
a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
index 3d146907..b523f01c 100644
--- a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
@@ -112,7 +112,7 @@ public class BasicDynaBeanTestCase extends TestCase {
listIndexed.add("String 3");
listIndexed.add("String 4");
bean.set("listIndexed", listIndexed);
- bean.set("longProperty", new Long(321));
+ bean.set("longProperty", Long.valueOf(321));
final HashMap<String, String> mappedProperty = new HashMap<>();
mappedProperty.put("First Key", "First Value");
mappedProperty.put("Second Key", "Second Value");
@@ -867,7 +867,7 @@ public class BasicDynaBeanTestCase extends TestCase {
final long oldValue =
((Long) bean.get("longProperty")).longValue();
final long newValue = oldValue + 1;
- bean.set("longProperty", new Long(newValue));
+ bean.set("longProperty", Long.valueOf(newValue));
assertEquals("Matched new value",
newValue,
((Long) bean.get("longProperty")).longValue());
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
index 076c9f4c..9c6bd6d6 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
@@ -379,7 +379,7 @@ public class BeanMapTestCase extends AbstractTestMap {
assertEquals("Byte.TYPE", new Byte((byte)1),
beanMap.getTypeTransformer(Byte.TYPE).apply("1"));
assertEquals("Short.TYPE", new Short((short)2),
beanMap.getTypeTransformer(Short.TYPE).apply("2"));
assertEquals("Integer.TYPE", Integer.valueOf(3),
beanMap.getTypeTransformer(Integer.TYPE).apply("3"));
- assertEquals("Long.TYPE", new Long(4),
beanMap.getTypeTransformer(Long.TYPE).apply("4"));
+ assertEquals("Long.TYPE", Long.valueOf(4),
beanMap.getTypeTransformer(Long.TYPE).apply("4"));
assertEquals("Float.TYPE", new Float("5"),
beanMap.getTypeTransformer(Float.TYPE).apply("5"));
assertEquals("Double.TYPE", Double.valueOf("6"),
beanMap.getTypeTransformer(Double.TYPE).apply("6"));
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
index 118025b7..11bc848a 100644
---
a/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
public class BeanToPropertyValueTransformerTestCase extends TestCase {
private static final Integer expectedIntegerValue = Integer.valueOf(123);
- private static final Long expectedLongValue = new Long(123);
+ private static final Long expectedLongValue = Long.valueOf(123);
private static final Float expectedFloatValue = new Float(123.123f);
private static final Double expectedDoubleValue =
Double.valueOf(567879.12344d);
private static final Boolean expectedBooleanValue = Boolean.TRUE;
diff --git
a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
index b4b4e9d0..ed84fc09 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
@@ -102,7 +102,7 @@ public class BeanUtilsBenchCase extends TestCase {
inMap.put("doubleProperty",
Double.valueOf(inBean.getDoubleProperty()));
inMap.put("floatProperty", new Float(inBean.getFloatProperty()));
inMap.put("intProperty", Integer.valueOf(inBean.getIntProperty()));
- inMap.put("longProperty", new Long(inBean.getLongProperty()));
+ inMap.put("longProperty", Long.valueOf(inBean.getLongProperty()));
inMap.put("shortProperty", new Short(inBean.getShortProperty()));
inMap.put("stringProperty", inBean.getStringProperty());
inDyna = dynaClass.newInstance();
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
index 817b5ed1..e184f9ef 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
@@ -185,7 +185,7 @@ public class BeanUtilsTestCase extends TestCase {
new String[] { "New 0", "New 1", "New 2" });
orig.set("intArray", new int[] { 100, 200, 300 });
orig.set("intProperty", Integer.valueOf(333));
- orig.set("longProperty", new Long(3333));
+ orig.set("longProperty", Long.valueOf(3333));
orig.set("shortProperty", new Short((short) 33));
orig.set("stringArray", new String[] { "New 0", "New 1" });
orig.set("stringProperty", "Custom string");
@@ -899,7 +899,7 @@ public class BeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "byteProperty", Integer.valueOf(123));
assertEquals((byte) 123, bean.getByteProperty());
- BeanUtils.setProperty(bean, "byteProperty", new Long(123));
+ BeanUtils.setProperty(bean, "byteProperty", Long.valueOf(123));
assertEquals((byte) 123, bean.getByteProperty());
BeanUtils.setProperty(bean, "byteProperty", new Short((short) 123));
assertEquals((byte) 123, bean.getByteProperty());
@@ -982,7 +982,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.setProperty(bean, "doubleProperty", Integer.valueOf(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
- BeanUtils.setProperty(bean, "doubleProperty", new Long(123));
+ BeanUtils.setProperty(bean, "doubleProperty", Long.valueOf(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.setProperty(bean, "doubleProperty", new Short((short) 123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
@@ -1002,7 +1002,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.setProperty(bean, "floatProperty", Integer.valueOf(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
- BeanUtils.setProperty(bean, "floatProperty", new Long(123));
+ BeanUtils.setProperty(bean, "floatProperty", Long.valueOf(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.setProperty(bean, "floatProperty", new Short((short) 123));
assertEquals(123, bean.getFloatProperty(), 0.005);
@@ -1024,7 +1024,7 @@ public class BeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getIntProperty());
- BeanUtils.setProperty(bean, "longProperty", new Long(123));
+ BeanUtils.setProperty(bean, "longProperty", Long.valueOf(123));
assertEquals(123, bean.getIntProperty());
BeanUtils.setProperty(bean, "longProperty", new Short((short) 123));
assertEquals(123, bean.getIntProperty());
@@ -1046,7 +1046,7 @@ public class BeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getLongProperty());
- BeanUtils.setProperty(bean, "longProperty", new Long(123));
+ BeanUtils.setProperty(bean, "longProperty", Long.valueOf(123));
assertEquals(123, bean.getLongProperty());
BeanUtils.setProperty(bean, "longProperty", new Short((short) 123));
assertEquals(123, bean.getLongProperty());
@@ -1079,7 +1079,7 @@ public class BeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "shortProperty", Integer.valueOf(123));
assertEquals((short) 123, bean.getShortProperty());
- BeanUtils.setProperty(bean, "shortProperty", new Long(123));
+ BeanUtils.setProperty(bean, "shortProperty", Long.valueOf(123));
assertEquals((short) 123, bean.getShortProperty());
BeanUtils.setProperty(bean, "shortProperty", new Short((short) 123));
assertEquals((short) 123, bean.getShortProperty());
@@ -1120,7 +1120,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals((byte) 123, bean.getByteProperty());
BeanUtils.copyProperty(bean, "byteProperty", Integer.valueOf(123));
assertEquals((byte) 123, bean.getByteProperty());
- BeanUtils.copyProperty(bean, "byteProperty", new Long(123));
+ BeanUtils.copyProperty(bean, "byteProperty", Long.valueOf(123));
assertEquals((byte) 123, bean.getByteProperty());
BeanUtils.copyProperty(bean, "byteProperty", new Short((short) 123));
assertEquals((byte) 123, bean.getByteProperty());
@@ -1203,7 +1203,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.copyProperty(bean, "doubleProperty", Integer.valueOf(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
- BeanUtils.copyProperty(bean, "doubleProperty", new Long(123));
+ BeanUtils.copyProperty(bean, "doubleProperty", Long.valueOf(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.copyProperty(bean, "doubleProperty", new Short((short) 123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
@@ -1223,7 +1223,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.copyProperty(bean, "floatProperty", Integer.valueOf(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
- BeanUtils.copyProperty(bean, "floatProperty", new Long(123));
+ BeanUtils.copyProperty(bean, "floatProperty", Long.valueOf(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.copyProperty(bean, "floatProperty", new Short((short) 123));
assertEquals(123, bean.getFloatProperty(), 0.005);
@@ -1243,7 +1243,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getIntProperty());
BeanUtils.copyProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getIntProperty());
- BeanUtils.copyProperty(bean, "longProperty", new Long(123));
+ BeanUtils.copyProperty(bean, "longProperty", Long.valueOf(123));
assertEquals(123, bean.getIntProperty());
BeanUtils.copyProperty(bean, "longProperty", new Short((short) 123));
assertEquals(123, bean.getIntProperty());
@@ -1263,7 +1263,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getLongProperty());
BeanUtils.copyProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getLongProperty());
- BeanUtils.copyProperty(bean, "longProperty", new Long(123));
+ BeanUtils.copyProperty(bean, "longProperty", Long.valueOf(123));
assertEquals(123, bean.getLongProperty());
BeanUtils.copyProperty(bean, "longProperty", new Short((short) 123));
assertEquals(123, bean.getLongProperty());
@@ -1283,7 +1283,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals((short) 123, bean.getShortProperty());
BeanUtils.copyProperty(bean, "shortProperty", Integer.valueOf(123));
assertEquals((short) 123, bean.getShortProperty());
- BeanUtils.copyProperty(bean, "shortProperty", new Long(123));
+ BeanUtils.copyProperty(bean, "shortProperty", Long.valueOf(123));
assertEquals((short) 123, bean.getShortProperty());
BeanUtils.copyProperty(bean, "shortProperty", new Short((short) 123));
assertEquals((short) 123, bean.getShortProperty());
@@ -1314,7 +1314,7 @@ public class BeanUtilsTestCase extends TestCase {
checkIntArray(bean.getNested().getIntArray(), intChanged);
// Narrowing conversion required
- BeanUtils.copyProperty(bean, "nested.intArray[1]", new Long(3));
+ BeanUtils.copyProperty(bean, "nested.intArray[1]", Long.valueOf(3));
checkIntArray(bean.getIntArray(), origArray);
intChanged[1] = 3;
checkIntArray(bean.getNested().getIntArray(), intChanged);
@@ -1370,7 +1370,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(2, bean.getNested().getIntProperty());
// Narrowing conversion required
- BeanUtils.copyProperty(bean, "nested.intProperty", new Long(3));
+ BeanUtils.copyProperty(bean, "nested.intProperty", Long.valueOf(3));
assertNotNull(bean.getNested());
assertEquals(0, bean.getIntProperty());
assertEquals(3, bean.getNested().getIntProperty());
diff --git
a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
index 4e869508..ac5fca75 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
@@ -121,7 +121,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
listIndexed.add("String 3");
listIndexed.add("String 4");
bean.set("listIndexed", listIndexed);
- bean.set("longProperty", new Long(321));
+ bean.set("longProperty", Long.valueOf(321));
final HashMap<String, Object> mapProperty = new HashMap<>();
mapProperty.put("First Key", "First Value");
mapProperty.put("Second Key", "Second Value");
@@ -189,7 +189,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
orig.set("dupProperty", new String[] { "New 0", "New 1", "New 2" });
orig.set("intArray", new int[] { 100, 200, 300 });
orig.set("intProperty", Integer.valueOf(333));
- orig.set("longProperty", new Long(3333));
+ orig.set("longProperty", Long.valueOf(3333));
orig.set("shortProperty", new Short((short) 33));
orig.set("stringArray", new String[] { "New 0", "New 1" });
orig.set("stringProperty", "Custom string");
@@ -266,7 +266,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
orig.set("dupProperty", new String[] { "New 0", "New 1", "New 2" });
orig.set("intArray", new int[] { 100, 200, 300 });
orig.set("intProperty", Integer.valueOf(333));
- orig.set("longProperty", new Long(3333));
+ orig.set("longProperty", Long.valueOf(3333));
orig.set("shortProperty", new Short((short) 33));
orig.set("stringArray", new String[] { "New 0", "New 1" });
orig.set("stringProperty", "Custom string");
@@ -489,7 +489,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
Integer.valueOf(123),
map.get("intProperty"));
assertEquals("Value of 'longProperty'",
- new Long(321),
+ Long.valueOf(321),
map.get("longProperty"));
assertEquals("Value of 'shortProperty'",
new Short((short) 987),
@@ -939,7 +939,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "byteProperty", Integer.valueOf(123));
assertEquals((byte) 123, ((Byte)
bean.get("byteProperty")).byteValue());
- BeanUtils.setProperty(bean, "byteProperty", new Long(123));
+ BeanUtils.setProperty(bean, "byteProperty", Long.valueOf(123));
assertEquals((byte) 123, ((Byte)
bean.get("byteProperty")).byteValue());
BeanUtils.setProperty(bean, "byteProperty", new Short((short) 123));
assertEquals((byte) 123, ((Byte)
bean.get("byteProperty")).byteValue());
@@ -959,7 +959,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(),
0.005);
BeanUtils.setProperty(bean, "doubleProperty", Integer.valueOf(123));
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(),
0.005);
- BeanUtils.setProperty(bean, "doubleProperty", new Long(123));
+ BeanUtils.setProperty(bean, "doubleProperty", Long.valueOf(123));
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(),
0.005);
BeanUtils.setProperty(bean, "doubleProperty", new Short((short) 123));
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(),
0.005);
@@ -979,7 +979,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(),
0.005);
BeanUtils.setProperty(bean, "floatProperty", Integer.valueOf(123));
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(),
0.005);
- BeanUtils.setProperty(bean, "floatProperty", new Long(123));
+ BeanUtils.setProperty(bean, "floatProperty", Long.valueOf(123));
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(),
0.005);
BeanUtils.setProperty(bean, "floatProperty", new Short((short) 123));
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(),
0.005);
@@ -1001,7 +1001,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, ((Integer) bean.get("intProperty")).intValue());
- BeanUtils.setProperty(bean, "longProperty", new Long(123));
+ BeanUtils.setProperty(bean, "longProperty", Long.valueOf(123));
assertEquals(123, ((Integer) bean.get("intProperty")).intValue());
BeanUtils.setProperty(bean, "longProperty", new Short((short) 123));
assertEquals(123, ((Integer) bean.get("intProperty")).intValue());
@@ -1023,7 +1023,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, ((Long) bean.get("longProperty")).longValue());
- BeanUtils.setProperty(bean, "longProperty", new Long(123));
+ BeanUtils.setProperty(bean, "longProperty", Long.valueOf(123));
assertEquals(123, ((Long) bean.get("longProperty")).longValue());
BeanUtils.setProperty(bean, "longProperty", new Short((short) 123));
assertEquals(123, ((Long) bean.get("longProperty")).longValue());
@@ -1056,7 +1056,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
BeanUtils.setProperty(bean, "shortProperty", Integer.valueOf(123));
assertEquals((short) 123, ((Short)
bean.get("shortProperty")).shortValue());
- BeanUtils.setProperty(bean, "shortProperty", new Long(123));
+ BeanUtils.setProperty(bean, "shortProperty", Long.valueOf(123));
assertEquals((short) 123, ((Short)
bean.get("shortProperty")).shortValue());
BeanUtils.setProperty(bean, "shortProperty", new Short((short) 123));
assertEquals((short) 123, ((Short)
bean.get("shortProperty")).shortValue());
@@ -1089,7 +1089,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
intChanged);
// Narrowing conversion required
- BeanUtils.copyProperty(bean, "nested.intArray[1]", new Long(3));
+ BeanUtils.copyProperty(bean, "nested.intArray[1]", Long.valueOf(3));
checkIntArray((int[]) bean.get("intArray"), origArray);
intChanged[1] = 3;
checkIntArray(((TestBean) bean.get("nested")).getIntArray(),
@@ -1145,7 +1145,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
assertEquals(2, nested.getIntProperty());
// Narrowing conversion required
- BeanUtils.copyProperty(bean, "nested.intProperty", new Long(3));
+ BeanUtils.copyProperty(bean, "nested.intProperty", Long.valueOf(3));
assertEquals(0, ((Integer) bean.get("intProperty")).intValue());
assertEquals(3, nested.getIntProperty());
diff --git
a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
index b7796d6b..fe456cfc 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
@@ -113,7 +113,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
listIndexed.add("String 3");
listIndexed.add("String 4");
bean.set("listIndexed", listIndexed);
- bean.set("longProperty", new Long(321));
+ bean.set("longProperty", Long.valueOf(321));
final HashMap<String, Object> mapProperty = new HashMap<>();
mapProperty.put("First Key", "First Value");
mapProperty.put("Second Key", "Second Value");
@@ -178,7 +178,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
map.put("floatProperty", new Float((float) 222.0));
map.put("intArray", new int[] { 0, 100, 200 });
map.put("intProperty", Integer.valueOf(111));
- map.put("longProperty", new Long(444));
+ map.put("longProperty", Long.valueOf(444));
map.put("shortProperty", new Short((short) 555));
map.put("stringProperty", "New String Property");
@@ -252,7 +252,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
assertEquals("Value of 'intProperty'",
Integer.valueOf(123), map.get("intProperty"));
assertEquals("Value of 'longProperty'",
- new Long(321), map.get("longProperty"));
+ Long.valueOf(321), map.get("longProperty"));
assertEquals("Value of 'shortProperty'",
new Short((short) 987), map.get("shortProperty"));
assertEquals("Value of 'stringProperty'",
@@ -2107,7 +2107,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
final long newValue = oldValue + 1;
PropertyUtils.setNestedProperty(bean,
"nested.longProperty",
- new Long(newValue));
+ Long.valueOf(newValue));
assertEquals("Matched new value",
newValue,
nested.getLongProperty());
@@ -2412,7 +2412,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
final long newValue = oldValue + 1;
PropertyUtils.setSimpleProperty(bean,
"longProperty",
- new Long(newValue));
+ Long.valueOf(newValue));
assertEquals("Matched new value",
newValue,
((Long) bean.get("longProperty")).longValue());
diff --git
a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
index 319d8406..41338057 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
@@ -89,7 +89,7 @@ public class MappedPropertyTestBean {
}
public Long getDifferentTypes(final String key) {
- return new Long(((Number)map.get(key)).longValue());
+ return Long.valueOf(((Number)map.get(key)).longValue());
}
public void setDifferentTypes(final String key, final Integer value) {
map.put(key, value);
diff --git
a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
index 71be7b29..7a817ff5 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
@@ -100,7 +100,7 @@ public class PropertyUtilsBenchCase extends TestCase {
inMap.put("doubleProperty",
Double.valueOf(inBean.getDoubleProperty()));
inMap.put("floatProperty", new Float(inBean.getFloatProperty()));
inMap.put("intProperty", Integer.valueOf(inBean.getIntProperty()));
- inMap.put("longProperty", new Long(inBean.getLongProperty()));
+ inMap.put("longProperty", Long.valueOf(inBean.getLongProperty()));
inMap.put("shortProperty", new Short(inBean.getShortProperty()));
inMap.put("stringProperty", inBean.getStringProperty());
inDyna = dynaClass.newInstance();
diff --git
a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
index dcc59e36..bb947014 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
@@ -241,7 +241,7 @@ public class PropertyUtilsTestCase extends TestCase {
map.put("floatProperty", new Float((float) 222.0));
map.put("intArray", new int[] { 0, 100, 200 });
map.put("intProperty", Integer.valueOf(111));
- map.put("longProperty", new Long(444));
+ map.put("longProperty", Long.valueOf(444));
map.put("shortProperty", new Short((short) 555));
map.put("stringProperty", "New String Property");
@@ -313,7 +313,7 @@ public class PropertyUtilsTestCase extends TestCase {
assertEquals("Value of 'intProperty'",
Integer.valueOf(123), map.get("intProperty"));
assertEquals("Value of 'longProperty'",
- new Long(321), map.get("longProperty"));
+ Long.valueOf(321), map.get("longProperty"));
assertEquals("Value of 'shortProperty'",
new Short((short) 987), map.get("shortProperty"));
assertEquals("Value of 'stringProperty'",
@@ -3349,7 +3349,7 @@ public class PropertyUtilsTestCase extends TestCase {
final long newValue = oldValue + 1;
PropertyUtils.setNestedProperty(bean,
"nested.longProperty",
- new Long(newValue));
+ Long.valueOf(newValue));
assertEquals("Matched new value",
newValue,
bean.getNested().getLongProperty());
@@ -3654,7 +3654,7 @@ public class PropertyUtilsTestCase extends TestCase {
final long newValue = oldValue + 1;
PropertyUtils.setSimpleProperty(bean,
"longProperty",
- new Long(newValue));
+ Long.valueOf(newValue));
assertEquals("Matched new value",
newValue,
bean.getLongProperty());
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
index 8f83283f..2b90ee32 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
@@ -181,7 +181,7 @@ public class TestResultSet implements InvocationHandler {
return Integer.valueOf(100 + row);
}
if ("longProperty".equals(columnName)) {
- return new Long(200 + row);
+ return Long.valueOf(200 + row);
}
if ("nullProperty".equals(columnName)) {
return null;
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 414ab06e..66654b1d 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
@@ -99,7 +99,7 @@ public class ArrayConverterTestCase extends TestCase {
final String stringB = intArray[0]+ ";" + intArray[1] + ";" +
intArray[2] + ";" +intArray[3];
final String[] strArray = new String[] {""+intArray[0],
""+intArray[1], ""+intArray[2], ""+intArray[3]};
final long[] longArray = new long[] {intArray[0], intArray[1],
intArray[2], intArray[3]};
- final Long[] LONGArray = new Long[] {new Long(intArray[0]),
new Long(intArray[1]), new Long(intArray[2]), new Long(intArray[3])};
+ final Long[] LONGArray = new Long[]
{Long.valueOf(intArray[0]), Long.valueOf(intArray[1]),
Long.valueOf(intArray[2]), Long.valueOf(intArray[3])};
final Integer[] IntegerArray = new Integer[]
{Integer.valueOf(intArray[0]), Integer.valueOf(intArray[1]),
Integer.valueOf(intArray[2]), Integer.valueOf(intArray[3])};
final ArrayList<String> strList = new ArrayList<>();
final ArrayList<Long> longList = new ArrayList<>();
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
index 063e2ee8..10911991 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
@@ -103,7 +103,7 @@ public class BigDecimalConverterTestCase extends
NumberConverterTestBase<BigDeci
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float("11.1"),
Double.valueOf("12.2"),
new BigDecimal("3200.11"),
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
index 3fd9e29d..4d4ba2a3 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
@@ -95,7 +95,7 @@ public class BigIntegerConverterTestCase extends
NumberConverterTestBase<BigInte
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2)
};
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
index f356c2d8..fa8a6eed 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
@@ -72,10 +72,10 @@ public class ByteConverterTestCase extends
NumberConverterTestBase<Byte> {
final Converter converter = makeConverter();
final Class<?> clazz = Byte.class;
- final Long min = new Long(Byte.MIN_VALUE);
- final Long max = new Long(Byte.MAX_VALUE);
- final Long minMinusOne = new Long(min.longValue() - 1);
- final Long maxPlusOne = new Long(max.longValue() + 1);
+ final Long min = Long.valueOf(Byte.MIN_VALUE);
+ final Long max = Long.valueOf(Byte.MAX_VALUE);
+ final Long minMinusOne = Long.valueOf(min.longValue() - 1);
+ final Long maxPlusOne = Long.valueOf(max.longValue() + 1);
// Minimum
assertEquals("Minimum", new Byte(Byte.MIN_VALUE),
converter.convert(clazz, min));
@@ -128,7 +128,7 @@ public class ByteConverterTestCase extends
NumberConverterTestBase<Byte> {
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2)
};
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
index 50724ff1..4f09a418 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
@@ -93,7 +93,7 @@ public class DoubleConverterTestCase extends
NumberConverterTestBase<Double> {
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2)
};
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
index 4e40e749..afb6b017 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
@@ -115,7 +115,7 @@ public class FloatConverterTestCase extends
NumberConverterTestBase<Float> {
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2),
};
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
index 6d353958..bef765a9 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
@@ -75,10 +75,10 @@ public class IntegerConverterTestCase extends
NumberConverterTestBase<Integer> {
final Converter converter = makeConverter();
final Class<?> clazz = Integer.class;
- final Long min = new Long(Integer.MIN_VALUE);
- final Long max = new Long(Integer.MAX_VALUE);
- final Long minMinusOne = new Long(min.longValue() - 1);
- final Long maxPlusOne = new Long(max.longValue() + 1);
+ final Long min = Long.valueOf(Integer.MIN_VALUE);
+ final Long max = Long.valueOf(Integer.MAX_VALUE);
+ final Long minMinusOne = Long.valueOf(min.longValue() - 1);
+ final Long maxPlusOne = Long.valueOf(max.longValue() + 1);
// Minimum
assertEquals("Minimum", Integer.valueOf(Integer.MIN_VALUE),
converter.convert(clazz, min));
@@ -144,7 +144,7 @@ public class IntegerConverterTestCase extends
NumberConverterTestBase<Integer> {
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2)
};
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
index 2ac7598a..7e5b72a4 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
@@ -54,10 +54,10 @@ public class LongConverterTestCase extends
NumberConverterTestBase<Long> {
@Override
public void setUp() throws Exception {
converter = makeConverter();
- numbers[0] = new Long("-12");
- numbers[1] = new Long("13");
- numbers[2] = new Long("-22");
- numbers[3] = new Long("23");
+ numbers[0] = Long.valueOf("-12");
+ numbers[1] = Long.valueOf("13");
+ numbers[2] = Long.valueOf("-22");
+ numbers[3] = Long.valueOf("23");
}
@Override
@@ -93,25 +93,25 @@ public class LongConverterTestCase extends
NumberConverterTestBase<Long> {
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2)
};
final Long[] expected = {
- new Long(Long.MIN_VALUE),
- new Long(-17),
- new Long(-1),
- new Long(0),
- new Long(1),
- new Long(17),
- new Long(Long.MAX_VALUE),
- new Long(7),
- new Long(8),
- new Long(9),
- new Long(10),
- new Long(11),
- new Long(12)
+ Long.valueOf(Long.MIN_VALUE),
+ Long.valueOf(-17),
+ Long.valueOf(-1),
+ Long.valueOf(0),
+ Long.valueOf(1),
+ Long.valueOf(17),
+ Long.valueOf(Long.MAX_VALUE),
+ Long.valueOf(7),
+ Long.valueOf(8),
+ Long.valueOf(9),
+ Long.valueOf(10),
+ Long.valueOf(11),
+ Long.valueOf(12)
};
for(int i=0;i<expected.length;i++) {
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
b/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
index 4f940380..4a169afb 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
@@ -64,7 +64,7 @@ public abstract class NumberConverterTestBase<T extends
Number> extends TestCase
final long longValue = calendarValue.getTime().getTime();
// Calendar --> Long conversion
- assertEquals("Calendar to Long", new Long(longValue),
converter.convert(Long.class, calendarValue));
+ assertEquals("Calendar to Long", Long.valueOf(longValue),
converter.convert(Long.class, calendarValue));
// Calendar --> Integer
try {
@@ -108,7 +108,7 @@ public abstract class NumberConverterTestBase<T extends
Number> extends TestCase
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2),
new BigDecimal("17.2"),
@@ -135,7 +135,7 @@ public abstract class NumberConverterTestBase<T extends
Number> extends TestCase
final long longValue = dateValue.getTime();
// Date --> Long conversion
- assertEquals("Date to Long", new Long(longValue),
converter.convert(Long.class, dateValue));
+ assertEquals("Date to Long", Long.valueOf(longValue),
converter.convert(Long.class, dateValue));
// Date --> Integer
try {
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
index ba152e8c..961b74d0 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
@@ -72,10 +72,10 @@ public class ShortConverterTestCase extends
NumberConverterTestBase<Short> {
final Converter converter = makeConverter();
final Class<?> clazz = Short.class;
- final Long min = new Long(Short.MIN_VALUE);
- final Long max = new Long(Short.MAX_VALUE);
- final Long minMinusOne = new Long(min.longValue() - 1);
- final Long maxPlusOne = new Long(max.longValue() + 1);
+ final Long min = Long.valueOf(Short.MIN_VALUE);
+ final Long max = Long.valueOf(Short.MAX_VALUE);
+ final Long minMinusOne = Long.valueOf(min.longValue() - 1);
+ final Long maxPlusOne = Long.valueOf(max.longValue() + 1);
// Minimum
assertEquals("Minimum", new Short(Short.MIN_VALUE),
converter.convert(clazz, min));
@@ -128,7 +128,7 @@ public class ShortConverterTestCase extends
NumberConverterTestBase<Short> {
new Byte((byte)7),
new Short((short)8),
Integer.valueOf(9),
- new Long(10),
+ Long.valueOf(10),
new Float(11.1),
Double.valueOf(12.2)
};
diff --git
a/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
index f3de3874..f3e786c3 100644
---
a/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
@@ -224,7 +224,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
final Integer value = Integer.valueOf(1234);
assertEquals("Convert Integer", value, converter.convert(value));
- assertEquals("Convert Long", value, converter.convert(new
Long(value.intValue())));
+ assertEquals("Convert Long", value,
converter.convert(Long.valueOf(value.intValue())));
}
/**
diff --git
a/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
index 70648b28..e5b95d94 100644
---
a/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
@@ -40,8 +40,8 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
super.setUp();
- defaultValue = new Long("999");
- expectedValue = new Long(expectedIntegerValue);
+ defaultValue = Long.valueOf("999");
+ expectedValue = Long.valueOf(expectedIntegerValue);
}
@@ -77,7 +77,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
// quite happily turning "1,234" into "1"
// I guess this is one of the limitations of DecimalFormat
//
**************************************************************************
- convertValueNoPattern(converter, "(B)", defaultIntegerValue, new
Long("1"));
+ convertValueNoPattern(converter, "(B)", defaultIntegerValue,
Long.valueOf("1"));
//
**************************************************************************
// Convert with non-localized pattern - unlike the equivalent
BigDecimal Test Case
@@ -85,7 +85,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
// quite happily turning "1,234" into "1"
// Again this is one of the limitations of DecimalFormat
//
**************************************************************************
- convertValueWithPattern(converter, "(B)", localizedIntegerValue,
defaultIntegerPattern, new Long("1"));
+ convertValueWithPattern(converter, "(B)", localizedIntegerValue,
defaultIntegerPattern, Long.valueOf("1"));
//
**************************************************************************
// Convert with specified type
