Java 21: fix deprecation warnings caused by Java update (#2922)

Sn0w3y · web-flow · commit d4d0df49c36a · 2024-12-13T13:32:47.000+01:00
See #2890
diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooUtils.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooUtils.java
@@ -6,7 +6,7 @@
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -101,7 +101,9 @@ public static SuccessResponseAndHeaders sendJsonrpcRequest(String url, String co
 		HttpURLConnection connection = null;
 		try {
 			// Open connection to Odoo
-			connection = (HttpURLConnection) new URL(url).openConnection();
+			connection = (HttpURLConnection) URI.create(url) //
+					.toURL() //
+					.openConnection(); //
 			connection.setConnectTimeout(5000);// 5 secs
 			connection.setReadTimeout(timeout);// 5 secs
 			connection.setRequestProperty("Accept-Charset", "US-ASCII");
@@ -276,8 +278,9 @@ private static Object executeKw(Credentials creds, String model, String action,
 	private static Object executeKw(Credentials creds, String model, String action, Object[] arg, Map<String, ?> kw)
 			throws MalformedURLException, XMLRPCException {
 		var params = new Object[] { creds.getDatabase(), creds.getUid(), creds.getPassword(), model, action, arg, kw };
-		var client = new XMLRPCClient(new URL(String.format("%s/xmlrpc/2/object", creds.getUrl())),
-				XMLRPCClient.FLAGS_NIL);
+		var uri = URI.create(String.format("%s/xmlrpc/2/object", creds.getUrl()));
+		var client = new XMLRPCClient(uri.toURL(), XMLRPCClient.FLAGS_NIL);
+
 		client.setTimeout(60 /* seconds */);
 		return client.call("execute_kw", params);
 	}
@@ -557,9 +560,9 @@ protected static byte[] getOdooReport(Credentials credentials, String report, in
 
 		HttpURLConnection connection = null;
 		try {
-			connection = (HttpURLConnection) new URL(
-					credentials.getUrl() + "/report/pdf/" + report + "/" + id + "?session_id=" + session)
-					.openConnection();
+			connection = (HttpURLConnection) URI
+					.create(credentials.getUrl() + "/report/pdf/" + report + "/" + id + "?session_id=" + session)
+					.toURL().openConnection();
 			connection.setConnectTimeout(5000);
 			connection.setReadTimeout(5000);
 			connection.setRequestMethod("GET");
diff --git a/io.openems.common/test/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponseTest.java b/io.openems.common/test/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesExportXlsxResponseTest.java
@@ -70,7 +70,7 @@ private byte[] generateXlsxFile() throws OpenemsNamedException, IOException {
 		) {
 			var ws = workbook.newWorksheet("Export");
 
-			Locale currentLocale = new Locale("en", "EN");
+			Locale currentLocale = Locale.of("en", "EN");
 
 			var translationBundle = ResourceBundle.getBundle("io.openems.common.jsonrpc.response.translation",
 					currentLocale);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java
@@ -230,7 +230,11 @@ public NetAdapterSim(String execCmd, String logFilename, boolean multiThread) th
 	public NetAdapterSim(String execCmd, String logFilename, int listenPort, boolean multiThread) throws IOException {
 		// save references to file and command
 		this.execCommand = execCmd;
-		this.process = Runtime.getRuntime().exec(execCmd);
+
+		// Use ProcessBuilder instead of Runtime.getRuntime().exec()
+		ProcessBuilder processBuilder = new ProcessBuilder(execCmd.split(" "));
+		processBuilder.redirectErrorStream(true); // Redirect error stream to standard output
+		this.process = processBuilder.start();
 		this.processOutput = new BufferedReader(new InputStreamReader(this.process.getInputStream()));
 		this.processError = new BufferedReader(new InputStreamReader(this.process.getErrorStream()));
 		this.processInput = new OutputStreamWriter(this.process.getOutputStream());
@@ -323,7 +327,11 @@ public NetAdapterSim(String execCmd, String logFilename, ServerSocket serverSock
 			throws IOException {
 		// save references to file and command
 		this.execCommand = execCmd;
-		this.process = Runtime.getRuntime().exec(execCmd);
+
+		// Use ProcessBuilder instead of Runtime.getRuntime().exec()
+		ProcessBuilder processBuilder = new ProcessBuilder(execCmd.split(" "));
+		processBuilder.redirectErrorStream(true); // Redirect error stream to standard output
+		this.process = processBuilder.start();
 		this.processOutput = new BufferedReader(new InputStreamReader(this.process.getInputStream()));
 		this.processError = new BufferedReader(new InputStreamReader(this.process.getErrorStream()));
 		this.processInput = new OutputStreamWriter(this.process.getOutputStream());
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
@@ -13,7 +13,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 import java.util.Base64;
 
 import org.junit.Test;
@@ -156,7 +156,8 @@ private static JsonElement sendPostRequest(int port, String password, String end
 	private static JsonElement sendRequest(int port, String requestMethod, String password, String endpoint,
 			JsonObject request) throws OpenemsNamedException {
 		try {
-			var url = new URL("http://127.0.0.1:" + port + endpoint);
+			var uri = URI.create("http://127.0.0.1:" + port + endpoint);
+			var url = uri.toURL();
 			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestProperty("Authorization",
 					"Basic " + new String(Base64.getEncoder().encode(("x:" + password).getBytes())));
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java b/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java
@@ -319,8 +319,13 @@ protected void logError(Logger log, String message) {
 	 * @throws IOException on error
 	 */
 	private static String execReadToString(String execCommand) throws IOException {
-		try (var s = new Scanner(Runtime.getRuntime().exec(execCommand).getInputStream()).useDelimiter("\\A")) {
+		ProcessBuilder processBuilder = new ProcessBuilder(execCommand.split(" "));
+		processBuilder.redirectErrorStream(true);
+		Process process = processBuilder.start();
+
+		try (var s = new Scanner(process.getInputStream()).useDelimiter("\\A")) {
 			return s.hasNext() ? s.next().trim() : "";
 		}
 	}
+
 }
diff --git a/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyApi.java b/io.openems.edge.evcs.dezony/src/io/openems/edge/evcs/dezony/DezonyApi.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.util.Optional;
 
@@ -95,7 +96,8 @@ public JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 		JsonObject result = null;
 
 		try {
-			URL url = new URL(this.baseUrl + endpoint);
+			URI uri = URI.create(this.baseUrl + endpoint);
+			URL url = uri.toURL();
 			HttpURLConnection con = (HttpURLConnection) url.openConnection();
 
 			con.setRequestMethod("GET");
@@ -149,7 +151,8 @@ public JsonObject sendPostRequest(String endpoint) throws OpenemsNamedException
 		JsonObject result = null;
 
 		try {
-			var url = new URL(this.baseUrl + endpoint);
+			URI uri = URI.create(this.baseUrl + endpoint);
+			URL url = uri.toURL();
 			var connection = (HttpURLConnection) url.openConnection();
 
 			// Set general information
diff --git a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 
 import com.google.gson.JsonObject;
 
@@ -177,7 +177,8 @@ public boolean setMaxEnergy(int maxEnergy) {
 	 */
 	private JsonObject sendRequest(String urlString, String requestMethod) throws OpenemsNamedException {
 		try {
-			var url = new URL(urlString);
+			var uri = URI.create(urlString);
+			var url = uri.toURL();
 			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestMethod(requestMethod);
 			con.setConnectTimeout(5000);
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/IoWagoImpl.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/IoWagoImpl.java
@@ -5,7 +5,7 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
@@ -160,7 +160,8 @@ private static Document downloadConfigXml(InetAddress ip, String username, Strin
 
 	private static Document downloadConfigXml(InetAddress ip, String filename, String username, String password)
 			throws ParserConfigurationException, SAXException, IOException {
-		var url = new URL(String.format("http://%s/etc/%s", ip.getHostAddress(), filename));
+		var uri = URI.create(String.format("http://%s/etc/%s", ip.getHostAddress(), filename));
+		var url = uri.toURL();
 		var authStr = String.format("%s:%s", username, password);
 		var bytesEncoded = Base64.getEncoder().encode(authStr.getBytes());
 		var authEncoded = new String(bytesEncoded);
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.stream.Collectors;
@@ -93,7 +93,8 @@ public JsonObject getLastReading(String meterId, Field... fields) throws Openems
 	 */
 	private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException {
 		try {
-			var url = new URL(BASE_URL + endpoint);
+			var uri = URI.create(BASE_URL + endpoint);
+			var url = uri.toURL();
 			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestProperty("Authorization", this.authorizationHeader);
 			con.setRequestMethod("GET");
diff --git a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Inet4Address;
-import java.net.URL;
+import java.net.URI;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -122,7 +122,7 @@ protected void forever() throws Throwable {
 	 */
 	private JsonObject getResponse(String path) throws OpenemsNamedException {
 		try {
-			var url = new URL(this.baseUrl + path);
+			var url = URI.create(this.baseUrl + path).toURL();
 			var connection = (HttpsURLConnection) url.openConnection();
 			connection.setHostnameVerifier((hostname, session) -> true);
 			try (var reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {

Original file line number	Diff line number	Diff line change
`@@ -319,8 +319,13 @@ protected void logError(Logger log, String message) {`
`319`	`319`	`* @throws IOException on error`
`320`	`320`	`*/`
`321`	`321`	`private static String execReadToString(String execCommand) throws IOException {`
`322`		`- try (var s = new Scanner(Runtime.getRuntime().exec(execCommand).getInputStream()).useDelimiter("\\A")) {`
	`322`	`+ ProcessBuilder processBuilder = new ProcessBuilder(execCommand.split(" "));`
	`323`	`+ processBuilder.redirectErrorStream(true);`
	`324`	`+ Process process = processBuilder.start();`
	`325`	`+`
	`326`	`+ try (var s = new Scanner(process.getInputStream()).useDelimiter("\\A")) {`
`323`	`327`	`return s.hasNext() ? s.next().trim() : "";`
`324`	`328`	`}`
`325`	`329`	`}`
	`330`	`+`
`326`	`331`	`}`