Author: markt
Date: Tue Apr 11 20:40:36 2017
New Revision: 1791027
URL: http://svn.apache.org/viewvc?rev=1791027&view=rev
Log:
Refactoring in preparation for Java 9. Refactor to avoid using some methods
that will be deprecated in Java 9 onwards.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/trunk/test/javax/el/TestArrayELResolver.java
tomcat/trunk/test/javax/el/TestBeanELResolver.java
tomcat/trunk/test/javax/el/TestListELResolver.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java Tue Apr 11
20:40:36 2017
@@ -38,7 +38,7 @@ public final class AstFloatingPoint exte
public Number getFloatingPoint() {
if (this.number == null) {
try {
- this.number = new Double(this.image);
+ this.number = Double.valueOf(this.image);
} catch (ArithmeticException e0) {
this.number = new BigDecimal(this.image);
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstInteger.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstInteger.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstInteger.java Tue Apr 11 20:40:36
2017
@@ -38,7 +38,7 @@ public final class AstInteger extends Si
protected Number getInteger() {
if (this.number == null) {
try {
- this.number = new Long(this.image);
+ this.number = Long.valueOf(this.image);
} catch (ArithmeticException e1) {
this.number = new BigInteger(this.image);
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstNegative.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstNegative.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNegative.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNegative.java Tue Apr 11 20:40:36
2017
@@ -56,7 +56,7 @@ public final class AstNegative extends S
}
if (obj instanceof String) {
if (isStringFloat((String) obj)) {
- return new Double(-Double.parseDouble((String) obj));
+ return Double.valueOf(-Double.parseDouble((String) obj));
}
return Long.valueOf(-Long.parseLong((String) obj));
}
@@ -64,13 +64,13 @@ public final class AstNegative extends S
return Long.valueOf(-((Long) obj).longValue());
}
if (obj instanceof Double) {
- return new Double(-((Double) obj).doubleValue());
+ return Double.valueOf(-((Double) obj).doubleValue());
}
if (obj instanceof Integer) {
return Integer.valueOf(-((Integer) obj).intValue());
}
if (obj instanceof Float) {
- return new Float(-((Float) obj).floatValue());
+ return Float.valueOf(-((Float) obj).floatValue());
}
if (obj instanceof Short) {
return Short.valueOf((short) -((Short) obj).shortValue());
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
Tue Apr 11 20:40:36 2017
@@ -120,7 +120,7 @@ public class GenericNamingResourcesFacto
if ("java.lang.Integer".equals(paramType.getName())
|| "int".equals(paramType.getName())) {
try {
- params[0] = new Integer(value);
+ params[0] = Integer.valueOf(value);
} catch (NumberFormatException ex) {
ok = false;
}
@@ -128,7 +128,7 @@ public class GenericNamingResourcesFacto
}else if ("java.lang.Long".equals(paramType.getName())
|| "long".equals(paramType.getName())) {
try {
- params[0] = new Long(value);
+ params[0] = Long.valueOf(value);
} catch (NumberFormatException ex) {
ok = false;
}
Modified: tomcat/trunk/test/javax/el/TestArrayELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestArrayELResolver.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestArrayELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestArrayELResolver.java Tue Apr 11 20:40:36 2017
@@ -49,7 +49,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- Class<?> result = resolver.getType(context, base, new Integer(0));
+ Class<?> result = resolver.getType(context, base, Integer.valueOf(0));
Assert.assertEquals(base.getClass().getComponentType(), result);
Assert.assertTrue(context.isPropertyResolved());
@@ -65,7 +65,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.getType(context, base, new Integer(1));
+ resolver.getType(context, base, Integer.valueOf(1));
}
/**
@@ -112,7 +112,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- Object result = resolver.getValue(context, base, new Integer(0));
+ Object result = resolver.getValue(context, base, Integer.valueOf(0));
Assert.assertEquals("element", result);
Assert.assertTrue(context.isPropertyResolved());
@@ -141,12 +141,12 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- Object result = resolver.getValue(context, base, new Integer(1));
+ Object result = resolver.getValue(context, base, Integer.valueOf(1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
- result = resolver.getValue(context, base, new Integer(-1));
+ result = resolver.getValue(context, base, Integer.valueOf(-1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -192,16 +192,16 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.setValue(context, base, new Integer(0), "new-element");
+ resolver.setValue(context, base, Integer.valueOf(0), "new-element");
Assert.assertEquals("new-element",
- resolver.getValue(context, base, new Integer(0)));
+ resolver.getValue(context, base, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
- resolver.setValue(context, base, new Integer(0), null);
+ resolver.setValue(context, base, Integer.valueOf(0), null);
Assert.assertEquals(null,
- resolver.getValue(context, base, new Integer(0)));
+ resolver.getValue(context, base, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -228,7 +228,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.setValue(context, base, new Integer(1), "new-element");
+ resolver.setValue(context, base, Integer.valueOf(1), "new-element");
}
/**
@@ -242,7 +242,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.setValue(context, base, new Integer(0), new Integer(1));
+ resolver.setValue(context, base, Integer.valueOf(0),
Integer.valueOf(1));
}
/**
@@ -256,7 +256,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
int[] base = new int[] { 1, 2, 3 };
- resolver.setValue(context, base, new Integer(1), Integer.valueOf(4));
+ resolver.setValue(context, base, Integer.valueOf(1),
Integer.valueOf(4));
Assert.assertEquals(Integer.valueOf(base[1]), Integer.valueOf(4));
}
@@ -304,14 +304,14 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- boolean result = resolver.isReadOnly(context, base, new Integer(0));
+ boolean result = resolver.isReadOnly(context, base,
Integer.valueOf(0));
Assert.assertFalse(result);
Assert.assertTrue(context.isPropertyResolved());
resolver = new ArrayELResolver(true);
- result = resolver.isReadOnly(context, base, new Integer(0));
+ result = resolver.isReadOnly(context, base, Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -327,7 +327,7 @@ public class TestArrayELResolver {
ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
- resolver.isReadOnly(context, base, new Integer(1));
+ resolver.isReadOnly(context, base, Integer.valueOf(1));
}
/**
Modified: tomcat/trunk/test/javax/el/TestBeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestBeanELResolver.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestBeanELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestBeanELResolver.java Tue Apr 11 20:40:36 2017
@@ -331,7 +331,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- resolver.isReadOnly(context, new TesterBean(BEAN_NAME), new
Integer(0));
+ resolver.isReadOnly(context, new TesterBean(BEAN_NAME),
Integer.valueOf(0));
}
/**
Modified: tomcat/trunk/test/javax/el/TestListELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestListELResolver.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestListELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestListELResolver.java Tue Apr 11 20:40:36 2017
@@ -54,7 +54,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- Object result = resolver.getValue(context, list, new Integer(0));
+ Object result = resolver.getValue(context, list, Integer.valueOf(0));
Assert.assertEquals("key", result);
Assert.assertTrue(context.isPropertyResolved());
@@ -85,12 +85,12 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- Object result = resolver.getValue(context, list, new Integer(1));
+ Object result = resolver.getValue(context, list, Integer.valueOf(1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
- result = resolver.getValue(context, list, new Integer(-1));
+ result = resolver.getValue(context, list, Integer.valueOf(-1));
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -125,7 +125,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- Class<?> result = resolver.getType(context, list, new Integer(0));
+ Class<?> result = resolver.getType(context, list, Integer.valueOf(0));
Assert.assertEquals(Object.class, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -142,7 +142,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- resolver.getType(context, list, new Integer(1));
+ resolver.getType(context, list, Integer.valueOf(1));
}
/**
@@ -187,10 +187,10 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("value");
- resolver.setValue(context, list, new Integer(0), "value");
+ resolver.setValue(context, list, Integer.valueOf(0), "value");
Assert.assertEquals("value",
- resolver.getValue(context, list, new Integer(0)));
+ resolver.getValue(context, list, Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -204,7 +204,7 @@ public class TestListELResolver {
ELManager.getExpressionFactory());
List<Object> list = Collections.unmodifiableList(new ArrayList<>());
- resolver.setValue(context, list, new Integer(0), "value");
+ resolver.setValue(context, list, Integer.valueOf(0), "value");
}
/**
@@ -232,7 +232,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- resolver.setValue(context, list, new Integer(1), "value");
+ resolver.setValue(context, list, Integer.valueOf(1), "value");
}
/**
@@ -279,14 +279,14 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- boolean result = resolver.isReadOnly(context, list, new Integer(0));
+ boolean result = resolver.isReadOnly(context, list,
Integer.valueOf(0));
Assert.assertFalse(result);
Assert.assertTrue(context.isPropertyResolved());
resolver = new ListELResolver(true);
- result = resolver.isReadOnly(context, list, new Integer(0));
+ result = resolver.isReadOnly(context, list, Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -305,7 +305,7 @@ public class TestListELResolver {
list.add("key");
List<String> unmodifiableList = Collections.unmodifiableList(list);
boolean result = resolver.isReadOnly(context, unmodifiableList,
- new Integer(0));
+ Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -322,7 +322,7 @@ public class TestListELResolver {
List<String> list = new ArrayList<>();
list.add("key");
- resolver.isReadOnly(context, list, new Integer(1));
+ resolver.isReadOnly(context, list, Integer.valueOf(1));
}
/**
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Tue Apr
11 20:40:36 2017
@@ -133,8 +133,8 @@ public class TestSendFile extends Tomcat
resp.setContentLengthLong(f.length());
if
(Boolean.TRUE.equals(req.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR))) {
req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
f.getAbsolutePath());
- req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, new
Long(0));
- req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(f.length()));
+ req.setAttribute(Globals.SENDFILE_FILE_START_ATTR,
Long.valueOf(0));
+ req.setAttribute(Globals.SENDFILE_FILE_END_ATTR,
Long.valueOf(f.length()));
} else {
byte[] c = new byte[8192];
try (BufferedInputStream in = new BufferedInputStream(new
FileInputStream(f))) {
@@ -203,8 +203,8 @@ public class TestSendFile extends Tomcat
resp.setCharacterEncoding("ISO-8859-1");
resp.setContentLengthLong(file.length());
req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
file.getAbsolutePath());
- req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, new
Long(0));
- req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(file.length()));
+ req.setAttribute(Globals.SENDFILE_FILE_START_ATTR,
Long.valueOf(0));
+ req.setAttribute(Globals.SENDFILE_FILE_END_ATTR,
Long.valueOf(file.length()));
file.delete();
} else {
byte[] c = new byte[1024];
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Tue Apr 11 20:40:36 2017
@@ -77,7 +77,7 @@ public final class IntrospectionUtils {
if ("java.lang.Integer".equals(paramType.getName())
|| "int".equals(paramType.getName())) {
try {
- params[0] = new Integer(value);
+ params[0] = Integer.valueOf(value);
} catch (NumberFormatException ex) {
ok = false;
}
@@ -85,7 +85,7 @@ public final class IntrospectionUtils {
}else if ("java.lang.Long".equals(paramType.getName())
|| "long".equals(paramType.getName())) {
try {
- params[0] = new Long(value);
+ params[0] = Long.valueOf(value);
} catch (NumberFormatException ex) {
ok = false;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1791027&r1=1791026&r2=1791027&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 11 20:40:36 2017
@@ -140,6 +140,10 @@
signing service to use the now mandatory 2-factor authentication.
(markt)
</fix>
+ <scode>
+ Refactoring in preparation for Java 9. Refactor to avoid using some
+ methods that will be deprecated in Java 9 onwards. (markt)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
