XStream modules are using to be deleted Java APIs - Java9 version x-stream#211

gorky · gorky · commit f63a84d0842f · 2020-07-29T16:03:04.000-05:00
x-stream#211 Updates from CodeUpdater https://j2eeguys.com/updater/ Signed-off-by: Steve Davidson <steve@j2eeguys.com>
diff --git a/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/model/Five.java b/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/model/Five.java
@@ -39,6 +39,6 @@ public boolean equals(Object obj) {
     }
 
     public int hashCode() {
-        return super.hashCode() + two + new Boolean(three).hashCode() + five.toString().hashCode();
+        return super.hashCode() + two + Boolean.valueOf(three).hashCode() + five.toString().hashCode();
     }
 }
diff --git a/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/model/FiveBean.java b/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/model/FiveBean.java
@@ -63,6 +63,6 @@ public boolean equals(Object obj) {
     }
 
     public int hashCode() {
-        return super.hashCode() + two + new Boolean(three).hashCode() + five.toString().hashCode();
+        return super.hashCode() + two + Boolean.valueOf(three).hashCode() + five.toString().hashCode();
     }
 }
diff --git a/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/model/SerializableFive.java b/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/model/SerializableFive.java
@@ -52,6 +52,6 @@ public boolean equals(Object obj) {
     }
 
     public int hashCode() {
-        return super.hashCode() + two + new Boolean(three).hashCode() + five.toString().hashCode();
+        return super.hashCode() + two + Boolean.valueOf(three).hashCode() + five.toString().hashCode();
     }
 }
