Cleanup Java source code

jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Reply.java

@@ -1,7 +1,7 @@
 /*[INCLUDE-IF Sidecar16]*/
 package com.ibm.tools.attach.target;
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corp. and others
+ * Copyright (c) 2009, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -112,7 +112,7 @@ static Reply readReply(String path) throws IOException {
 			String line = replyStream.readLine();
 			replyStream.close();
 			try {
-				rply.portNumber= new Integer(line);
+				rply.portNumber = Integer.valueOf(line);
 			} catch (NumberFormatException e) {
 				rply.portNumber = Integer.valueOf(-1);
 				throw new IOException(e.getMessage());

jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/AvailableProcessorsNotificationInfoUtil.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar17]*/
 /*******************************************************************************
- * Copyright (c) 2016, 2016 IBM Corp. and others
+ * Copyright (c) 2016, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -81,7 +81,7 @@ public static CompositeData toCompositeData(AvailableProcessorsNotificationInfo
 		if (info != null) {
 			CompositeType type = getCompositeType();
 			String[] names = { "newAvailableProcessors" }; //$NON-NLS-1$
-			Object[] values = { new Integer(info.getNewAvailableProcessors()) };
+			Object[] values = { Integer.valueOf(info.getNewAvailableProcessors()) };
 
 			try {
 				result = new CompositeDataSupport(type, names, values);

jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessingCapacityNotificationInfoUtil.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar17]*/
 /*******************************************************************************
- * Copyright (c) 2016, 2016 IBM Corp. and others
+ * Copyright (c) 2016, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -81,7 +81,7 @@ public static CompositeData toCompositeData(ProcessingCapacityNotificationInfo i
 		if (info != null) {
 			CompositeType type = getCompositeType();
 			String[] names = { "newProcessingCapacity" }; //$NON-NLS-1$
-			Object[] values = { new Integer(info.getNewProcessingCapacity()) };
+			Object[] values = { Integer.valueOf(info.getNewProcessingCapacity()) };
 
 			try {
 				result = new CompositeDataSupport(type, names, values);

jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/TotalPhysicalMemoryNotificationInfoUtil.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar17]*/
 /*******************************************************************************
- * Copyright (c) 2016, 2016 IBM Corp. and others
+ * Copyright (c) 2016, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -73,7 +73,7 @@ public static CompositeData toCompositeData(TotalPhysicalMemoryNotificationInfo
 		if (info != null) {
 			CompositeType type = getCompositeType();
 			String[] names = { "newTotalPhysicalMemory" }; //$NON-NLS-1$
-			Object[] values = { new Long(info.getNewTotalPhysicalMemory()) };
+			Object[] values = { Long.valueOf(info.getNewTotalPhysicalMemory()) };
 
 			try {
 				result = new CompositeDataSupport(type, names, values);

jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Cuda.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF CUDA4J | Sidecar19-SE]*/
 /*******************************************************************************
- * Copyright (c) 2013, 2017 IBM Corp. and others
+ * Copyright (c) 2013, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -70,7 +70,7 @@ private Cleaner() {
 		}
 
 		ByteBuffer insert(ByteBuffer buffer, long address) {
-			inuse.put(new WeakReference<>(buffer, queue), new Long(address));
+			inuse.put(new WeakReference<>(buffer, queue), Long.valueOf(address));
 
 			return buffer;
 		}

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/CommonAddressSpace.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 2004, 2017 IBM Corp. and others
+ * Copyright (c) 2004, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -38,7 +38,7 @@ public abstract class CommonAddressSpace implements IAbstractAddressSpace {
 	private static final int MEMORY_CHECK_THRESHOLD = 0x100000;
 
 	private MemoryRange[] _translations;
-	private Integer _lastTranslationUsed = new Integer(0);
+	private Integer _lastTranslationUsed = Integer.valueOf(0);
 	private boolean _isLittleEndian;
 	private boolean _is64Bit;
 	private int lastAsid;
@@ -177,7 +177,7 @@ protected static int findWhichMemoryRange(int asid, long addr, MemoryRange[] ran
 			}
 		}
 		if (-1 != retI) {
-			lastRange = new Integer(retI);
+			lastRange = Integer.valueOf(retI);
 		}
 		return retI;
 	}

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/LayeredAddressSpace.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 2004, 2017 IBM Corp. and others
+ * Copyright (c) 2004, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -41,7 +41,7 @@ public class LayeredAddressSpace extends CommonAddressSpace
 	private TreeMap _moduleRanges = new TreeMap();
 	private IAbstractAddressSpace _base;
 	private MemoryRange[] _moduleRangesArray = null; 
-	private Integer _lastModuleRange = new Integer(0);
+	private Integer _lastModuleRange = Integer.valueOf(0);
 
 	public LayeredAddressSpace(IAbstractAddressSpace base, boolean isLittleEndian, boolean is64Bit)
 	{

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix32Dump.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 1991, 2017 IBM Corp. and others
+ * Copyright (c) 1991, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -57,18 +57,18 @@ protected int pointerSize() {
 	protected Map readRegisters(long threadOffset) throws IOException {
 		Map registers = new TreeMap();
 		coreSeek(threadOffset + CONTEXT_OFFSET_IN_THREAD + IAR_OFFSET_IN_CONTEXT);
-		registers.put("iar", new Integer(coreReadInt()));
-		registers.put("msr", new Integer(coreReadInt()));
-		registers.put("cr", new Integer(coreReadInt()));
-		registers.put("lr", new Integer(coreReadInt()));
-		registers.put("ctr", new Integer(coreReadInt()));
-		registers.put("xer", new Integer(coreReadInt()));
-		registers.put("mq", new Integer(coreReadInt()));
-		registers.put("tid", new Integer(coreReadInt()));
-		registers.put("fpscr", new Integer(coreReadInt()));
+		registers.put("iar", Integer.valueOf(coreReadInt()));
+		registers.put("msr", Integer.valueOf(coreReadInt()));
+		registers.put("cr", Integer.valueOf(coreReadInt()));
+		registers.put("lr", Integer.valueOf(coreReadInt()));
+		registers.put("ctr", Integer.valueOf(coreReadInt()));
+		registers.put("xer", Integer.valueOf(coreReadInt()));
+		registers.put("mq", Integer.valueOf(coreReadInt()));
+		registers.put("tid", Integer.valueOf(coreReadInt()));
+		registers.put("fpscr", Integer.valueOf(coreReadInt()));
 		coreSeek(threadOffset + CONTEXT_OFFSET_IN_THREAD + GPR_OFFSET_IN_CONTEXT);
 		for (int i = 0; i < GPR_COUNT; i++)
-			registers.put("gpr" + i, new Integer(coreReadInt()));
+			registers.put("gpr" + i, Integer.valueOf(coreReadInt()));
 		return registers;
 	}
 

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix64Dump.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 1991, 2017 IBM Corp. and others
+ * Copyright (c) 1991, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -74,14 +74,14 @@ protected Map readRegisters(long threadOffset) throws IOException {
 		coreSeek(threadOffset + sizeofThreadEntry64);
 		Map registers = new TreeMap();
 		for (int i = 0; i < GPR_COUNT; i++)
-			registers.put("gpr" + i, new Long(coreReadLong()));
-		registers.put("msr", new Long(coreReadLong()));
-		registers.put("iar", new Long(coreReadLong()));
-		registers.put("lr", new Long(coreReadLong()));
-		registers.put("ctr", new Long(coreReadLong()));
-		registers.put("cr", new Integer(coreReadInt()));
-		registers.put("xer", new Integer(coreReadInt()));
-		registers.put("fpscr", new Integer(coreReadInt()));
+			registers.put("gpr" + i, Long.valueOf(coreReadLong()));
+		registers.put("msr", Long.valueOf(coreReadLong()));
+		registers.put("iar", Long.valueOf(coreReadLong()));
+		registers.put("lr", Long.valueOf(coreReadLong()));
+		registers.put("ctr", Long.valueOf(coreReadLong()));
+		registers.put("cr", Integer.valueOf(coreReadInt()));
+		registers.put("xer", Integer.valueOf(coreReadInt()));
+		registers.put("fpscr", Integer.valueOf(coreReadInt()));
 		return registers;
 	}
 

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewAixDump.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 2004, 2017 IBM Corp. and others
+ * Copyright (c) 2004, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -457,7 +457,7 @@ private Properties getEnvironmentVariables(long environmentAddress) throws IOExc
 		}
 		long address = coreReadAddress();
 		while (address != 0) {
-			addresses.add(new Long(address));
+			addresses.add(Long.valueOf(address));
 			address = coreReadAddress();
 		}
 

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewElfDump.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 2004, 2017 IBM Corp. and others
+ * Copyright (c) 2004, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -106,7 +106,7 @@ Address add(long offset) {
     		return new Address32((int) result);
     	}
     	Number asNumber() {
-    		return new Integer((int) getValue());
+    		return Integer.valueOf((int) getValue());
     	}
     	long asAddress() {
     		return getValue();
@@ -156,7 +156,7 @@ Address add(long offset) {
     		return new Address64(getValue() + offset);
     	}
     	Number asNumber() {
-    		return new Long(getValue());
+    		return Long.valueOf(getValue());
     	}
     	long asAddress() {
     		return getValue();

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewWinDump.java

@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 2004, 2017 IBM Corp. and others
+ * Copyright (c) 2004, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -25,7 +25,6 @@
 import java.io.IOException;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -734,54 +733,54 @@ private List readIntelRegisters(MiniDump dump, Builder builder, long contextRva,
 				// We capture segment registers, flags, integer registers and instruction pointer
 				dump.coreSeek(contextRva + 140);
 				List registers = new ArrayList();
-				registers.add(builder.buildRegister("gs", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("fs", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("es", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("ds", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("edi", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("esi", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("ebx", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("edx", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("ecx", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("eax", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("ebp", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("eip", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("cs", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("flags", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("esp", new Integer(dump.coreReadInt())));
-				registers.add(builder.buildRegister("ss", new Integer(dump.coreReadInt())));
+				registers.add(builder.buildRegister("gs", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("fs", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("es", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("ds", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("edi", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("esi", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("ebx", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("edx", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("ecx", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("eax", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("ebp", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("eip", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("cs", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("flags", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("esp", Integer.valueOf(dump.coreReadInt())));
+				registers.add(builder.buildRegister("ss", Integer.valueOf(dump.coreReadInt())));
 				return registers;
 			}
 
 			private List readAmd64Registers(MiniDump dump, Builder builder, long contextRva, long contextDataSize) throws IOException {
 				// We capture segment registers, flags, integer registers and instruction pointer
 				dump.coreSeek(contextRva + 56);
 				List registers = new ArrayList();
-				registers.add(builder.buildRegister("cs", new Short(dump.coreReadShort())));
-				registers.add(builder.buildRegister("ds", new Short(dump.coreReadShort())));
-				registers.add(builder.buildRegister("es", new Short(dump.coreReadShort())));
-				registers.add(builder.buildRegister("fs", new Short(dump.coreReadShort())));
-				registers.add(builder.buildRegister("gs", new Short(dump.coreReadShort())));
-				registers.add(builder.buildRegister("ss", new Short(dump.coreReadShort())));
-				registers.add(builder.buildRegister("flags", new Integer(dump.coreReadInt())));
+				registers.add(builder.buildRegister("cs", Short.valueOf(dump.coreReadShort())));
+				registers.add(builder.buildRegister("ds", Short.valueOf(dump.coreReadShort())));
+				registers.add(builder.buildRegister("es", Short.valueOf(dump.coreReadShort())));
+				registers.add(builder.buildRegister("fs", Short.valueOf(dump.coreReadShort())));
+				registers.add(builder.buildRegister("gs", Short.valueOf(dump.coreReadShort())));
+				registers.add(builder.buildRegister("ss", Short.valueOf(dump.coreReadShort())));
+				registers.add(builder.buildRegister("flags", Integer.valueOf(dump.coreReadInt())));
 				dump.coreSeek(contextRva + 120);
-				registers.add(builder.buildRegister("eax", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("ecx", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("edx", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("ebx", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("esp", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("ebp", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("esi", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("edi", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r8", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r9", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r10", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r11", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r12", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r13", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r14", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("r15", new Long(dump.coreReadLong())));
-				registers.add(builder.buildRegister("ip", new Long(dump.coreReadLong())));
+				registers.add(builder.buildRegister("eax", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("ecx", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("edx", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("ebx", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("esp", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("ebp", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("esi", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("edi", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r8", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r9", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r10", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r11", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r12", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r13", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r14", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("r15", Long.valueOf(dump.coreReadLong())));
+				registers.add(builder.buildRegister("ip", Long.valueOf(dump.coreReadLong())));
 				return registers;
 			}
 		}