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-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new c37baf26 Migrate from Number subclass APIs deprecated in Java 9
c37baf26 is described below
commit c37baf264d11dd3af412308923bab2307572730f
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Feb 10 09:18:23 2025 -0500
Migrate from Number subclass APIs deprecated in Java 9
---
.../org/apache/commons/jelly/tags/core/ArgTag.java | 21 ++++++-------
.../apache/commons/jelly/tags/core/ForEachTag.java | 16 +++++-----
.../org/apache/commons/jelly/core/TestArgTag.java | 36 +++++++++++-----------
.../commons/jelly/core/TestGetStaticTag.java | 2 +-
.../commons/jelly/expression/TestDynaBeans.java | 4 +--
.../commons/jelly/expression/TestExpressions.java | 2 +-
6 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
index 5cf81f8c..45e6926b 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
@@ -165,12 +165,11 @@ public class ArgTag extends BaseClassLoaderTag {
Converter converter = (Converter) (converterMap.get(klass));
if (null == converter) {
throw new JellyTagException("Can't convert " + value + " to "
+ klass);
- } else {
- try {
- return converter.convert(klass, value);
- } catch (ConversionException e) {
- throw new JellyTagException("Can't convert " + value + "
to " + klass + " (" + e.toString() + ")", e);
- }
+ }
+ try {
+ return converter.convert(klass, value);
+ } catch (ConversionException e) {
+ throw new JellyTagException("Can't convert " + value + " to "
+ klass + " (" + e.toString() + ")", e);
}
} else {
return value;
@@ -197,7 +196,7 @@ public class ArgTag extends BaseClassLoaderTag {
@Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
- return new Byte(((Number) value).byteValue());
+ return Byte.valueOf(((Number) value).byteValue());
} else {
return inner.convert(klass, value);
}
@@ -213,7 +212,7 @@ public class ArgTag extends BaseClassLoaderTag {
@Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
- return new Short(((Number) value).shortValue());
+ return Short.valueOf(((Number) value).shortValue());
} else {
return inner.convert(klass, value);
}
@@ -229,7 +228,7 @@ public class ArgTag extends BaseClassLoaderTag {
@Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
- return new Integer(((Number) value).intValue());
+ return Integer.valueOf(((Number) value).intValue());
} else {
return inner.convert(klass, value);
}
@@ -245,7 +244,7 @@ public class ArgTag extends BaseClassLoaderTag {
@Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
- return new Long(((Number) value).longValue());
+ return Long.valueOf(((Number) value).longValue());
} else {
return inner.convert(klass, value);
}
@@ -261,7 +260,7 @@ public class ArgTag extends BaseClassLoaderTag {
@Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
- return new Float(((Number) value).floatValue());
+ return Float.valueOf(((Number) value).floatValue());
} else {
return inner.convert(klass, value);
}
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
index 1492bd89..a3d4c25e 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
@@ -103,9 +103,9 @@ public class ForEachTag extends TagSupport {
if (statusVar != null)
{
// set up statii as required by JSTL
- Integer statusBegin = (begin == 0) ? null : new
Integer(begin);
- Integer statusEnd = (end == Integer.MAX_VALUE) ? null :
new Integer(end);
- Integer statusStep = (step == 1) ? null : new
Integer(step);
+ Integer statusBegin = (begin == 0) ? null :
Integer.valueOf(begin);
+ Integer statusEnd = (end == Integer.MAX_VALUE) ? null :
Integer.valueOf(end);
+ Integer statusStep = (step == 1) ? null :
Integer.valueOf(step);
status = new LoopStatus(statusBegin, statusEnd,
statusStep);
context.setVariable(statusVar, status);
}
@@ -118,7 +118,7 @@ public class ForEachTag extends TagSupport {
context.setVariable(var, value);
}
if (indexVar != null) {
- context.setVariable(indexVar, new Integer(index));
+ context.setVariable(indexVar, Integer.valueOf(index));
}
// set the status var up
if (statusVar != null) {
@@ -166,9 +166,9 @@ public class ForEachTag extends TagSupport {
if (statusVar != null)
{
// set up statii as required by JSTL
- Integer statusBegin = new Integer(begin);
- Integer statusEnd = new Integer(end);
- Integer statusStep = new Integer(step);
+ Integer statusBegin = Integer.valueOf(begin);
+ Integer statusEnd = Integer.valueOf(end);
+ Integer statusStep = Integer.valueOf(step);
status = new LoopStatus(statusBegin, statusEnd,
statusStep);
context.setVariable(statusVar, status);
}
@@ -176,7 +176,7 @@ public class ForEachTag extends TagSupport {
int count = 0;
for (index = begin; index <= end; index += step ) {
- Object value = new Integer(index);
+ Object value = Integer.valueOf(index);
if (varName != null) {
context.setVariable(varName, value);
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
index 441c5045..221fd98f 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
@@ -74,7 +74,7 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue("X");
argTag.doTag(getXMLOutput());
assertEquals(Character.TYPE,parentTag.getType(0));
- assertEquals(new Character('X'),parentTag.getValue(0));
+ assertEquals(Character.valueOf('X'),parentTag.getValue(0));
}
public void testToByteFromString() throws Exception {
@@ -82,15 +82,15 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue("17");
argTag.doTag(getXMLOutput());
assertEquals(Byte.TYPE,parentTag.getType(0));
- assertEquals(new Byte((byte)17),parentTag.getValue(0));
+ assertEquals(Byte.valueOf((byte)17),parentTag.getValue(0));
}
public void testToByteFromNumber() throws Exception {
argTag.setType("byte");
- argTag.setValue(new Double(17.3d));
+ argTag.setValue(Double.valueOf(17.3d));
argTag.doTag(getXMLOutput());
assertEquals(Byte.TYPE,parentTag.getType(0));
- assertEquals(new Byte((byte)17),parentTag.getValue(0));
+ assertEquals(Byte.valueOf((byte)17),parentTag.getValue(0));
}
public void testToShortFromString() throws Exception {
@@ -98,15 +98,15 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue("17");
argTag.doTag(getXMLOutput());
assertEquals(Short.TYPE,parentTag.getType(0));
- assertEquals(new Short((short)17),parentTag.getValue(0));
+ assertEquals(Short.valueOf((short)17),parentTag.getValue(0));
}
public void testToShortFromNumber() throws Exception {
argTag.setType("short");
- argTag.setValue(new Double(17.3d));
+ argTag.setValue(Double.valueOf(17.3d));
argTag.doTag(getXMLOutput());
assertEquals(Short.TYPE,parentTag.getType(0));
- assertEquals(new Short((short)17),parentTag.getValue(0));
+ assertEquals(Short.valueOf((short)17),parentTag.getValue(0));
}
public void testToIntFromString() throws Exception {
@@ -114,15 +114,15 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue("17");
argTag.doTag(getXMLOutput());
assertEquals(Integer.TYPE,parentTag.getType(0));
- assertEquals(new Integer(17),parentTag.getValue(0));
+ assertEquals(Integer.valueOf(17),parentTag.getValue(0));
}
public void testToIntFromNumber() throws Exception {
argTag.setType("int");
- argTag.setValue(new Double(17.3d));
+ argTag.setValue(Double.valueOf(17.3d));
argTag.doTag(getXMLOutput());
assertEquals(Integer.TYPE,parentTag.getType(0));
- assertEquals(new Integer(17),parentTag.getValue(0));
+ assertEquals(Integer.valueOf(17),parentTag.getValue(0));
}
public void testToFloatFromString() throws Exception {
@@ -130,15 +130,15 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue("17.3");
argTag.doTag(getXMLOutput());
assertEquals(Float.TYPE,parentTag.getType(0));
- assertEquals(new Float((float)17.3),parentTag.getValue(0));
+ assertEquals(Float.valueOf((float)17.3),parentTag.getValue(0));
}
public void testToFloatFromNumber() throws Exception {
argTag.setType("float");
- argTag.setValue(new Double(17.3d));
+ argTag.setValue(Double.valueOf(17.3d));
argTag.doTag(getXMLOutput());
assertEquals(Float.TYPE,parentTag.getType(0));
- assertEquals(new Float((float)17.3),parentTag.getValue(0));
+ assertEquals(Float.valueOf((float)17.3),parentTag.getValue(0));
}
public void testToLongFromString() throws Exception {
@@ -146,15 +146,15 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue("17");
argTag.doTag(getXMLOutput());
assertEquals(Long.TYPE,parentTag.getType(0));
- assertEquals(new Long(17),parentTag.getValue(0));
+ assertEquals(Long.valueOf(17),parentTag.getValue(0));
}
public void testToLongFromNumber() throws Exception {
argTag.setType("long");
- argTag.setValue(new Double(17.3d));
+ argTag.setValue(Double.valueOf(17.3d));
argTag.doTag(getXMLOutput());
assertEquals(Long.TYPE,parentTag.getType(0));
- assertEquals(new Long(17),parentTag.getValue(0));
+ assertEquals(Long.valueOf(17),parentTag.getValue(0));
}
public void testToDoubleFromString() throws Exception {
@@ -162,7 +162,7 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue("17.3");
argTag.doTag(getXMLOutput());
assertEquals(Double.TYPE,parentTag.getType(0));
- assertEquals(new Double(17.3),parentTag.getValue(0));
+ assertEquals(Double.valueOf(17.3),parentTag.getValue(0));
}
public void testToDoubleFromNumber() throws Exception {
@@ -170,7 +170,7 @@ public class TestArgTag extends BaseJellyTest {
argTag.setValue(new Long(17L));
argTag.doTag(getXMLOutput());
assertEquals(Double.TYPE,parentTag.getType(0));
- assertEquals(new Double(17),parentTag.getValue(0));
+ assertEquals(Double.valueOf(17),parentTag.getValue(0));
}
public void testToPrimitiveFromNull() throws Exception {
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
index 0232d97e..fce3dbc0 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
@@ -51,7 +51,7 @@ public class TestGetStaticTag extends BaseJellyTest {
script.run( getJellyContext(), getXMLOutput() );
- assertEquals( new Integer(java.lang.Integer.MAX_VALUE),
+ assertEquals( Integer.valueOf(java.lang.Integer.MAX_VALUE),
getJellyContext().getVariable("value" ) );
}
diff --git
a/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
b/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
index 427af977..7045a146 100644
--- a/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
+++ b/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
@@ -57,12 +57,12 @@ public class TestDynaBeans extends TestCase {
DynaClass dynaClass = createDynaClass();
DynaBean dynaBean = dynaClass.newInstance();
dynaBean.set( "stringProperty", "foo" );
- dynaBean.set( "intProperty", new Integer(24) );
+ dynaBean.set( "intProperty", Integer.valueOf(24) );
context.setVariable("dbean", dynaBean);
assertExpression("${dbean.stringProperty}", "foo");
- assertExpression("${dbean.intProperty}", new Integer(24));
+ assertExpression("${dbean.intProperty}", Integer.valueOf(24));
}
protected DynaClass createDynaClass() {
diff --git
a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
index 1bc24185..951e5fb9 100644
---
a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
+++
b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
@@ -88,7 +88,7 @@ public class TestExpressions extends TestCase {
assertExpression("${maven.some.madeup.name}", null);
assertExpression("cheese ${maven.some.madeup.name}pizza", "cheese
pizza");
assertExpression("ham and ${maven.home.foo} pizza", "ham and cheese
pizza");
- assertExpression("${maven.home.foo.length()}", new Integer(6));
+ assertExpression("${maven.home.foo.length()}", Integer.valueOf(6));
}
/** Tests that $${xx} is output as ${xx}. This trick is ued