diff --git a/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/targets/BasicTarget.java b/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/targets/BasicTarget.java
@@ -31,14 +31,14 @@ public class BasicTarget implements Target {
     
     public BasicTarget() {
         list = new ArrayList();
-        list.add(new Integer(1));
-        list.add(new Byte((byte)2));
-        list.add(new Short((short)3));
-        list.add(new Long(4));
+        list.add(Integer.valueOf(1));
+        list.add(Byte.valueOf((byte)2));
+        list.add(Short.valueOf((short)3));
+        list.add(Long.valueOf(4));
         list.add("Profile");
         list.add(Boolean.TRUE);
-        list.add(new Float(1.2f));
-        list.add(new Double(1.2f));
+        list.add(Float.valueOf(1.2f));
+        list.add(Double.valueOf(1.2f));
         list.add(new File("profile.txt"));
         list.add(Locale.ENGLISH);
     }
diff --git a/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/targets/ExtendedTarget.java b/xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/targets/ExtendedTarget.java
@@ -87,7 +87,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
             if (method.equals(EQUALS)) {
                 return new Boolean(args[0] instanceof Runnable);
             } else if (method.getName().equals("hashCode")) {
-                return new Integer(System.identityHashCode(proxy));
+                return Integer.valueOf(System.identityHashCode(proxy));
             } else if (method.getName().equals("toString")) {
                 return "Proxy" + System.identityHashCode(proxy);
             } else if (method.getName().equals("getClass")) {
diff --git a/xstream/src/java/com/thoughtworks/xstream/converters/basic/CharConverter.java b/xstream/src/java/com/thoughtworks/xstream/converters/basic/CharConverter.java
@@ -42,7 +42,7 @@ public void marshal(final Object source, final HierarchicalStreamWriter writer,
     public Object unmarshal(final HierarchicalStreamReader reader, final UnmarshallingContext context) {
         final String nullAttribute = reader.getAttribute("null");
         if (nullAttribute != null && nullAttribute.equals("true")) {
-            return new Character('\0');
+            return Character.valueOf('\0');
         } else {
             return fromString(reader.getValue());
         }
diff --git a/xstream/src/java/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.java b/xstream/src/java/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.java
@@ -156,7 +156,7 @@ public void marshal(final Object source, final HierarchicalStreamWriter writer,
         }
         try {
             final Field field = type.getDeclaredField("serialVersionUID");
-            if (!field.isAccessible()) {
+            if (!(java.lang.reflect.Modifier.isStatic(field.getModifiers()) ? field.canAccess(null) : field.canAccess(source))) {
                 field.setAccessible(true);
             }
             final long serialVersionUID = field.getLong(null);
@@ -186,7 +186,7 @@ private Callback[] getCallbacks(final Object source) {
             for (int i = 0; true; ++i) {
                 try {
                     final Field field = type.getDeclaredField(CALLBACK_MARKER + i);
-                    if (!field.isAccessible()) {
+                    if (!(java.lang.reflect.Modifier.isStatic(field.getModifiers()) ? field.canAccess(null) : field.canAccess(source))) {
                         field.setAccessible(true);
                     }
                     fields.add(field);
@@ -246,7 +246,7 @@ private Callback[] getCallbacks(final Object source) {
             }
             for (final Iterator<Method> iter = methods.iterator(); iter.hasNext();) {
                 final Method method = iter.next();
-                if (!method.isAccessible()) {
+                if (!(java.lang.reflect.Modifier.isStatic(method.getModifiers()) ? method.canAccess(null) : method.canAccess(source))) {
                     method.setAccessible(true);
                 }
                 if (Factory.class.isAssignableFrom(method.getDeclaringClass())
@@ -301,19 +301,19 @@ private Object[] createNullArguments(final Class<?>[] parameterTypes) {
             final Class<?> type = parameterTypes[i];
             if (type.isPrimitive()) {
                 if (type == byte.class) {
-                    arguments[i] = new Byte((byte)0);
+                    arguments[i] = Byte.valueOf((byte)0);
                 } else if (type == short.class) {
-                    arguments[i] = new Short((short)0);
+                    arguments[i] = Short.valueOf((short)0);
                 } else if (type == int.class) {
-                    arguments[i] = new Integer(0);
+                    arguments[i] = Integer.valueOf(0);
                 } else if (type == long.class) {
-                    arguments[i] = new Long(0);
+                    arguments[i] = Long.valueOf(0);
                 } else if (type == float.class) {
-                    arguments[i] = new Float(0);
+                    arguments[i] = Float.valueOf(0);
                 } else if (type == double.class) {
-                    arguments[i] = new Double(0);
+                    arguments[i] = Double.valueOf(0);
                 } else if (type == char.class) {
-                    arguments[i] = new Character('\0');
+                    arguments[i] = Character.valueOf('\0');
                 } else {
                     arguments[i] = Boolean.FALSE;
                 }
diff --git a/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ExternalizableConverter.java b/xstream/src/java/com/thoughtworks/xstream/converters/reflection/ExternalizableConverter.java
@@ -149,7 +149,7 @@ public Object unmarshal(final HierarchicalStreamReader reader, final Unmarshalli
         final Constructor<?> defaultConstructor;
         try {
             defaultConstructor = type.getDeclaredConstructor();
-            if (!defaultConstructor.isAccessible()) {
+            if (!defaultConstructor.canAccess(null)) {
                 defaultConstructor.setAccessible(true);
             }
             final Externalizable externalizable = (Externalizable)defaultConstructor.newInstance();
diff --git a/xstream/src/java/com/thoughtworks/xstream/converters/reflection/PureJavaReflectionProvider.java b/xstream/src/java/com/thoughtworks/xstream/converters/reflection/PureJavaReflectionProvider.java
@@ -65,7 +65,7 @@ public Object newInstance(final Class<?> type) {
         try {
             for (final Constructor<?> constructor : type.getDeclaredConstructors()) {
                 if (constructor.getParameterTypes().length == 0) {
-                    if (!constructor.isAccessible()) {
+                    if (!constructor.canAccess(null)) {
                         constructor.setAccessible(true);
                     }
                     return constructor.newInstance(new Object[0]);
diff --git a/xstream/src/java/com/thoughtworks/xstream/core/JVM.java b/xstream/src/java/com/thoughtworks/xstream/core/JVM.java
@@ -119,13 +119,13 @@ static class Test {
                     final Test t = (Test)provider.newInstance(Test.class);
                     try {
                         provider.writeField(t, "o", "object", Test.class);
-                        provider.writeField(t, "c", new Character('c'), Test.class);
-                        provider.writeField(t, "b", new Byte((byte)1), Test.class);
-                        provider.writeField(t, "s", new Short((short)1), Test.class);
-                        provider.writeField(t, "i", new Integer(1), Test.class);
-                        provider.writeField(t, "l", new Long(1), Test.class);
-                        provider.writeField(t, "f", new Float(1), Test.class);
-                        provider.writeField(t, "d", new Double(1), Test.class);
+                        provider.writeField(t, "c", Character.valueOf('c'), Test.class);
+                        provider.writeField(t, "b", Byte.valueOf((byte)1), Test.class);
+                        provider.writeField(t, "s", Short.valueOf((short)1), Test.class);
+                        provider.writeField(t, "i", Integer.valueOf(1), Test.class);
+                        provider.writeField(t, "l", Long.valueOf(1), Test.class);
+                        provider.writeField(t, "f", Float.valueOf(1), Test.class);
+                        provider.writeField(t, "d", Double.valueOf(1), Test.class);
                         provider.writeField(t, "bool", Boolean.TRUE, Test.class);
                         test = true;
                     } catch (final IncompatibleClassChangeError e) {
diff --git a/xstream/src/java/com/thoughtworks/xstream/core/util/Primitives.java b/xstream/src/java/com/thoughtworks/xstream/core/util/Primitives.java
@@ -32,8 +32,8 @@ public final class Primitives {
             {Integer.TYPE, Integer.class}, {Long.TYPE, Long.class}, {Float.TYPE, Float.class},
             {Double.TYPE, Double.class}, {Boolean.TYPE, Boolean.class}, {Void.TYPE, Void.class},};
         final Character[] representingChars = {
-            new Character('B'), new Character('C'), new Character('S'), new Character('I'), new Character('J'),
-            new Character('F'), new Character('D'), new Character('Z'), null};
+            Character.valueOf('B'), Character.valueOf('C'), Character.valueOf('S'), Character.valueOf('I'), Character.valueOf('J'),
+            Character.valueOf('F'), Character.valueOf('D'), Character.valueOf('Z'), null};
         for (int i = 0; i < boxing.length; i++) {
             final Class<?> primitiveType = boxing[i][0];
             final Class<?> boxedType = boxing[i][1];
diff --git a/xstream/src/java/com/thoughtworks/xstream/io/path/PathTracker.java b/xstream/src/java/com/thoughtworks/xstream/io/path/PathTracker.java
@@ -85,9 +85,9 @@ public void pushElement(final String name) {
             indexMapStack[pointer] = indexMap;
         }
         if (indexMap.containsKey(name)) {
-            indexMap.put(name, new Integer(indexMap.get(name).intValue() + 1));
+            indexMap.put(name, Integer.valueOf(indexMap.get(name).intValue() + 1));
         } else {
-            indexMap.put(name, new Integer(1));
+            indexMap.put(name, Integer.valueOf(1));
         }
         pointer++;
         currentPath = null;
diff --git a/xstream/src/java/com/thoughtworks/xstream/persistence/XmlArrayList.java b/xstream/src/java/com/thoughtworks/xstream/persistence/XmlArrayList.java
@@ -50,7 +50,7 @@ public void add(final int index, final V element) {
         for (int i = size; i > to; i--) {
             map.put(Integer.valueOf(i + 1), map.get(Integer.valueOf(i)));
         }
-        map.put(new Integer(index), element);
+        map.put(Integer.valueOf(index), element);
     }
 
     private void rangeCheck(final int index) {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ public boolean equals(Object obj) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public int hashCode() {`
`42`		`- return super.hashCode() + two + new Boolean(three).hashCode() + five.toString().hashCode();`
	`42`	`+ return super.hashCode() + two + Boolean.valueOf(three).hashCode() + five.toString().hashCode();`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,6 @@ public boolean equals(Object obj) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public int hashCode() {`
`66`		`- return super.hashCode() + two + new Boolean(three).hashCode() + five.toString().hashCode();`
	`66`	`+ return super.hashCode() + two + Boolean.valueOf(three).hashCode() + five.toString().hashCode();`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ public boolean equals(Object obj) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public int hashCode() {`
`55`		`- return super.hashCode() + two + new Boolean(three).hashCode() + five.toString().hashCode();`
	`55`	`+ return super.hashCode() + two + Boolean.valueOf(three).hashCode() + five.toString().hashCode();`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void marshal(final Object source, final HierarchicalStreamWriter writer,`
`42`	`42`	`public Object unmarshal(final HierarchicalStreamReader reader, final UnmarshallingContext context) {`
`43`	`43`	`final String nullAttribute = reader.getAttribute("null");`
`44`	`44`	`if (nullAttribute != null && nullAttribute.equals("true")) {`
`45`		`- return new Character('\0');`
	`45`	`+ return Character.valueOf('\0');`
`46`	`46`	`} else {`
`47`	`47`	`return fromString(reader.getValue());`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public Object unmarshal(final HierarchicalStreamReader reader, final Unmarshalli`
`149`	`149`	`final Constructor<?> defaultConstructor;`
`150`	`150`	`try {`
`151`	`151`	`defaultConstructor = type.getDeclaredConstructor();`
`152`		`- if (!defaultConstructor.isAccessible()) {`
	`152`	`+ if (!defaultConstructor.canAccess(null)) {`
`153`	`153`	`defaultConstructor.setAccessible(true);`
`154`	`154`	`}`
`155`	`155`	`final Externalizable externalizable = (Externalizable)defaultConstructor.newInstance();`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public Object newInstance(final Class<?> type) {`
`65`	`65`	`try {`
`66`	`66`	`for (final Constructor<?> constructor : type.getDeclaredConstructors()) {`
`67`	`67`	`if (constructor.getParameterTypes().length == 0) {`
`68`		`- if (!constructor.isAccessible()) {`
	`68`	`+ if (!constructor.canAccess(null)) {`
`69`	`69`	`constructor.setAccessible(true);`
`70`	`70`	`}`
`71`	`71`	`return constructor.newInstance(new Object[0]);`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,9 @@ public void pushElement(final String name) {`
`85`	`85`	`indexMapStack[pointer] = indexMap;`
`86`	`86`	`}`
`87`	`87`	`if (indexMap.containsKey(name)) {`
`88`		`- indexMap.put(name, new Integer(indexMap.get(name).intValue() + 1));`
	`88`	`+ indexMap.put(name, Integer.valueOf(indexMap.get(name).intValue() + 1));`
`89`	`89`	`} else {`
`90`		`- indexMap.put(name, new Integer(1));`
	`90`	`+ indexMap.put(name, Integer.valueOf(1));`
`91`	`91`	`}`
`92`	`92`	`pointer++;`
`93`	`93`	`currentPath = null;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void add(final int index, final V element) {`
`50`	`50`	`for (int i = size; i > to; i--) {`
`51`	`51`	`map.put(Integer.valueOf(i + 1), map.get(Integer.valueOf(i)));`
`52`	`52`	`}`
`53`		`- map.put(new Integer(index), element);`
	`53`	`+ map.put(Integer.valueOf(index), element);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`private void rangeCheck(final int index) {`