Complete the CompletableFuture in AbstractPluginUpdater (#245)

Slimefun · Jan 17, 2024 · 1108163 · 1108163
1 parent fcdbd45
commit 1108163
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/dough-updater/src/main/java/io/github/bakedlibs/dough/updater/BlobBuildUpdater.java b/dough-updater/src/main/java/io/github/bakedlibs/dough/updater/BlobBuildUpdater.java
@@ -52,8 +52,10 @@ public UpdateInfo parse(String result) throws MalformedURLException, URISyntaxEx
                     int latestVersion = data.get("buildId").getAsInt();
                     URL downloadURL = new URI(data.get("fileDownloadUrl").getAsString()).toURL();
                     String checksum = data.get("checksum").getAsString();
+                    PrefixedVersion latest = new PrefixedVersion(releaseChannel + " - ", latestVersion);
+                    getLatestVersion().complete(latest);
 
-                    return new UpdateInfo(downloadURL, new PrefixedVersion(releaseChannel + " - ", latestVersion), checksum);
+                    return new UpdateInfo(downloadURL, latest, checksum);
                 }
             });
         } catch (MalformedURLException | URISyntaxException e ) {

diff --git a/dough-updater/src/main/java/io/github/bakedlibs/dough/updater/BukkitUpdater.java b/dough-updater/src/main/java/io/github/bakedlibs/dough/updater/BukkitUpdater.java
@@ -54,8 +54,10 @@ public UpdateInfo parse(String result) throws MalformedURLException {
                     URL download = new URL(latest.get("downloadUrl").getAsString());
                     String remoteVersion = latest.getAsJsonObject().get("name").getAsString();
                     remoteVersion = remoteVersion.toLowerCase(Locale.ROOT);
+                    SemanticVersion latestVersion = SemanticVersion.parse(remoteVersion);
+                    getLatestVersion().complete(latestVersion);
 
-                    return new UpdateInfo(download, SemanticVersion.parse(remoteVersion));
+                    return new UpdateInfo(download, latestVersion);
                 }
 
             });

diff --git a/dough-updater/src/main/java/io/github/bakedlibs/dough/updater/GitHubBuildsUpdater.java b/dough-updater/src/main/java/io/github/bakedlibs/dough/updater/GitHubBuildsUpdater.java
@@ -51,8 +51,10 @@ public UpdateInfo parse(String result) throws MalformedURLException {
 
                     int latestVersion = json.get("last_successful").getAsInt();
                     URL downloadURL = new URL(API_URL + repository + '/' + CommonPatterns.SLASH.split(repository)[1] + '-' + latestVersion + ".jar");
+                    PrefixedVersion latest = new PrefixedVersion(prefix, latestVersion);
+                    getLatestVersion().complete(latest);
 
-                    return new UpdateInfo(downloadURL, new PrefixedVersion(prefix, latestVersion));
+                    return new UpdateInfo(downloadURL, latest);
                 }
 
             });