From 68eb4e214ada9a7b6ccb3999d4db53bf8bc9d417 Mon Sep 17 00:00:00 2001
From: Hannes Greule <SirYwell@users.noreply.github.com>
Date: Sat, 8 Jul 2023 19:41:20 +0200
Subject: [PATCH] refactor: use HttpClient for update check (#2331)

---
 .../core/util/UpdateNotification.java         | 80 ++++++++++++-------
 1 file changed, 51 insertions(+), 29 deletions(-)

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/UpdateNotification.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/UpdateNotification.java
index 6425cfd14..13effcc46 100644
--- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/UpdateNotification.java
+++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/UpdateNotification.java
@@ -14,7 +14,13 @@ import org.w3c.dom.Document;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import java.net.URL;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 
 public class UpdateNotification {
 
@@ -28,38 +34,54 @@ public class UpdateNotification {
      */
     public static void doUpdateCheck() {
         if (Settings.settings().ENABLED_COMPONENTS.UPDATE_NOTIFICATIONS) {
-            try {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-                DocumentBuilder db = dbf.newDocumentBuilder();
-                Document doc = db.parse(new URL("https://ci.athion.net/job/FastAsyncWorldEdit/api/xml/").openStream());
-                faweVersion = doc.getElementsByTagName("lastSuccessfulBuild").item(0).getFirstChild().getTextContent();
-                FaweVersion faweVersion = Fawe.instance().getVersion();
-                if (faweVersion.build == 0) {
-                    LOGGER.warn("You are using a snapshot or a custom version of FAWE. This is not an official build distributed " +
-                            "via https://www.spigotmc.org/resources/13932/");
-                    return;
-                }
-                if (faweVersion.build < Integer.parseInt(UpdateNotification.faweVersion)) {
-                    hasUpdate = true;
-                    int versionDifference = Integer.parseInt(UpdateNotification.faweVersion) - faweVersion.build;
-                    LOGGER.warn(
-                            """
-                                    An update for FastAsyncWorldEdit is available. You are {} build(s) out of date.
-                                    You are running build {}, the latest version is build {}.
-                                    Update at https://www.spigotmc.org/resources/13932/""",
-                            versionDifference,
-                            faweVersion.build,
-                            UpdateNotification.faweVersion
-                    );
-                }
-            } catch (Exception e) {
-                LOGGER.error("Unable to check for updates. Skipping.");
-            }
+            final HttpRequest request = HttpRequest
+                    .newBuilder()
+                    .uri(URI.create("https://ci.athion.net/job/FastAsyncWorldEdit/api/xml/"))
+                    .timeout(Duration.of(10L, ChronoUnit.SECONDS))
+                    .build();
+            HttpClient.newHttpClient()
+                    .sendAsync(request, HttpResponse.BodyHandlers.ofInputStream())
+                    .whenComplete((response, thrown) -> {
+                        if (thrown != null) {
+                            LOGGER.error("Update check failed: {} ", thrown.getMessage());
+                        }
+                        processResponseBody(response.body());
+                    });
 
         }
     }
 
+    private static void processResponseBody(InputStream body) {
+        try {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document doc = db.parse(body);
+            faweVersion = doc.getElementsByTagName("lastSuccessfulBuild").item(0).getFirstChild().getTextContent();
+            FaweVersion faweVersion = Fawe.instance().getVersion();
+            if (faweVersion.build == 0) {
+                LOGGER.warn("You are using a snapshot or a custom version of FAWE. This is not an official build distributed " +
+                        "via https://www.spigotmc.org/resources/13932/");
+                return;
+            }
+            if (faweVersion.build < Integer.parseInt(UpdateNotification.faweVersion)) {
+                hasUpdate = true;
+                int versionDifference = Integer.parseInt(UpdateNotification.faweVersion) - faweVersion.build;
+                LOGGER.warn(
+                        """
+                                An update for FastAsyncWorldEdit is available. You are {} build(s) out of date.
+                                You are running build {}, the latest version is build {}.
+                                Update at https://www.spigotmc.org/resources/13932/""",
+                        versionDifference,
+                        faweVersion.build,
+                        UpdateNotification.faweVersion
+                );
+            }
+        } catch (Exception ignored) {
+            LOGGER.error("Unable to check for updates. Skipping.");
+        }
+    }
+
     /**
      * Trigger an update notification based on captions. Useful to notify server administrators ingame.
      *