Sync RuntimeProcess with upstream Eclipse platform

client/jars/org.jboss.tools.rsp.client.cli/src/main/java/org/jboss/tools/rsp/client/bindings/ServerManagementClientImpl.java

@@ -123,7 +123,8 @@ public static String getRunStateString(int state) {
 		case ServerManagementAPIConstants.STATE_STOPPING:
 			stateString = "stopping";
 			break;
-
+		default:
+			break;
 		}
 		return stateString;
 	}
@@ -149,7 +150,8 @@ public static String getPublishStateString(int state) {
 		case ServerManagementAPIConstants.PUBLISH_STATE_UNKNOWN:
 			stateString = "unknown";
 			break;
-
+		default:
+			break;
 		}
 		return stateString;
 	}

client/jars/org.jboss.tools.rsp.client.cli/src/main/java/org/jboss/tools/rsp/client/cli/ServerManagementCLI.java

@@ -10,6 +10,7 @@
 
 import java.io.Console;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
@@ -113,7 +114,7 @@ protected String getUserInput() {
 			}
 		}
 		if (scanner == null) {
-			scanner = new Scanner(System.in);
+			scanner = new Scanner(System.in, StandardCharsets.UTF_8);
 		}
 		return scanner.nextLine();
 	}

client/jars/org.jboss.tools.rsp.client.cli/src/main/java/org/jboss/tools/rsp/client/cli/StandardCommandHandler.java

@@ -825,11 +825,9 @@ protected ServerHandle findServer(String id, ServerManagementClientLauncher laun
 
 		protected void printAttr(Attributes attr) {
 			Map<String, Attribute> map = attr.getAttributes();
-			Iterator<String> kit = map.keySet().iterator();
-			while (kit.hasNext()) {
-				String key = kit.next();
-				Attribute val = map.get(key);
-				System.out.println(key);
+			for (Map.Entry<String, Attribute> entry : map.entrySet()) {
+				Attribute val = entry.getValue();
+				System.out.println(entry.getKey());
 				System.out.println("    type=" + val.getType());
 				System.out.println("    desc=" + val.getDescription());
 				System.out.println("    defaultVal=" + val.getDefaultVal());
@@ -929,14 +927,12 @@ private static void handleSinglePrompt(WorkflowResponseItem item, HashMap<String
 	}
 
 	private ServerManagementClientLauncher launcher;
-	private InputProvider provider;
 	private PromptAssistant assistant;
 	private boolean done = false;
 	private boolean shown = false;
 
 	public StandardCommandHandler(ServerManagementClientLauncher launcher, InputProvider provider) {
 		this.launcher = launcher;
-		this.provider = provider;
 		this.assistant = new PromptAssistant(launcher, provider);
 	}
 

framework/bundles/org.jboss.tools.rsp.foundation.core/src/main/java/org/jboss/tools/rsp/foundation/core/launchers/ProcessUtility.java

@@ -16,7 +16,6 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -145,11 +144,8 @@ public static String[] convertEnvironment(Map<String, String> env) {
 
 		// Convert the combined map into a form that can be used to launch process
 		ArrayList<String> ret = new ArrayList<>();
-		Iterator<String> it = original.keySet().iterator();
-		String working = null;
-		while (it.hasNext()) {
-			working = it.next();
-			ret.add(working + "=" + original.get(working)); //$NON-NLS-1$
+		for (Map.Entry<String, String> entry : original.entrySet()) {
+			ret.add(entry.getKey() + "=" + entry.getValue()); //$NON-NLS-1$
 		}
 		return ret.toArray(new String[ret.size()]);
 	}

framework/bundles/org.jboss.tools.rsp.foundation.core/src/main/java/org/jboss/tools/rsp/foundation/core/launchers/StreamGobbler.java

@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,7 +46,7 @@ private synchronized List<String> getList() {
 	@Override
 	public void run() {
 		try {
-			InputStreamReader isr = new InputStreamReader(is);
+			InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
 			BufferedReader br = new BufferedReader(isr);
 			String line = null;
 			while (!isCanceled() && (line = br.readLine()) != null)

framework/bundles/org.jboss.tools.rsp.foundation.core/src/main/java/org/jboss/tools/rsp/foundation/core/transport/URLTransportCache.java

@@ -20,6 +20,7 @@
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -473,8 +474,8 @@ private HttpURLConnection getURLConnection(URL url, String user, String pass, in
 		HttpURLConnection.setFollowRedirects(true);
 		if( user != null && pass != null ) {
 			String authString = user + ":" + pass;
-			byte[] authEncBytes = Base64.getEncoder().encode(authString.getBytes());
-			String authStringEnc = new String(authEncBytes);
+			byte[] authEncBytes = Base64.getEncoder().encode(authString.getBytes(StandardCharsets.UTF_8));
+			String authStringEnc = new String(authEncBytes, StandardCharsets.UTF_8);
 			urlConnection.setRequestProperty("Authorization", "Basic " + authStringEnc);			
 		}
 		return urlConnection;

framework/bundles/org.jboss.tools.rsp.launching.java/src/main/java/org/jboss/tools/rsp/eclipse/jdt/internal/launching/StandardVMDebugger.java

@@ -17,7 +17,6 @@
 import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -273,11 +272,10 @@ protected String[] prependJREPath(String[] env, IPath jdkpath) {
 				if(env == null){
 					Map<String, String> map = NativeEnvironmentUtils.getDefault().getNativeEnvironment();
 					env = new String[map.size()];
-					String var = null;
 					int index = 0;
-					for(Iterator<String> iter = map.keySet().iterator(); iter.hasNext();) {
-						var = iter.next();
-						String value = map.get(var);
+					for(Map.Entry<String, String> entry : map.entrySet()) {
+						String var = entry.getKey();
+						String value = entry.getValue();
 						if (value == null) {
 							value = ""; //$NON-NLS-1$
 						}

framework/bundles/org.jboss.tools.rsp.launching.java/src/main/java/org/jboss/tools/rsp/internal/launching/java/util/LaunchingSupportUtils.java

@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -296,7 +297,7 @@ private HashMap<String, String> parseSysprops(IProcess process, String text) thr
 		HashMap<String, String> map = new HashMap<String, String>();
 		try {
 			DocumentBuilder parser = getParser();
-			Document document = parser.parse(new ByteArrayInputStream(text.getBytes()));
+			Document document = parser.parse(new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8)));
 			Element envs = document.getDocumentElement();
 			NodeList list = envs.getChildNodes();
 			int length = list.getLength();

framework/bundles/org.jboss.tools.rsp.launching/src/main/java/org/jboss/tools/rsp/eclipse/core/runtime/Path.java

@@ -588,7 +588,7 @@ public boolean equals(Object obj) {
 			if (!segments[i].equals(targetSegments[i]))
 				return false;
 		//check device last (least likely to differ)
-		return device == target.device || (device != null && device.equals(target.device));
+		return (device == null ? target.device == null : device.equals(target.device));
 	}
 
 	/* (Intentionally not included in javadoc)