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/01/08 14:47:44 UTC
[commons-beanutils] branch master updated: Use Integer cache
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 994578bf Use Integer cache
994578bf is described below
commit 994578bfdac00c5b393c3eaf6d90c27afc64dc90
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 8 09:47:39 2023 -0500
Use Integer cache
---
.../apache/commons/beanutils2/LazyDynaBean.java | 4 +-
.../commons/beanutils2/BasicDynaBeanTestCase.java | 14 +++---
.../apache/commons/beanutils2/BeanMapTestCase.java | 8 ++--
.../BeanPropertyValueChangeConsumerTestCase.java | 2 +-
.../BeanPropertyValueEqualsPredicateTestCase.java | 2 +-
.../BeanToPropertyValueTransformerTestCase.java | 2 +-
.../commons/beanutils2/BeanUtilsBenchCase.java | 2 +-
.../commons/beanutils2/BeanUtilsTestCase.java | 38 ++++++++--------
.../beanutils2/DynaBeanMapDecoratorTestCase.java | 2 +-
.../commons/beanutils2/DynaBeanUtilsTestCase.java | 34 +++++++--------
.../beanutils2/DynaPropertyUtilsTestCase.java | 50 +++++++++++-----------
.../commons/beanutils2/LazyDynaMapTestCase.java | 26 +++++------
.../commons/beanutils2/MappedPropertyTestBean.java | 2 +-
.../commons/beanutils2/MethodUtilsTestCase.java | 10 ++---
.../commons/beanutils2/PropertyUtilsBenchCase.java | 2 +-
.../commons/beanutils2/PropertyUtilsTestCase.java | 50 +++++++++++-----------
.../apache/commons/beanutils2/TestResultSet.java | 2 +-
.../commons/beanutils2/TestResultSetMetaData.java | 4 +-
.../commons/beanutils2/WrapDynaBeanTestCase.java | 4 +-
.../converters/ArrayConverterTestCase.java | 6 +--
.../converters/BigDecimalConverterTestCase.java | 2 +-
.../converters/BigIntegerConverterTestCase.java | 2 +-
.../converters/ByteConverterTestCase.java | 2 +-
.../converters/CharacterConverterTestCase.java | 4 +-
.../converters/ClassConverterTestCase.java | 6 +--
.../converters/DoubleConverterTestCase.java | 2 +-
.../converters/FloatConverterTestCase.java | 2 +-
.../converters/IntegerConverterTestCase.java | 40 ++++++++---------
.../converters/LongConverterTestCase.java | 2 +-
.../converters/NumberConverterTestBase.java | 10 ++---
.../converters/ShortConverterTestCase.java | 2 +-
.../converters/SqlDateConverterTestCase.java | 2 +-
.../converters/SqlTimeConverterTestCase.java | 2 +-
.../converters/SqlTimestampConverterTestCase.java | 2 +-
.../locale/LocaleConvertUtilsTestCase.java | 4 +-
.../converters/IntegerLocaleConverterTestCase.java | 10 ++---
36 files changed, 179 insertions(+), 179 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index e6c905e2..887fdb0a 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -84,8 +84,8 @@ import org.apache.commons.logging.LogFactory;
* DynaBean myBean = new LazyDynaBean();
* MutableDynaClass myClass = (MutableDynaClass)myBean.getDynaClass();
* myClass.add("myIndexedProperty", int[].class);
- * myBean.set("myIndexedProperty", 0, new Integer(10));
- * myBean.set("myIndexedProperty", 1, new Integer(20));
+ * myBean.set("myIndexedProperty", 0, Integer.valueOf(10));
+ * myBean.set("myIndexedProperty", 1, Integer.valueOf(20));
* </code></pre>
*
* <p><b><u>Setting Mapped Properties</u></b></p>
diff --git a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
index a51f0792..3d146907 100644
--- a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
@@ -104,7 +104,7 @@ public class BasicDynaBeanTestCase extends TestCase {
bean.set("intArray", intArray);
final int[] intIndexed = { 0, 10, 20, 30, 40 };
bean.set("intIndexed", intIndexed);
- bean.set("intProperty", new Integer(123));
+ bean.set("intProperty", Integer.valueOf(123));
final List<String> listIndexed = new ArrayList<>();
listIndexed.add("String 0");
listIndexed.add("String 1");
@@ -118,8 +118,8 @@ public class BasicDynaBeanTestCase extends TestCase {
mappedProperty.put("Second Key", "Second Value");
bean.set("mappedProperty", mappedProperty);
final HashMap<String, Integer> mappedIntProperty = new HashMap<>();
- mappedIntProperty.put("One", new Integer(1));
- mappedIntProperty.put("Two", new Integer(2));
+ mappedIntProperty.put("One", Integer.valueOf(1));
+ mappedIntProperty.put("Two", Integer.valueOf(2));
bean.set("mappedIntProperty", mappedIntProperty);
// Property "nullProperty" is not initialized, so it should return null
bean.set("shortProperty", new Short((short) 987));
@@ -676,7 +676,7 @@ public class BasicDynaBeanTestCase extends TestCase {
public void testSetIndexedArguments() {
try {
- bean.set("intArray", -1, new Integer(0));
+ bean.set("intArray", -1, Integer.valueOf(0));
fail("Should throw IndexOutOfBoundsException");
} catch (final IndexOutOfBoundsException e) {
// Expected response
@@ -694,7 +694,7 @@ public class BasicDynaBeanTestCase extends TestCase {
Object value = null;
try {
- bean.set("intArray", 0, new Integer(1));
+ bean.set("intArray", 0, Integer.valueOf(1));
value = bean.get("intArray", 0);
assertNotNull("Returned new value 0", value);
assertTrue("Returned Integer new value 0",
@@ -706,7 +706,7 @@ public class BasicDynaBeanTestCase extends TestCase {
}
try {
- bean.set("intIndexed", 1, new Integer(11));
+ bean.set("intIndexed", 1, Integer.valueOf(11));
value = bean.get("intIndexed", 1);
assertNotNull("Returned new value 1", value);
assertTrue("Returned Integer new value 1",
@@ -848,7 +848,7 @@ public class BasicDynaBeanTestCase extends TestCase {
final int oldValue =
((Integer) bean.get("intProperty")).intValue();
final int newValue = oldValue + 1;
- bean.set("intProperty", new Integer(newValue));
+ bean.set("intProperty", Integer.valueOf(newValue));
assertEquals("Matched new value",
newValue,
((Integer) bean.get("intProperty")).intValue());
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
index d91ddbc8..076c9f4c 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
@@ -280,7 +280,7 @@ public class BeanMapTestCase extends AbstractTestMap {
bean.setSomeShortValue((short)134);
bean.setSomeByteValue((byte)10);
bean.setSomeCharValue('a');
- bean.setSomeIntegerValue(new Integer(1432));
+ bean.setSomeIntegerValue(Integer.valueOf(1432));
bean.setSomeStringValue("SomeStringValue");
bean.setSomeObjectValue(objectInFullMap);
return new BeanMap(bean);
@@ -352,9 +352,9 @@ public class BeanMapTestCase extends AbstractTestMap {
public void testBeanMapPutAllWriteable() {
final BeanMap map1 = (BeanMap)makeFullMap();
final BeanMap map2 = (BeanMap)makeFullMap();
- map2.put("someIntValue", new Integer(0));
+ map2.put("someIntValue", Integer.valueOf(0));
map1.putAllWriteable(map2);
- assertEquals(map1.get("someIntValue"), new Integer(0));
+ assertEquals(map1.get("someIntValue"), Integer.valueOf(0));
}
public void testMethodAccessor() throws Exception {
@@ -378,7 +378,7 @@ public class BeanMapTestCase extends AbstractTestMap {
assertEquals("Character.TYPE", new Character('B'), beanMap.getTypeTransformer(Character.TYPE).apply("BCD"));
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", new Integer(3), beanMap.getTypeTransformer(Integer.TYPE).apply("3"));
+ 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("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/BeanPropertyValueChangeConsumerTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumerTestCase.java
index 28d1021f..71c3e5fd 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumerTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumerTestCase.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
*/
public class BeanPropertyValueChangeConsumerTestCase extends TestCase {
- private static final Integer expectedIntegerValue = new Integer(123);
+ private static final Integer expectedIntegerValue = Integer.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/BeanPropertyValueEqualsPredicateTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java
index ca727d67..4b41cf28 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicateTestCase.java
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
*/
public class BeanPropertyValueEqualsPredicateTestCase extends TestCase {
- private static final Integer expectedIntegerValue = new Integer(123);
+ private static final Integer expectedIntegerValue = Integer.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/BeanToPropertyValueTransformerTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
index 574c03b9..118025b7 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformerTestCase.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
*/
public class BeanToPropertyValueTransformerTestCase extends TestCase {
- private static final Integer expectedIntegerValue = new Integer(123);
+ private static final Integer expectedIntegerValue = Integer.valueOf(123);
private static final Long expectedLongValue = new Long(123);
private static final Float expectedFloatValue = new Float(123.123f);
private static final Double expectedDoubleValue = Double.valueOf(567879.12344d);
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
index 6035780b..b4b4e9d0 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
@@ -101,7 +101,7 @@ public class BeanUtilsBenchCase extends TestCase {
inMap.put("byteProperty", new Byte(inBean.getByteProperty()));
inMap.put("doubleProperty", Double.valueOf(inBean.getDoubleProperty()));
inMap.put("floatProperty", new Float(inBean.getFloatProperty()));
- inMap.put("intProperty", new Integer(inBean.getIntProperty()));
+ inMap.put("intProperty", Integer.valueOf(inBean.getIntProperty()));
inMap.put("longProperty", new Long(inBean.getLongProperty()));
inMap.put("shortProperty", new Short(inBean.getShortProperty()));
inMap.put("stringProperty", inBean.getStringProperty());
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
index ccf66fb9..817b5ed1 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
@@ -184,7 +184,7 @@ public class BeanUtilsTestCase extends TestCase {
orig.set("dupProperty",
new String[] { "New 0", "New 1", "New 2" });
orig.set("intArray", new int[] { 100, 200, 300 });
- orig.set("intProperty", new Integer(333));
+ orig.set("intProperty", Integer.valueOf(333));
orig.set("longProperty", new Long(3333));
orig.set("shortProperty", new Short((short) 33));
orig.set("stringArray", new String[] { "New 0", "New 1" });
@@ -877,9 +877,9 @@ public class BeanUtilsTestCase extends TestCase {
*/
public void testSetPropertyOnPrimitiveWrappers() throws Exception {
- BeanUtils.setProperty(bean,"intProperty", new Integer(1));
+ BeanUtils.setProperty(bean,"intProperty", Integer.valueOf(1));
assertEquals(1,bean.getIntProperty());
- BeanUtils.setProperty(bean,"stringProperty", new Integer(1));
+ BeanUtils.setProperty(bean,"stringProperty", Integer.valueOf(1));
assertEquals(1, Integer.parseInt(bean.getStringProperty()));
}
@@ -897,7 +897,7 @@ public class BeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "byteProperty", new Float((float) 123));
assertEquals((byte) 123, bean.getByteProperty());
*/
- BeanUtils.setProperty(bean, "byteProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "byteProperty", Integer.valueOf(123));
assertEquals((byte) 123, bean.getByteProperty());
BeanUtils.setProperty(bean, "byteProperty", new Long(123));
assertEquals((byte) 123, bean.getByteProperty());
@@ -980,7 +980,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.setProperty(bean, "doubleProperty", new Float(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
- BeanUtils.setProperty(bean, "doubleProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "doubleProperty", Integer.valueOf(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.setProperty(bean, "doubleProperty", new Long(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
@@ -1000,7 +1000,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.setProperty(bean, "floatProperty", new Float(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
- BeanUtils.setProperty(bean, "floatProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "floatProperty", Integer.valueOf(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.setProperty(bean, "floatProperty", new Long(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
@@ -1022,7 +1022,7 @@ public class BeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "longProperty", new Float((float) 123));
assertEquals((int) 123, bean.getIntProperty());
*/
- BeanUtils.setProperty(bean, "longProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getIntProperty());
BeanUtils.setProperty(bean, "longProperty", new Long(123));
assertEquals(123, bean.getIntProperty());
@@ -1044,7 +1044,7 @@ public class BeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "longProperty", new Float((float) 123));
assertEquals((long) 123, bean.getLongProperty());
*/
- BeanUtils.setProperty(bean, "longProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getLongProperty());
BeanUtils.setProperty(bean, "longProperty", new Long(123));
assertEquals(123, bean.getLongProperty());
@@ -1077,7 +1077,7 @@ public class BeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "shortProperty", new Float((float) 123));
assertEquals((short) 123, bean.getShortProperty());
*/
- BeanUtils.setProperty(bean, "shortProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "shortProperty", Integer.valueOf(123));
assertEquals((short) 123, bean.getShortProperty());
BeanUtils.setProperty(bean, "shortProperty", new Long(123));
assertEquals((short) 123, bean.getShortProperty());
@@ -1118,7 +1118,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals((byte) 123, bean.getByteProperty());
BeanUtils.copyProperty(bean, "byteProperty", new Float(123));
assertEquals((byte) 123, bean.getByteProperty());
- BeanUtils.copyProperty(bean, "byteProperty", new Integer(123));
+ BeanUtils.copyProperty(bean, "byteProperty", Integer.valueOf(123));
assertEquals((byte) 123, bean.getByteProperty());
BeanUtils.copyProperty(bean, "byteProperty", new Long(123));
assertEquals((byte) 123, bean.getByteProperty());
@@ -1201,7 +1201,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.copyProperty(bean, "doubleProperty", new Float(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
- BeanUtils.copyProperty(bean, "doubleProperty", new Integer(123));
+ BeanUtils.copyProperty(bean, "doubleProperty", Integer.valueOf(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
BeanUtils.copyProperty(bean, "doubleProperty", new Long(123));
assertEquals(123, bean.getDoubleProperty(), 0.005);
@@ -1221,7 +1221,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.copyProperty(bean, "floatProperty", new Float(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
- BeanUtils.copyProperty(bean, "floatProperty", new Integer(123));
+ BeanUtils.copyProperty(bean, "floatProperty", Integer.valueOf(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
BeanUtils.copyProperty(bean, "floatProperty", new Long(123));
assertEquals(123, bean.getFloatProperty(), 0.005);
@@ -1241,7 +1241,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getIntProperty());
BeanUtils.copyProperty(bean, "longProperty", new Float(123));
assertEquals(123, bean.getIntProperty());
- BeanUtils.copyProperty(bean, "longProperty", new Integer(123));
+ BeanUtils.copyProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getIntProperty());
BeanUtils.copyProperty(bean, "longProperty", new Long(123));
assertEquals(123, bean.getIntProperty());
@@ -1261,7 +1261,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals(123, bean.getLongProperty());
BeanUtils.copyProperty(bean, "longProperty", new Float(123));
assertEquals(123, bean.getLongProperty());
- BeanUtils.copyProperty(bean, "longProperty", new Integer(123));
+ BeanUtils.copyProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, bean.getLongProperty());
BeanUtils.copyProperty(bean, "longProperty", new Long(123));
assertEquals(123, bean.getLongProperty());
@@ -1281,7 +1281,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals((short) 123, bean.getShortProperty());
BeanUtils.copyProperty(bean, "shortProperty", new Float(123));
assertEquals((short) 123, bean.getShortProperty());
- BeanUtils.copyProperty(bean, "shortProperty", new Integer(123));
+ BeanUtils.copyProperty(bean, "shortProperty", Integer.valueOf(123));
assertEquals((short) 123, bean.getShortProperty());
BeanUtils.copyProperty(bean, "shortProperty", new Long(123));
assertEquals((short) 123, bean.getShortProperty());
@@ -1302,7 +1302,7 @@ public class BeanUtilsTestCase extends TestCase {
final int[] intChanged = { 0, 0, 0 };
// No conversion required
- BeanUtils.copyProperty(bean, "nested.intArray[1]", new Integer(1));
+ BeanUtils.copyProperty(bean, "nested.intArray[1]", Integer.valueOf(1));
checkIntArray(bean.getIntArray(), origArray);
intChanged[1] = 1;
checkIntArray(bean.getNested().getIntArray(), intChanged);
@@ -1358,7 +1358,7 @@ public class BeanUtilsTestCase extends TestCase {
bean.getNested().setIntProperty(0);
// No conversion required
- BeanUtils.copyProperty(bean, "nested.intProperty", new Integer(1));
+ BeanUtils.copyProperty(bean, "nested.intProperty", Integer.valueOf(1));
assertNotNull(bean.getNested());
assertEquals(0, bean.getIntProperty());
assertEquals(1, bean.getNested().getIntProperty());
@@ -1407,7 +1407,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals("New value", bean.getWriteOnlyPropertyValue());
// Integer->String conversion required
- BeanUtils.copyProperty(bean, "writeOnlyProperty", new Integer(123));
+ BeanUtils.copyProperty(bean, "writeOnlyProperty", Integer.valueOf(123));
assertEquals("123", bean.getWriteOnlyPropertyValue());
}
@@ -1425,7 +1425,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals("New value", bean.getWriteOnlyPropertyValue());
// Integer->String conversion required
- BeanUtils.setProperty(bean, "writeOnlyProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "writeOnlyProperty", Integer.valueOf(123));
assertEquals("123", bean.getWriteOnlyPropertyValue());
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
index a154b859..7327956e 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
@@ -46,7 +46,7 @@ public class DynaBeanMapDecoratorTestCase extends TestCase {
private static final DynaClass dynaClass = new BasicDynaClass("testDynaClass", BasicDynaBean.class, properties);
private static final String stringVal = "somevalue";
- private static final Integer intVal = new Integer(5);
+ private static final Integer intVal = Integer.valueOf(5);
private static final Date dateVal = new Date();
private final Map<Object, Object> mapVal = new HashMap<>();
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
index 858b7143..4e869508 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
@@ -113,7 +113,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
bean.set("intArray", intArray);
final int[] intIndexed = { 0, 10, 20, 30, 40 };
bean.set("intIndexed", intIndexed);
- bean.set("intProperty", new Integer(123));
+ bean.set("intProperty", Integer.valueOf(123));
final List<String> listIndexed = new ArrayList<>();
listIndexed.add("String 0");
listIndexed.add("String 1");
@@ -131,8 +131,8 @@ public class DynaBeanUtilsTestCase extends TestCase {
mappedProperty.put("Second Key", "Second Value");
bean.set("mappedProperty", mappedProperty);
final HashMap<String, Integer> mappedIntProperty = new HashMap<>();
- mappedIntProperty.put("One", new Integer(1));
- mappedIntProperty.put("Two", new Integer(2));
+ mappedIntProperty.put("One", Integer.valueOf(1));
+ mappedIntProperty.put("Two", Integer.valueOf(2));
bean.set("mappedIntProperty", mappedIntProperty);
nested = new TestBean();
bean.set("nested", nested);
@@ -188,7 +188,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
orig.set("doubleProperty", Double.valueOf(333.33));
orig.set("dupProperty", new String[] { "New 0", "New 1", "New 2" });
orig.set("intArray", new int[] { 100, 200, 300 });
- orig.set("intProperty", new Integer(333));
+ orig.set("intProperty", Integer.valueOf(333));
orig.set("longProperty", new Long(3333));
orig.set("shortProperty", new Short((short) 33));
orig.set("stringArray", new String[] { "New 0", "New 1" });
@@ -265,7 +265,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
orig.set("doubleProperty", Double.valueOf(333.33));
orig.set("dupProperty", new String[] { "New 0", "New 1", "New 2" });
orig.set("intArray", new int[] { 100, 200, 300 });
- orig.set("intProperty", new Integer(333));
+ orig.set("intProperty", Integer.valueOf(333));
orig.set("longProperty", new Long(3333));
orig.set("shortProperty", new Short((short) 33));
orig.set("stringArray", new String[] { "New 0", "New 1" });
@@ -486,7 +486,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
new Float((float) 123.0),
map.get("floatProperty"));
assertEquals("Value of 'intProperty'",
- new Integer(123),
+ Integer.valueOf(123),
map.get("intProperty"));
assertEquals("Value of 'longProperty'",
new Long(321),
@@ -906,9 +906,9 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
public void testSetPropertyOnPrimitiveWrappers() throws Exception {
- BeanUtils.setProperty(bean,"intProperty", new Integer(1));
+ BeanUtils.setProperty(bean,"intProperty", Integer.valueOf(1));
assertEquals(1,((Integer) bean.get("intProperty")).intValue());
- BeanUtils.setProperty(bean,"stringProperty", new Integer(1));
+ BeanUtils.setProperty(bean,"stringProperty", Integer.valueOf(1));
assertEquals(1, Integer.parseInt((String) bean.get("stringProperty")));
}
@@ -937,7 +937,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "byteProperty", new Float((float) 123));
assertEquals((byte) 123, ((Byte) bean.get("byteProperty")).byteValue());
*/
- BeanUtils.setProperty(bean, "byteProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "byteProperty", Integer.valueOf(123));
assertEquals((byte) 123, ((Byte) bean.get("byteProperty")).byteValue());
BeanUtils.setProperty(bean, "byteProperty", new Long(123));
assertEquals((byte) 123, ((Byte) bean.get("byteProperty")).byteValue());
@@ -957,7 +957,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(), 0.005);
BeanUtils.setProperty(bean, "doubleProperty", new Float(123));
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(), 0.005);
- BeanUtils.setProperty(bean, "doubleProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "doubleProperty", Integer.valueOf(123));
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(), 0.005);
BeanUtils.setProperty(bean, "doubleProperty", new Long(123));
assertEquals(123, ((Double) bean.get("doubleProperty")).doubleValue(), 0.005);
@@ -977,7 +977,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(), 0.005);
BeanUtils.setProperty(bean, "floatProperty", new Float(123));
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(), 0.005);
- BeanUtils.setProperty(bean, "floatProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "floatProperty", Integer.valueOf(123));
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(), 0.005);
BeanUtils.setProperty(bean, "floatProperty", new Long(123));
assertEquals(123, ((Float) bean.get("floatProperty")).floatValue(), 0.005);
@@ -999,7 +999,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "longProperty", new Float((float) 123));
assertEquals((int) 123, ((Integer) bean.get("intProperty")).intValue());
*/
- BeanUtils.setProperty(bean, "longProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, ((Integer) bean.get("intProperty")).intValue());
BeanUtils.setProperty(bean, "longProperty", new Long(123));
assertEquals(123, ((Integer) bean.get("intProperty")).intValue());
@@ -1021,7 +1021,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "longProperty", new Float((float) 123));
assertEquals((long) 123, ((Long) bean.get("longProperty")).longValue());
*/
- BeanUtils.setProperty(bean, "longProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "longProperty", Integer.valueOf(123));
assertEquals(123, ((Long) bean.get("longProperty")).longValue());
BeanUtils.setProperty(bean, "longProperty", new Long(123));
assertEquals(123, ((Long) bean.get("longProperty")).longValue());
@@ -1054,7 +1054,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
BeanUtils.setProperty(bean, "shortProperty", new Float((float) 123));
assertEquals((short) 123, ((Short) bean.get("shortProperty")).shortValue());
*/
- BeanUtils.setProperty(bean, "shortProperty", new Integer(123));
+ BeanUtils.setProperty(bean, "shortProperty", Integer.valueOf(123));
assertEquals((short) 123, ((Short) bean.get("shortProperty")).shortValue());
BeanUtils.setProperty(bean, "shortProperty", new Long(123));
assertEquals((short) 123, ((Short) bean.get("shortProperty")).shortValue());
@@ -1075,7 +1075,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
final int[] intChanged = { 0, 0, 0 };
// No conversion required
- BeanUtils.copyProperty(bean, "nested.intArray[1]", new Integer(1));
+ BeanUtils.copyProperty(bean, "nested.intArray[1]", Integer.valueOf(1));
checkIntArray((int[]) bean.get("intArray"), origArray);
intChanged[1] = 1;
checkIntArray(((TestBean) bean.get("nested")).getIntArray(),
@@ -1131,11 +1131,11 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
public void testCopyPropertyNestedSimple() throws Exception {
- bean.set("intProperty", new Integer(0));
+ bean.set("intProperty", Integer.valueOf(0));
nested.setIntProperty(0);
// No conversion required
- BeanUtils.copyProperty(bean, "nested.intProperty", new Integer(1));
+ BeanUtils.copyProperty(bean, "nested.intProperty", Integer.valueOf(1));
assertEquals(0, ((Integer) bean.get("intProperty")).intValue());
assertEquals(1, 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 be3f342a..b7796d6b 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
@@ -105,7 +105,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
bean.set("intArray", intArray);
final int[] intIndexed = { 0, 10, 20, 30, 40 };
bean.set("intIndexed", intIndexed);
- bean.set("intProperty", new Integer(123));
+ bean.set("intProperty", Integer.valueOf(123));
final List<String> listIndexed = new ArrayList<>();
listIndexed.add("String 0");
listIndexed.add("String 1");
@@ -127,8 +127,8 @@ public class DynaPropertyUtilsTestCase extends TestCase {
mappedProperty.put("Second Key", "Second Value");
bean.set("mappedProperty", mappedProperty);
final HashMap<String, Integer> mappedIntProperty = new HashMap<>();
- mappedIntProperty.put("One", new Integer(1));
- mappedIntProperty.put("Two", new Integer(2));
+ mappedIntProperty.put("One", Integer.valueOf(1));
+ mappedIntProperty.put("Two", Integer.valueOf(2));
bean.set("mappedIntProperty", mappedIntProperty);
nested = new TestBean();
bean.set("nested", nested);
@@ -177,7 +177,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
map.put("dupProperty", new String[] { "New 0", "New 1", "New 2" });
map.put("floatProperty", new Float((float) 222.0));
map.put("intArray", new int[] { 0, 100, 200 });
- map.put("intProperty", new Integer(111));
+ map.put("intProperty", Integer.valueOf(111));
map.put("longProperty", new Long(444));
map.put("shortProperty", new Short((short) 555));
map.put("stringProperty", "New String Property");
@@ -250,7 +250,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
assertEquals("Value of 'floatProperty'",
new Float((float) 123.0), map.get("floatProperty"));
assertEquals("Value of 'intProperty'",
- new Integer(123), map.get("intProperty"));
+ Integer.valueOf(123), map.get("intProperty"));
assertEquals("Value of 'longProperty'",
new Long(321), map.get("longProperty"));
assertEquals("Value of 'shortProperty'",
@@ -1411,7 +1411,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null, "intArray", 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 1");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1421,7 +1421,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, null, 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 2");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1434,7 +1434,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null,
"intArray[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 3");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1444,7 +1444,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw NoSuchMethodException 4");
} catch (final NoSuchMethodException e) {
// Expected response
@@ -1454,7 +1454,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "intArray",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 5");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1466,7 +1466,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null, "intIndexed", 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 1");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1476,7 +1476,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, null, 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 2");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1489,7 +1489,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null,
"intIndexed[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 3");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1499,7 +1499,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw NoSuchMethodException 4");
} catch (final NoSuchMethodException e) {
// Expected response
@@ -1509,7 +1509,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "intIndexed",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 5");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -1531,7 +1531,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray", 0,
- new Integer(1));
+ Integer.valueOf(1));
value =
PropertyUtils.getIndexedProperty(bean,
"intArray", 0);
@@ -1547,7 +1547,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed", 1,
- new Integer(11));
+ Integer.valueOf(11));
value =
PropertyUtils.getIndexedProperty(bean,
"intIndexed", 1);
@@ -1613,7 +1613,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray[4]",
- new Integer(1));
+ Integer.valueOf(1));
value =
PropertyUtils.getIndexedProperty(bean,
"intArray[4]");
@@ -1629,7 +1629,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed[3]",
- new Integer(11));
+ Integer.valueOf(11));
value =
PropertyUtils.getIndexedProperty(bean,
"intIndexed[3]");
@@ -1695,7 +1695,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray", -1,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -1706,7 +1706,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray", 5,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -1717,7 +1717,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed", -1,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -1728,7 +1728,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed", 5,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -2081,7 +2081,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
final int newValue = oldValue + 1;
PropertyUtils.setNestedProperty(bean,
"nested.intProperty",
- new Integer(newValue));
+ Integer.valueOf(newValue));
assertEquals("Matched new value",
newValue,
nested.getIntProperty());
@@ -2386,7 +2386,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
final int newValue = oldValue + 1;
PropertyUtils.setSimpleProperty(bean,
"intProperty",
- new Integer(newValue));
+ Integer.valueOf(newValue));
assertEquals("Matched new value",
newValue,
((Integer) bean.get("intProperty")).intValue());
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
index 7ae2b29e..91d12423 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
@@ -40,8 +40,8 @@ public class LazyDynaMapTestCase extends TestCase {
protected String testPropertyB = "myProperty-B";
protected String testString1 = "myStringValue-1";
protected String testString2 = "myStringValue-2";
- protected Integer testInteger1 = new Integer(30);
- protected Integer testInteger2 = new Integer(40);
+ protected Integer testInteger1 = Integer.valueOf(30);
+ protected Integer testInteger2 = Integer.valueOf(40);
protected String testKey = "myKey";
@@ -247,7 +247,7 @@ public class LazyDynaMapTestCase extends TestCase {
* Test setting mapped property for type which is not Map
*/
public void testMappedInvalidType() {
- dynaMap.set(testProperty, new Integer(1));
+ dynaMap.set(testProperty, Integer.valueOf(1));
assertFalse("Check Property is not mapped", dynaMap.getDynaProperty(testProperty).isMapped());
try {
dynaMap.set(testProperty, testKey, testInteger1);
@@ -274,13 +274,13 @@ public class LazyDynaMapTestCase extends TestCase {
assertNotNull("Check Indexed Property is not null", dynaMap.get(testProperty));
assertEquals("Check Indexed Property is correct type", ArrayList.class, dynaMap.get(testProperty).getClass());
assertEquals("Check First Indexed Value is correct", testInteger1, dynaMap.get(testProperty, index));
- assertEquals("Check First Array length is correct", new Integer(index+1), new Integer(((ArrayList<?>)dynaMap.get(testProperty)).size()));
+ assertEquals("Check First Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((ArrayList<?>)dynaMap.get(testProperty)).size()));
// Set a second indexed value, should automatically grow the ArrayList and set appropriate indexed value
index = index + 2;
dynaMap.set(testProperty, index, testString1);
assertEquals("Check Second Indexed Value is correct", testString1, dynaMap.get(testProperty, index));
- assertEquals("Check Second Array length is correct", new Integer(index+1), new Integer(((ArrayList<?>)dynaMap.get(testProperty)).size()));
+ assertEquals("Check Second Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((ArrayList<?>)dynaMap.get(testProperty)).size()));
}
/**
@@ -304,13 +304,13 @@ public class LazyDynaMapTestCase extends TestCase {
dynaMap.set(testProperty, index, testString1);
assertEquals("Check Property type is correct", LinkedList.class, dynaMap.get(testProperty).getClass());
assertEquals("Check First Indexed Value is correct", testString1, dynaMap.get(testProperty, index));
- assertEquals("Check First Array length is correct", new Integer(index+1), new Integer(((LinkedList<?>)dynaMap.get(testProperty)).size()));
+ assertEquals("Check First Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((LinkedList<?>)dynaMap.get(testProperty)).size()));
// Set a second indexed value, should automatically grow the LinkedList and set appropriate indexed value
index = index + 2;
dynaMap.set(testProperty, index, testInteger1);
assertEquals("Check Second Indexed Value is correct", testInteger1, dynaMap.get(testProperty, index));
- assertEquals("Check Second Array length is correct", new Integer(index+1), new Integer(((LinkedList<?>)dynaMap.get(testProperty)).size()));
+ assertEquals("Check Second Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((LinkedList<?>)dynaMap.get(testProperty)).size()));
}
/**
@@ -335,15 +335,15 @@ public class LazyDynaMapTestCase extends TestCase {
assertNotNull("Check Indexed Property is not null", dynaMap.get(testProperty));
assertEquals("Check Indexed Property is correct type", primitiveArray.getClass(), dynaMap.get(testProperty).getClass());
assertEquals("Check First Indexed Value is correct(a)", testInteger1, dynaMap.get(testProperty, index));
- assertEquals("Check First Indexed Value is correct(b)", testInteger1, new Integer(((int[])dynaMap.get(testProperty))[index]));
- assertEquals("Check Array length is correct", new Integer(index+1), new Integer(((int[])dynaMap.get(testProperty)).length));
+ assertEquals("Check First Indexed Value is correct(b)", testInteger1, Integer.valueOf(((int[])dynaMap.get(testProperty))[index]));
+ assertEquals("Check Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((int[])dynaMap.get(testProperty)).length));
// Set a second indexed value, should automatically grow the int[] and set appropriate indexed value
index = index + 2;
dynaMap.set(testProperty, index, testInteger2);
assertEquals("Check Second Indexed Value is correct(a)", testInteger2, dynaMap.get(testProperty, index));
- assertEquals("Check Second Indexed Value is correct(b)", testInteger2, new Integer(((int[])dynaMap.get(testProperty))[index]));
- assertEquals("Check Second Array length is correct", new Integer(index+1), new Integer(((int[])dynaMap.get(testProperty)).length));
+ assertEquals("Check Second Indexed Value is correct(b)", testInteger2, Integer.valueOf(((int[])dynaMap.get(testProperty))[index]));
+ assertEquals("Check Second Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((int[])dynaMap.get(testProperty)).length));
}
@@ -370,14 +370,14 @@ public class LazyDynaMapTestCase extends TestCase {
assertEquals("Check Indexed Property is correct type", objectArray.getClass(), dynaMap.get(testProperty).getClass());
assertEquals("Check First Indexed Value is correct(a)", testString1, dynaMap.get(testProperty, index));
assertEquals("Check First Indexed Value is correct(b)", testString1, ((String[])dynaMap.get(testProperty))[index]);
- assertEquals("Check Array length is correct", new Integer(index+1), new Integer(((String[])dynaMap.get(testProperty)).length));
+ assertEquals("Check Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((String[])dynaMap.get(testProperty)).length));
// Set a second indexed value, should automatically grow the String[] and set appropriate indexed value
index = index + 2;
dynaMap.set(testProperty, index, testString2);
assertEquals("Check Second Indexed Value is correct(a)", testString2, dynaMap.get(testProperty, index));
assertEquals("Check Second Indexed Value is correct(b)", testString2, ((String[])dynaMap.get(testProperty))[index]);
- assertEquals("Check Second Array length is correct", new Integer(index+1), new Integer(((String[])dynaMap.get(testProperty)).length));
+ assertEquals("Check Second Array length is correct", Integer.valueOf(index+1), Integer.valueOf(((String[])dynaMap.get(testProperty)).length));
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
index 7624fb6d..319d8406 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
@@ -57,7 +57,7 @@ public class MappedPropertyTestBean {
}
public void setMappedPrimitive(final int key, final int value) {
- map.put(new Integer(key), new Integer(value));
+ map.put(Integer.valueOf(key), Integer.valueOf(value));
}
public void setAnyMapped(final MappedPropertyTestBean key, final MappedPropertyTestBean value) {
diff --git a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
index cb14dc0b..aa57e77b 100644
--- a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
@@ -281,14 +281,14 @@ public class MethodUtilsTestCase extends TestCase {
value = MethodUtils.invokeStaticMethod(TestBean.class, "currentCounter", new Object[0]);
assertEquals("currentCounter value", current, ((Integer) value).intValue());
- MethodUtils.invokeStaticMethod(TestBean.class, "incrementCounter", new Object[] { new Integer(8) } );
+ MethodUtils.invokeStaticMethod(TestBean.class, "incrementCounter", new Object[] { Integer.valueOf(8) } );
current += 8;
value = MethodUtils.invokeStaticMethod(TestBean.class, "currentCounter", new Object[0]);
assertEquals("currentCounter value", current, ((Integer) value).intValue());
MethodUtils.invokeExactStaticMethod(TestBean.class, "incrementCounter",
- new Object[] { new Integer(8) }, new Class[] { Number.class } );
+ new Object[] { Integer.valueOf(8) }, new Class[] { Number.class } );
current += 16;
value = MethodUtils.invokeStaticMethod(TestBean.class, "currentCounter", new Object[0]);
@@ -346,7 +346,7 @@ public class MethodUtilsTestCase extends TestCase {
// Increment via specified-argument version
MethodUtils.invokeMethod
(bean, "incrementCounter",
- new Object[] { new Integer(5) },
+ new Object[] { Integer.valueOf(5) },
new Class[] { Integer.TYPE });
// Validate updated value
@@ -405,7 +405,7 @@ public class MethodUtilsTestCase extends TestCase {
// Increment via specified-argument version
MethodUtils.invokeExactMethod
(bean, "incrementCounter",
- new Object[] { new Integer(5) },
+ new Object[] { Integer.valueOf(5) },
new Class[] { Integer.TYPE });
// Validate updated value
@@ -505,7 +505,7 @@ public class MethodUtilsTestCase extends TestCase {
((Integer) value).intValue());
// Increment via specified-argument version
- incrementCounterMethod2.invoke(null, new Integer(5));
+ incrementCounterMethod2.invoke(null, Integer.valueOf(5));
// Validate updated value
current += 5;
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
index 971bb451..71be7b29 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
@@ -99,7 +99,7 @@ public class PropertyUtilsBenchCase extends TestCase {
inMap.put("byteProperty", new Byte(inBean.getByteProperty()));
inMap.put("doubleProperty", Double.valueOf(inBean.getDoubleProperty()));
inMap.put("floatProperty", new Float(inBean.getFloatProperty()));
- inMap.put("intProperty", new Integer(inBean.getIntProperty()));
+ inMap.put("intProperty", Integer.valueOf(inBean.getIntProperty()));
inMap.put("longProperty", new Long(inBean.getLongProperty()));
inMap.put("shortProperty", new Short(inBean.getShortProperty()));
inMap.put("stringProperty", inBean.getStringProperty());
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
index d3523198..dcc59e36 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
@@ -240,7 +240,7 @@ public class PropertyUtilsTestCase extends TestCase {
map.put("dupProperty", new String[] { "New 0", "New 1", "New 2" });
map.put("floatProperty", new Float((float) 222.0));
map.put("intArray", new int[] { 0, 100, 200 });
- map.put("intProperty", new Integer(111));
+ map.put("intProperty", Integer.valueOf(111));
map.put("longProperty", new Long(444));
map.put("shortProperty", new Short((short) 555));
map.put("stringProperty", "New String Property");
@@ -311,7 +311,7 @@ public class PropertyUtilsTestCase extends TestCase {
assertEquals("Value of 'floatProperty'",
new Float((float) 123.0), map.get("floatProperty"));
assertEquals("Value of 'intProperty'",
- new Integer(123), map.get("intProperty"));
+ Integer.valueOf(123), map.get("intProperty"));
assertEquals("Value of 'longProperty'",
new Long(321), map.get("longProperty"));
assertEquals("Value of 'shortProperty'",
@@ -431,12 +431,12 @@ public class PropertyUtilsTestCase extends TestCase {
bean.getMappedIntProperty("xyz"); // initializes mappedIntProperty
PropertyDescriptor desc;
- final Integer testIntegerValue = new Integer(1234);
+ final Integer testIntegerValue = Integer.valueOf(1234);
bean.setMappedIntProperty("key.with.a.dot", testIntegerValue.intValue());
assertEquals("Can retrieve directly",
testIntegerValue,
- new Integer(bean.getMappedIntProperty("key.with.a.dot")));
+ Integer.valueOf(bean.getMappedIntProperty("key.with.a.dot")));
try {
desc = PropertyUtils.getPropertyDescriptor
(bean, "mappedIntProperty(key.with.a.dot)");
@@ -450,7 +450,7 @@ public class PropertyUtilsTestCase extends TestCase {
bean.setMappedObjects("nested.property", new TestBean(testIntegerValue.intValue()));
assertEquals("Can retrieve directly",
testIntegerValue,
- new Integer(((TestBean)bean.getMappedObjects("nested.property")).getIntProperty()));
+ Integer.valueOf(((TestBean)bean.getMappedObjects("nested.property")).getIntProperty()));
try {
desc = PropertyUtils.getPropertyDescriptor
(bean, "mappedObjects(nested.property).intProperty");
@@ -2410,7 +2410,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null, "intArray", 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 1");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2420,7 +2420,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, null, 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 2");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2433,7 +2433,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null,
"intArray[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 3");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2443,7 +2443,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw NoSuchMethodException 4");
} catch (final NoSuchMethodException e) {
// Expected response
@@ -2453,7 +2453,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "intArray",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 5");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2465,7 +2465,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null, "intIndexed", 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 1");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2475,7 +2475,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, null, 0,
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 2");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2488,7 +2488,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(null,
"intIndexed[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 3");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2498,7 +2498,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "[0]",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw NoSuchMethodException 4");
} catch (final NoSuchMethodException e) {
// Expected response
@@ -2508,7 +2508,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean, "intIndexed",
- new Integer(1));
+ Integer.valueOf(1));
fail("Should throw IllegalArgumentException 5");
} catch (final IllegalArgumentException e) {
// Expected response
@@ -2610,7 +2610,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray", 0,
- new Integer(1));
+ Integer.valueOf(1));
value =
PropertyUtils.getIndexedProperty(bean,
"intArray", 0);
@@ -2626,7 +2626,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed", 1,
- new Integer(11));
+ Integer.valueOf(11));
value =
PropertyUtils.getIndexedProperty(bean,
"intIndexed", 1);
@@ -2708,7 +2708,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray[4]",
- new Integer(1));
+ Integer.valueOf(1));
value =
PropertyUtils.getIndexedProperty(bean,
"intArray[4]");
@@ -2724,7 +2724,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed[3]",
- new Integer(11));
+ Integer.valueOf(11));
value =
PropertyUtils.getIndexedProperty(bean,
"intIndexed[3]");
@@ -2812,7 +2812,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray", -1,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -2823,7 +2823,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intArray", 5,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -2834,7 +2834,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed", -1,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -2845,7 +2845,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.setIndexedProperty(bean,
"intIndexed", 5,
- new Integer(0));
+ Integer.valueOf(0));
fail("Should have thrown ArrayIndexOutOfBoundsException");
} catch (final ArrayIndexOutOfBoundsException t) {
// Expected results
@@ -3323,7 +3323,7 @@ public class PropertyUtilsTestCase extends TestCase {
final int newValue = oldValue + 1;
PropertyUtils.setNestedProperty(bean,
"nested.intProperty",
- new Integer(newValue));
+ Integer.valueOf(newValue));
assertEquals("Matched new value",
newValue,
bean.getNested().getIntProperty());
@@ -3628,7 +3628,7 @@ public class PropertyUtilsTestCase extends TestCase {
final int newValue = oldValue + 1;
PropertyUtils.setSimpleProperty(bean,
"intProperty",
- new Integer(newValue));
+ Integer.valueOf(newValue));
assertEquals("Matched new value",
newValue,
bean.getIntProperty());
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
index f4c08bf1..8f83283f 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
@@ -178,7 +178,7 @@ public class TestResultSet implements InvocationHandler {
return new Float((float) 123.0);
}
if ("intProperty".equals(columnName)) {
- return new Integer(100 + row);
+ return Integer.valueOf(100 + row);
}
if ("longProperty".equals(columnName)) {
return new Long(200 + row);
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java b/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
index eb38941e..8aa657c6 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
@@ -89,7 +89,7 @@ public class TestResultSetMetaData implements InvocationHandler {
if ("getColumnClassName".equals(methodName)) {
return getColumnClassName(((Integer)args[0]).intValue());
} if ("getColumnCount".equals(methodName)) {
- return new Integer(getColumnCount());
+ return Integer.valueOf(getColumnCount());
} if ("getColumnName".equals(methodName)) {
return getColumnName(((Integer)args[0]).intValue());
} if ("getColumnType".equals(methodName)) {
@@ -146,7 +146,7 @@ public class TestResultSetMetaData implements InvocationHandler {
} else {
sqlType = Types.OTHER;
}
- return new Integer(sqlType);
+ return Integer.valueOf(sqlType);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
index 5afd0175..33e40387 100644
--- a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
@@ -262,8 +262,8 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
// Create a bean and set a value
final WrapDynaBean origBean = new WrapDynaBean(new TestBean());
- final Integer newValue = new Integer(789);
- assertEquals("origBean default", new Integer(123), origBean.get("intProperty"));
+ final Integer newValue = Integer.valueOf(789);
+ assertEquals("origBean default", Integer.valueOf(123), origBean.get("intProperty"));
origBean.set("intProperty", newValue);
assertEquals("origBean new value", newValue, origBean.get("intProperty"));
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 317d55c6..414ab06e 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
@@ -86,7 +86,7 @@ public class ArrayConverterTestCase extends TestCase {
*/
public void testComponentIntegerConverter() {
- final IntegerConverter intConverter = new IntegerConverter(new Integer(0));
+ final IntegerConverter intConverter = new IntegerConverter(Integer.valueOf(0));
intConverter.setPattern("#,###");
intConverter.setLocale(Locale.US);
final ArrayConverter arrayConverter = new ArrayConverter(int[].class, intConverter, 0);
@@ -100,7 +100,7 @@ public class ArrayConverterTestCase extends TestCase {
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 Integer[] IntegerArray = new Integer[] {new Integer(intArray[0]), new Integer(intArray[1]), new Integer(intArray[2]), new Integer(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<>();
for (int i = 0; i < strArray.length; i++) {
@@ -289,7 +289,7 @@ public class ArrayConverterTestCase extends TestCase {
// Expected results
String msg = null;
final int[] expectedInt = new int[] {10, 11, 12, 13};
- final Integer[] expectedInteger = new Integer[] {new Integer(expectedInt[0]), new Integer(expectedInt[1]), new Integer(expectedInt[2]), new Integer(expectedInt[3])};
+ final Integer[] expectedInteger = new Integer[] {Integer.valueOf(expectedInt[0]), Integer.valueOf(expectedInt[1]), Integer.valueOf(expectedInt[2]), Integer.valueOf(expectedInt[3])};
// Test String[] --> int[]
try {
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 61aeba7e..063e2ee8 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
@@ -102,7 +102,7 @@ public class BigDecimalConverterTestCase extends NumberConverterTestBase<BigDeci
"17.2",
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(10),
new Float("11.1"),
Double.valueOf("12.2"),
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 ca25743e..3fd9e29d 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
@@ -94,7 +94,7 @@ public class BigIntegerConverterTestCase extends NumberConverterTestBase<BigInte
String.valueOf(Long.MAX_VALUE),
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(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 847434bb..f356c2d8 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
@@ -127,7 +127,7 @@ public class ByteConverterTestCase extends NumberConverterTestBase<Byte> {
String.valueOf(Byte.MAX_VALUE),
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(10),
new Float(11.1),
Double.valueOf(12.2)
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 36d4f5c1..5f8957e1 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
@@ -73,7 +73,7 @@ public class CharacterConverterTestCase extends TestCase {
final Converter converter = new CharacterConverter();
assertEquals("Character Test", new Character('N'), converter.convert(Character.class, new Character('N')));
assertEquals("String Test", new Character('F'), converter.convert(Character.class, "FOO"));
- assertEquals("Integer Test", new Character('3'), converter.convert(Character.class, new Integer(321)));
+ assertEquals("Integer Test", new Character('3'), converter.convert(Character.class, Integer.valueOf(321)));
}
/**
@@ -99,7 +99,7 @@ public class CharacterConverterTestCase extends TestCase {
assertEquals("Character Test", "N", converter.convert(String.class, new Character('N')));
assertEquals("String Test", "F", converter.convert(String.class, "FOO"));
- assertEquals("Integer Test", "3", converter.convert(String.class, new Integer(321)));
+ assertEquals("Integer Test", "3", converter.convert(String.class, Integer.valueOf(321)));
assertEquals("Null Test", null, converter.convert(String.class, null));
}
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 b831b969..e04eb759 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
@@ -84,7 +84,7 @@ public class ClassConverterTestCase extends TestCase {
// Invalid Test
try {
- converter.convert(Class.class, new Integer(6));
+ converter.convert(Class.class, Integer.valueOf(6));
fail("Expected invalid value to fail");
} catch (final ConversionException e) {
// expected result
@@ -106,7 +106,7 @@ public class ClassConverterTestCase extends TestCase {
final Converter converter = new ClassConverter(Object.class);
- assertEquals("Invalid Test", Object.class, converter.convert(Class.class, new Integer(6)));
+ assertEquals("Invalid Test", Object.class, converter.convert(Class.class, Integer.valueOf(6)));
assertEquals("Null Test", Object.class, converter.convert(Class.class, null));
}
@@ -117,7 +117,7 @@ public class ClassConverterTestCase extends TestCase {
final Converter converter = new ClassConverter(null);
- assertEquals("Invalid Test", null, converter.convert(Class.class, new Integer(6)));
+ assertEquals("Invalid Test", null, converter.convert(Class.class, Integer.valueOf(6)));
assertEquals("Null Test", null, converter.convert(Class.class, null));
}
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 00c08019..50724ff1 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
@@ -92,7 +92,7 @@ public class DoubleConverterTestCase extends NumberConverterTestBase<Double> {
String.valueOf(Double.MAX_VALUE),
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(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 b28b6605..4e40e749 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
@@ -114,7 +114,7 @@ public class FloatConverterTestCase extends NumberConverterTestBase<Float> {
String.valueOf(Float.MAX_VALUE),
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(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 a34ac048..6d353958 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
@@ -57,10 +57,10 @@ public class IntegerConverterTestCase extends NumberConverterTestBase<Integer> {
@Override
public void setUp() throws Exception {
converter = makeConverter();
- numbers[0] = new Integer("-12");
- numbers[1] = new Integer("13");
- numbers[2] = new Integer("-22");
- numbers[3] = new Integer("23");
+ numbers[0] = Integer.valueOf("-12");
+ numbers[1] = Integer.valueOf("13");
+ numbers[2] = Integer.valueOf("-22");
+ numbers[3] = Integer.valueOf("23");
}
@Override
@@ -81,10 +81,10 @@ public class IntegerConverterTestCase extends NumberConverterTestBase<Integer> {
final Long maxPlusOne = new Long(max.longValue() + 1);
// Minimum
- assertEquals("Minimum", new Integer(Integer.MIN_VALUE), converter.convert(clazz, min));
+ assertEquals("Minimum", Integer.valueOf(Integer.MIN_VALUE), converter.convert(clazz, min));
// Maximum
- assertEquals("Maximum", new Integer(Integer.MAX_VALUE), converter.convert(clazz, max));
+ assertEquals("Maximum", Integer.valueOf(Integer.MAX_VALUE), converter.convert(clazz, max));
// Too Small
try {
@@ -143,26 +143,26 @@ public class IntegerConverterTestCase extends NumberConverterTestBase<Integer> {
String.valueOf(Integer.MAX_VALUE),
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(10),
new Float(11.1),
Double.valueOf(12.2)
};
final Integer[] expected = {
- new Integer(Integer.MIN_VALUE),
- new Integer(-17),
- new Integer(-1),
- new Integer(0),
- new Integer(1),
- new Integer(17),
- new Integer(Integer.MAX_VALUE),
- new Integer(7),
- new Integer(8),
- new Integer(9),
- new Integer(10),
- new Integer(11),
- new Integer(12)
+ Integer.valueOf(Integer.MIN_VALUE),
+ Integer.valueOf(-17),
+ Integer.valueOf(-1),
+ Integer.valueOf(0),
+ Integer.valueOf(1),
+ Integer.valueOf(17),
+ Integer.valueOf(Integer.MAX_VALUE),
+ Integer.valueOf(7),
+ Integer.valueOf(8),
+ Integer.valueOf(9),
+ Integer.valueOf(10),
+ Integer.valueOf(11),
+ Integer.valueOf(12)
};
for (int i = 0; i < expected.length; i++) {
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 05a737d5..2ac7598a 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
@@ -92,7 +92,7 @@ public class LongConverterTestCase extends NumberConverterTestBase<Long> {
String.valueOf(Long.MAX_VALUE),
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(10),
new Float(11.1),
Double.valueOf(12.2)
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 3d528143..4f940380 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
@@ -107,13 +107,13 @@ public abstract class NumberConverterTestBase<T extends Number> extends TestCase
final Object[] number = {
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(10),
new Float(11.1),
Double.valueOf(12.2),
new BigDecimal("17.2"),
new BigInteger("33"),
- new Integer[] {new Integer(3), new Integer(2), new Integer(1)}
+ new Integer[] {Integer.valueOf(3), Integer.valueOf(2), Integer.valueOf(1)}
};
for(int i=0;i<number.length;i++) {
@@ -279,14 +279,14 @@ public abstract class NumberConverterTestBase<T extends Number> extends TestCase
* Convert Array --> Number
*/
public void testStringArrayToInteger() {
- final Integer defaultValue = new Integer(-1);
+ final Integer defaultValue = Integer.valueOf(-1);
final NumberConverter converter = new IntegerConverterTestCase("test").makeConverter(defaultValue);
// Default Locale
- assertEquals("Valid First", new Integer(5), converter.convert(Integer.class, new String[] {"5", "4", "3"}));
+ assertEquals("Valid First", Integer.valueOf(5), converter.convert(Integer.class, new String[] {"5", "4", "3"}));
assertEquals("Invalid First", defaultValue, converter.convert(Integer.class, new String[] {"FOO", "1", "2"}));
assertEquals("Null First", defaultValue, converter.convert(Integer.class, new String[] {null, "1", "2"}));
- assertEquals("Long Array", new Integer(9), converter.convert(Integer.class, new long[] {9, 2, 6}));
+ assertEquals("Long Array", Integer.valueOf(9), converter.convert(Integer.class, new long[] {9, 2, 6}));
}
/**
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 e684aac8..ba152e8c 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
@@ -127,7 +127,7 @@ public class ShortConverterTestCase extends NumberConverterTestBase<Short> {
String.valueOf(Short.MAX_VALUE),
new Byte((byte)7),
new Short((short)8),
- new Integer(9),
+ Integer.valueOf(9),
new Long(10),
new Float(11.1),
Double.valueOf(12.2)
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java
index cbf9b4d2..f17d3a6a 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java
@@ -104,7 +104,7 @@ public class SqlDateConverterTestCase extends DateConverterTestBase<Date> {
final Object testVal = toType(expected, "yyyy-MM-dd", null);
stringConversion(converter, expected, testVal);
- final Object result = converter.convert(String.class, new Integer(2));
+ final Object result = converter.convert(String.class, Integer.valueOf(2));
assertEquals("Default toString()", "2", result);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java
index b965a487..4c66d37a 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java
@@ -116,7 +116,7 @@ public class SqlTimeConverterTestCase extends DateConverterTestBase<Time> {
invalidConversion(converter, "13:05");
invalidConversion(converter, "11:05 p");
invalidConversion(converter, "11.05 pm");
- invalidConversion(converter, new Integer(2));
+ invalidConversion(converter, Integer.valueOf(2));
// Test specified Locale
converter.setLocale(Locale.UK);
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
index 65bb71b8..846e0627 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
@@ -136,7 +136,7 @@ public class SqlTimestampConverterTestCase extends DateConverterTestBase<Timesta
invalidConversion(converter, "13:05 pm");
invalidConversion(converter, "11:05 p");
invalidConversion(converter, "11.05 pm");
- invalidConversion(converter, new Integer(2));
+ invalidConversion(converter, Integer.valueOf(2));
// Restore the default Locale
Locale.setDefault(defaultLocale);
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
index d6f9caa4..5eb01b04 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
@@ -586,7 +586,7 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
assertNotNull("Null Result", result);
assertEquals("Integer Type", Integer.class, result.getClass());
- assertEquals("Integer Value", new Integer(123), result);
+ assertEquals("Integer Value", Integer.valueOf(123), result);
}
/**
@@ -603,7 +603,7 @@ public class LocaleConvertUtilsTestCase extends TestCase {
assertNotNull("Null Result", result);
assertEquals("Integer Array Type", Integer[].class, result.getClass());
assertEquals("Integer Array Length", 1, ((Integer[])result).length);
- assertEquals("Integer Array Value", new Integer(123), ((Integer[])result)[0]);
+ assertEquals("Integer Array Value", Integer.valueOf(123), ((Integer[])result)[0]);
}
/**
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 4cd9c748..f3de3874 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
@@ -32,8 +32,8 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase<
@Override
public void setUp() throws Exception {
super.setUp();
- defaultValue = new Integer("999");
- expectedValue = new Integer(expectedIntegerValue);
+ defaultValue = Integer.valueOf("999");
+ expectedValue = Integer.valueOf(expectedIntegerValue);
}
/**
@@ -66,7 +66,7 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase<
// quite happily turning "1,234" into "1"
// I guess this is one of the limitations of DecimalFormat
// **************************************************************************
- convertValueNoPattern(converter, "(B)", defaultIntegerValue, new Integer("1"));
+ convertValueNoPattern(converter, "(B)", defaultIntegerValue, Integer.valueOf("1"));
// **************************************************************************
// Convert with non-localized pattern - unlike the equivalent BigDecimal Test Case
@@ -74,7 +74,7 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase<
// quite happily turning "1,234" into "1"
// Again this is one of the limitations of DecimalFormat
// **************************************************************************
- convertValueWithPattern(converter, "(B)", localizedIntegerValue, defaultIntegerPattern, new Integer("1"));
+ convertValueWithPattern(converter, "(B)", localizedIntegerValue, defaultIntegerPattern, Integer.valueOf("1"));
// **************************************************************************
// Convert with specified type
@@ -222,7 +222,7 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase<
// ------------- Construct using specified Locale --------
converter = new IntegerLocaleConverter(localizedLocale);
- final Integer value = new Integer(1234);
+ final Integer value = Integer.valueOf(1234);
assertEquals("Convert Integer", value, converter.convert(value));
assertEquals("Convert Long", value, converter.convert(new Long(value.intValue())));
}