From 4be1c0479e37f52237d79648a65b9e108f64dae9 Mon Sep 17 00:00:00 2001 From: "Josiah (Gaming32) Glosson" Date: Thu, 9 May 2024 17:57:08 -0500 Subject: [PATCH] Update to Java 21 --- .../protocol/proxy/ProxyProtocolClient.java | 15 +++++++-------- .../github/gaming32/worldhost/toast/WHToast.java | 6 +++--- .../github/gaming32/worldhost/upnp/Gateway.java | 4 ++-- version.gradle.kts | 6 +++--- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/java/io/github/gaming32/worldhost/protocol/proxy/ProxyProtocolClient.java b/src/main/java/io/github/gaming32/worldhost/protocol/proxy/ProxyProtocolClient.java index 22fd6ef..b8858c8 100644 --- a/src/main/java/io/github/gaming32/worldhost/protocol/proxy/ProxyProtocolClient.java +++ b/src/main/java/io/github/gaming32/worldhost/protocol/proxy/ProxyProtocolClient.java @@ -76,14 +76,13 @@ public ProxyProtocolClient(String host, int port, long connectionId, String base final DataInputStream dis = new DataInputStream(fSocket.getInputStream()); while (!closed) { final ProxyMessage message = ProxyMessage.read(dis); - if (message instanceof ProxyMessage.Open open) { - WorldHost.proxyConnect(open.getConnectionId(), open.getAddress(), () -> WorldHost.proxyProtocolClient); - } else if (message instanceof ProxyMessage.Packet packet) { - WorldHost.proxyPacket(packet.getConnectionId(), packet.getBuffer()); - } else if (message instanceof ProxyMessage.Close close) { - WorldHost.proxyDisconnect(close.getConnectionId()); - } else { - throw new AssertionError("If..elseif for ProxyMessage should be exhaustive"); + switch (message) { + case ProxyMessage.Open open -> + WorldHost.proxyConnect(open.getConnectionId(), open.getAddress(), () -> WorldHost.proxyProtocolClient); + case ProxyMessage.Packet packet -> + WorldHost.proxyPacket(packet.getConnectionId(), packet.getBuffer()); + case ProxyMessage.Close close -> + WorldHost.proxyDisconnect(close.getConnectionId()); } } } catch (Exception e) { diff --git a/src/main/java/io/github/gaming32/worldhost/toast/WHToast.java b/src/main/java/io/github/gaming32/worldhost/toast/WHToast.java index bf94334..393d099 100644 --- a/src/main/java/io/github/gaming32/worldhost/toast/WHToast.java +++ b/src/main/java/io/github/gaming32/worldhost/toast/WHToast.java @@ -59,9 +59,9 @@ static void add(ToastInstance toast) { toast.calculateText(); playSound(toast.important ? IMPORTANT : REGULAR); if (!TOASTS.isEmpty()) { - if (Y_OFFSET + 2 * toast.height + GAP <= TOASTS.get(0).y) { + if (Y_OFFSET + 2 * toast.height + GAP <= TOASTS.getFirst().y) { toast.y = Y_OFFSET; - TOASTS.add(0, toast); + TOASTS.addFirst(toast); return; } for (int i = 0; i < TOASTS.size() - 1; i++) { @@ -73,7 +73,7 @@ static void add(ToastInstance toast) { return; } } - final ToastInstance lastToast = TOASTS.get(TOASTS.size() - 1); + final ToastInstance lastToast = TOASTS.getLast(); toast.y = lastToast.y + lastToast.height + GAP; } else { toast.y = Y_OFFSET; diff --git a/src/main/java/io/github/gaming32/worldhost/upnp/Gateway.java b/src/main/java/io/github/gaming32/worldhost/upnp/Gateway.java index 31f8ba4..11ac7d7 100644 --- a/src/main/java/io/github/gaming32/worldhost/upnp/Gateway.java +++ b/src/main/java/io/github/gaming32/worldhost/upnp/Gateway.java @@ -28,7 +28,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import java.net.HttpURLConnection; import java.net.InetAddress; -import java.net.URL; +import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; @@ -113,7 +113,7 @@ private Map command(String action, Map params) t } soap.append(""); byte[] req = soap.toString().getBytes(); - HttpURLConnection conn = (HttpURLConnection) new URL(controlURL).openConnection(); + HttpURLConnection conn = (HttpURLConnection) new URI(controlURL).toURL().openConnection(); conn.setRequestMethod("POST"); conn.setDoOutput(true); conn.setRequestProperty("Content-Type", "text/xml"); diff --git a/version.gradle.kts b/version.gradle.kts index 59cacb9..f8c49b3 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -50,12 +50,12 @@ repositories { java { withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } tasks.compileJava { - options.release = 17 + options.release = 21 options.compilerArgs.add("-Xlint:all") }