Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Java terminal deprecations

Browse Source 
This is cosmetic for Java 17, but will be required for some later
version. Fixing it now greatly reduces the number of warnings we see.
This commit is contained in:
Ian Young
2022-05-05 14:49:59 +01:00
committed by rstoyanchev
parent f91129e24c
commit 505b3fc3d7
7 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-binding/src/test/java/org/springframework/binding/collection/MapAccessorTests.java
View File

@@ -41,8 +41,8 @@ public class MapAccessorTests {
@Test
public void testGetInteger() {
assertEquals(new Integer(9), accessor.getInteger("integer"));
assertEquals(new Integer(9), accessor.getRequiredInteger("integer"));
assertEquals(Integer.valueOf(9), accessor.getInteger("integer"));
assertEquals(Integer.valueOf(9), accessor.getRequiredInteger("integer"));
}
@Test

22
spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java
View File

@@ -90,7 +90,7 @@ public class DefaultConversionServiceTests {
DefaultConversionService service = new DefaultConversionService();
ConversionExecutor executor = service.getConversionExecutor(String.class, Integer.class);
Integer three = (Integer) executor.execute("3");
assertEquals(new Integer(3), three);
assertEquals(Integer.valueOf(3), three);
ConversionExecutor executor2 = service.getConversionExecutor(Integer.class, String.class);
String threeString = (String) executor2.execute(3);
@@ -107,7 +107,7 @@ public class DefaultConversionServiceTests {
service.addConverter(converter);
ConversionExecutor executor = service.getConversionExecutor(String.class, Integer.class);
Integer three = (Integer) executor.execute("3,000");
assertEquals(new Integer(3000), three);
assertEquals(Integer.valueOf(3000), three);
ConversionExecutor executor2 = service.getConversionExecutor(Integer.class, String.class);
String string = (String) executor2.execute(3000);
assertEquals("3,000", string);
@@ -123,7 +123,7 @@ public class DefaultConversionServiceTests {
service.addConverter("usaNumber", converter);
ConversionExecutor executor = service.getConversionExecutor("usaNumber", String.class, Integer.class);
Integer three = (Integer) executor.execute("3,000");
assertEquals(new Integer(3000), three);
assertEquals(Integer.valueOf(3000), three);
ConversionExecutor executor2 = service.getConversionExecutor("usaNumber", Integer.class, String.class);
String string = (String) executor2.execute(3000);
assertEquals("3,000", string);
@@ -413,7 +413,7 @@ public class DefaultConversionServiceTests {
DefaultConversionService service = new DefaultConversionService();
ConversionExecutor executor = service.getConversionExecutor(String.class, int.class);
Integer three = (Integer) executor.execute("3");
assertEquals(new Integer(3), three);
assertEquals(Integer.valueOf(3), three);
}
@Test
@@ -421,9 +421,9 @@ public class DefaultConversionServiceTests {
DefaultConversionService service = new DefaultConversionService();
ConversionExecutor executor = service.getConversionExecutor(String[].class, Integer[].class);
Integer[] result = (Integer[]) executor.execute(new String[] { "1", "2", "3" });
assertEquals(new Integer(1), result[0]);
assertEquals(new Integer(2), result[1]);
assertEquals(new Integer(3), result[2]);
assertEquals(Integer.valueOf(1), result[0]);
assertEquals(Integer.valueOf(2), result[1]);
assertEquals(Integer.valueOf(3), result[2]);
}
@Test
@@ -490,9 +490,9 @@ public class DefaultConversionServiceTests {
// list.add("2");
// list.add("3");
// Integer[] result = (Integer[]) executor.execute(list);
// assertEquals(new Integer(1), result[0]);
// assertEquals(new Integer(2), result[1]);
// assertEquals(new Integer(3), result[2]);
// assertEquals(Integer.valueOf(1), result[0]);
// assertEquals(Integer.valueOf(2), result[1]);
// assertEquals(Integer.valueOf(3), result[2]);
} catch (ConversionExecutorNotFoundException e) {
// This is expected
@@ -549,7 +549,7 @@ public class DefaultConversionServiceTests {
ConversionExecutor executor = service.getConversionExecutor(String.class, Integer[].class);
Integer[] result = (Integer[]) executor.execute("123");
assertEquals(1, result.length);
assertEquals(new Integer(123), result[0]);
assertEquals(Integer.valueOf(123), result[0]);
}
private static class CustomConverter implements Converter {

2
spring-webflow/src/test/java/org/springframework/webflow/action/FormActionBindingTests.java
View File

@@ -111,7 +111,7 @@ public class FormActionBindingTests {
TestBean formObject = (TestBean) new FormObjectAccessor(context).getFormObject("formObject", ScopeType.FLOW);
errors = new FormObjectAccessor(context).getFormErrors("formObject", ScopeType.FLASH);
assertNotNull(formObject);
assertEquals(new Long(1), formObject.getProp());
assertEquals(Long.valueOf(1), formObject.getProp());
assertEquals(1L, errors.getFieldValue("prop"));
assertEquals("value", formObject.otherProp);
assertEquals("value", errors.getFieldValue("otherProp"));

2
spring-webflow/src/test/java/org/springframework/webflow/config/FlowRegistryFactoryBeanTests.java
View File

@@ -42,7 +42,7 @@ public class FlowRegistryFactoryBeanTests {
assertNotNull(def);
assertEquals("flow1", def.getId());
assertEquals("bar", def.getAttributes().get("foo"));
assertEquals(new Integer(2), def.getAttributes().getInteger("bar"));
assertEquals(Integer.valueOf(2), def.getAttributes().getInteger("bar"));
def = registry.getFlowDefinition("flow2");
assertNotNull(def);
assertEquals("flow2", def.getId());

8
spring-webflow/src/test/java/org/springframework/webflow/core/collection/LocalAttributeMapTests.java
View File

@@ -179,7 +179,7 @@ public class LocalAttributeMapTests {
@Test
public void testGetInteger() {
Integer i = attributeMap.getInteger("integer");
assertEquals(new Integer(12345), i);
assertEquals(Integer.valueOf(12345), i);
}
@Test
@@ -191,7 +191,7 @@ public class LocalAttributeMapTests {
@Test
public void testGetIntegerRequired() {
Integer i = attributeMap.getRequiredInteger("integer");
assertEquals(new Integer(12345), i);
assertEquals(Integer.valueOf(12345), i);
}
@Test
@@ -207,7 +207,7 @@ public class LocalAttributeMapTests {
@Test
public void testGetLong() {
Long i = attributeMap.getLong("long");
assertEquals(new Long(12345), i);
assertEquals(Long.valueOf(12345), i);
}
@Test
@@ -219,7 +219,7 @@ public class LocalAttributeMapTests {
@Test
public void testGetLongRequired() {
Long i = attributeMap.getRequiredLong("long");
assertEquals(new Long(12345), i);
assertEquals(Long.valueOf(12345), i);
}
@Test

40
spring-webflow/src/test/java/org/springframework/webflow/core/collection/LocalParameterMapTests.java
View File

@@ -75,7 +75,7 @@ public class LocalParameterMapTests {
@Test
public void testGetRequiredWithConversion() {
Integer value = parameterMap.getRequired("integer", Integer.class);
assertEquals(new Integer(12345), value);
assertEquals(Integer.valueOf(12345), value);
}
@Test
@@ -142,9 +142,9 @@ public class LocalParameterMapTests {
public void getArrayWithConversion() {
Integer[] values = parameterMap.getArray("stringArray", Integer.class);
assertEquals(new Integer(1), values[0]);
assertEquals(new Integer(2), values[1]);
assertEquals(new Integer(3), values[2]);
assertEquals(Integer.valueOf(1), values[0]);
assertEquals(Integer.valueOf(2), values[1]);
assertEquals(Integer.valueOf(3), values[2]);
}
@Test
@@ -178,77 +178,77 @@ public class LocalParameterMapTests {
@Test
public void testGetConversion() {
Integer i = parameterMap.getInteger("integer");
assertEquals(new Integer(12345), i);
assertEquals(Integer.valueOf(12345), i);
}
@Test
public void testGetArrayConversion() {
Integer[] i = parameterMap.getArray("stringArray", Integer.class);
assertEquals(i.length, 3);
assertEquals(new Integer(1), i[0]);
assertEquals(new Integer(2), i[1]);
assertEquals(new Integer(3), i[2]);
assertEquals(Integer.valueOf(1), i[0]);
assertEquals(Integer.valueOf(2), i[1]);
assertEquals(Integer.valueOf(3), i[2]);
}
public void getRequiredArrayWithConversion() {
Integer[] values = parameterMap.getRequiredArray("stringArray", Integer.class);
assertEquals(new Integer(1), values[0]);
assertEquals(new Integer(2), values[1]);
assertEquals(new Integer(3), values[2]);
assertEquals(Integer.valueOf(1), values[0]);
assertEquals(Integer.valueOf(2), values[1]);
assertEquals(Integer.valueOf(3), values[2]);
}
@Test
public void testGetNumber() {
Integer value = parameterMap.getNumber("integer", Integer.class);
assertEquals(new Integer(12345), value);
assertEquals(Integer.valueOf(12345), value);
}
@Test
public void testGetRequiredNumber() {
Integer value = parameterMap.getRequiredNumber("integer", Integer.class);
assertEquals(new Integer(12345), value);
assertEquals(Integer.valueOf(12345), value);
}
@Test
public void testGetNumberWithDefault() {
Integer value = parameterMap.getNumber("bogus", Integer.class, 12345);
assertEquals(new Integer(12345), value);
assertEquals(Integer.valueOf(12345), value);
}
@Test
public void testGetInteger() {
Integer value = parameterMap.getInteger("integer");
assertEquals(new Integer(12345), value);
assertEquals(Integer.valueOf(12345), value);
}
@Test
public void testGetRequiredInteger() {
Integer value = parameterMap.getRequiredInteger("integer");
assertEquals(new Integer(12345), value);
assertEquals(Integer.valueOf(12345), value);
}
@Test
public void testGetIntegerWithDefault() {
Integer value = parameterMap.getInteger("bogus", 12345);
assertEquals(new Integer(12345), value);
assertEquals(Integer.valueOf(12345), value);
}
@Test
public void testGetLong() {
Long value = parameterMap.getLong("integer");
assertEquals(new Long(12345), value);
assertEquals(Long.valueOf(12345), value);
}
@Test
public void testGetRequiredLong() {
Long value = parameterMap.getRequiredLong("integer");
assertEquals(new Long(12345), value);
assertEquals(Long.valueOf(12345), value);
}
@Test
public void testGetLongWithDefault() {
Long value = parameterMap.getLong("bogus", 12345L);
assertEquals(new Long(12345), value);
assertEquals(Long.valueOf(12345), value);
}
@Test

10
spring-webflow/src/test/java/org/springframework/webflow/mvc/view/MvcViewTests.java
View File

@@ -207,7 +207,7 @@ public class MvcViewTests {
assertFalse(context.getFlashScope().contains(ViewActionStateHolder.KEY));
assertEquals("submit", view.getFlowEvent().getId());
assertEquals("foo", bindBean.getStringProperty());
assertEquals(new Integer(5), bindBean.getIntegerProperty());
assertEquals(Integer.valueOf(5), bindBean.getIntegerProperty());
Calendar cal = Calendar.getInstance();
cal.clear();
cal.set(Calendar.YEAR, 2007);
@@ -219,9 +219,9 @@ public class MvcViewTests {
assertEquals("bar", bindBean.getStringArrayProperty()[1]);
assertEquals("baz", bindBean.getStringArrayProperty()[2]);
assertEquals(3, bindBean.getIntegerArrayProperty().length);
assertEquals(new Integer(1), bindBean.getIntegerArrayProperty()[0]);
assertEquals(new Integer(2), bindBean.getIntegerArrayProperty()[1]);
assertEquals(new Integer(3), bindBean.getIntegerArrayProperty()[2]);
assertEquals(Integer.valueOf(1), bindBean.getIntegerArrayProperty()[0]);
assertEquals(Integer.valueOf(2), bindBean.getIntegerArrayProperty()[1]);
assertEquals(Integer.valueOf(3), bindBean.getIntegerArrayProperty()[2]);
assertEquals(3, bindBean.getPrimitiveArrayProperty().length);
assertEquals(1, bindBean.getPrimitiveArrayProperty()[0]);
assertEquals(2, bindBean.getPrimitiveArrayProperty()[1]);
@@ -460,7 +460,7 @@ public class MvcViewTests {
assertTrue(view.hasFlowEvent());
assertEquals("submit", view.getFlowEvent().getId());
assertEquals("foo", bindBean.getStringProperty());
assertEquals(new Integer(3), bindBean.getIntegerProperty());
assertEquals(Integer.valueOf(3), bindBean.getIntegerProperty());
Calendar cal = Calendar.getInstance();
cal.clear();
cal.set(Calendar.YEAR, 2008);