refactor: remove unused logger imports and simplify version fetching …

…logic
jflamy · Jan 16, 2025 · 802bd18 · 802bd18
1 parent 89e28ee
commit 802bd18
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 94 deletions.
diff --git a/src/main/java/app/owlcms/fly/commands/FlyCtlCommands.java b/src/main/java/app/owlcms/fly/commands/FlyCtlCommands.java
@@ -25,7 +25,6 @@
 import app.owlcms.fly.flydata.AppType;
 import app.owlcms.fly.flydata.EarthLocation;
 import app.owlcms.fly.ui.ExecArea;
-import app.owlcms.fly.utils.LoggerUtils;
 
 public class FlyCtlCommands {
 	int appNameStatus;

diff --git a/src/main/java/app/owlcms/fly/flydata/App.java b/src/main/java/app/owlcms/fly/flydata/App.java
@@ -1,14 +1,8 @@
 package app.owlcms.fly.flydata;
 
-import app.owlcms.fly.utils.LoggerUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-
 public class App implements Comparable<App> {
 
-    private static final Logger logger=LoggerFactory.getLogger(App.class);
+    // private static final Logger logger=LoggerFactory.getLogger(App.class);
     public AppType appType;
     public String name;
     public boolean created;

diff --git a/src/main/java/app/owlcms/fly/flydata/VersionInfo.java b/src/main/java/app/owlcms/fly/flydata/VersionInfo.java
@@ -2,19 +2,12 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.net.URI;
 import java.net.URL;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Scanner;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.slf4j.LoggerFactory;
@@ -28,16 +21,49 @@
 public class VersionInfo {
 	private String referenceVersionString;
 	private String currentVersionString;
-	Logger logger = (Logger) LoggerFactory.getLogger(VersionInfo.class);
+	final private static Logger logger = (Logger) LoggerFactory.getLogger(VersionInfo.class);
 	private Integer comparison;
 
 	public VersionInfo(String currentVersionString) {
 		this.currentVersionString = currentVersionString;
 		this.updateReferenceVersionString();
 	}
-	
+
 	public void updateReferenceVersionString(boolean preRelease) {
 		String apiUrl = "https://api.github.com/repos/owlcms/owlcms4/releases";
+		this.referenceVersionString = fetchLatestReleaseVersion(apiUrl);
+
+		if (!"latest".equals(currentVersionString)) {
+			ComparableVersion currentVersion = new ComparableVersion(this.currentVersionString);
+			ComparableVersion referenceVersion = new ComparableVersion(this.referenceVersionString);
+			this.comparison = currentVersion.compareTo(referenceVersion);
+		} else {
+			this.comparison = -1;
+		}
+	}
+
+	public void updateReferenceVersionString() {
+		updateReferenceVersionString(
+				this.currentVersionString.contains("-") || this.currentVersionString.contentEquals("prerelease"));
+	}
+
+	public String getReferenceVersionString() {
+		if (referenceVersionString == null) {
+			updateReferenceVersionString();
+		}
+		return referenceVersionString;
+	}
+
+	public Integer getComparison() {
+		return comparison;
+	}
+
+	public String getCurrentVersionString() {
+		return currentVersionString;
+	}
+
+	public static String fetchLatestReleaseVersion(String apiUrl) {
+		long now = System.currentTimeMillis();
 		try {
 			URL url = new URL(apiUrl);
 			HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -66,41 +92,12 @@ public void updateReferenceVersionString(boolean preRelease) {
 			}
 
 			Collections.sort(versions, Comparator.reverseOrder());
-			this.referenceVersionString = versions.get(0).getValue();
-
-			if (!"latest".equals(currentVersionString)) {
-				ComparableVersion currentVersion = new ComparableVersion(this.currentVersionString);
-				ComparableVersion referenceVersion = new ComparableVersion(this.referenceVersionString);
-				this.comparison = currentVersion.compareTo(referenceVersion);
-			} else {
-				this.comparison = -1;
-			}
+			logger.info("fetchLatestReleaseVersion took {} ms", System.currentTimeMillis() - now);
+			return versions.get(0).getValue();
 
 		} catch (IOException e) {
-			logger.error("version fetch failed", e);
-			this.comparison = 0;
-			this.referenceVersionString = "unknown";
+			e.printStackTrace();
+			return "unknown";
 		}
 	}
-
-	public void updateReferenceVersionString() {
-		updateReferenceVersionString(this.currentVersionString.contains("-")||this.currentVersionString.contentEquals("prerelease"));
-	}
-
-	public String getReferenceVersionString() {
-		if (referenceVersionString == null) {
-			updateReferenceVersionString();
-		}
-		return referenceVersionString;
-	}
-
-	public Integer getComparison() {
-		return comparison;
-	}
-
-	public String getCurrentVersionString() {
-
-		return currentVersionString;
-	}
-
 }
diff --git a/src/main/java/app/owlcms/fly/ui/AppsView.java b/src/main/java/app/owlcms/fly/ui/AppsView.java
@@ -1,21 +1,12 @@
 package app.owlcms.fly.ui;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.security.SecureRandom;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.vdurmont.semver4j.Semver;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.vaadin.flow.component.Html;
 import com.vaadin.flow.component.Text;
 import com.vaadin.flow.component.UI;
@@ -585,39 +576,6 @@ public String generateRandomString(int length) {
 	}
 
 	private String getLatestReleaseVersion() {
-		try {
-			URL url = new URL("https://api.github.com/repos/owlcms/owlcms4/releases");
-			HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-			conn.setRequestMethod("GET");
-			conn.setRequestProperty("Accept", "application/vnd.github.v3+json");
-
-			if (conn.getResponseCode() != 200) {
-				throw new RuntimeException("Failed : HTTP error code : " + conn.getResponseCode());
-			}
-
-			Scanner scanner = new Scanner(url.openStream());
-			String inline = "";
-			while (scanner.hasNext()) {
-				inline += scanner.nextLine();
-			}
-			scanner.close();
-
-			JsonParser parser = new JsonParser();
-			List<JsonObject> releases = new ArrayList<>();
-			parser.parse(inline).getAsJsonArray().forEach(jsonElement -> releases.add(jsonElement.getAsJsonObject()));
-
-			List<Semver> versions = new ArrayList<>();
-			for (JsonObject release : releases) {
-				String tagName = release.get("tag_name").getAsString();
-				versions.add(new Semver(tagName));
-			}
-
-			Collections.sort(versions, Comparator.reverseOrder());
-			return versions.get(0).getValue();
-
-		} catch (IOException e) {
-			e.printStackTrace();
-			return "unknown";
-		}
+		return VersionInfo.fetchLatestReleaseVersion("https://api.github.com/repos/owlcms/owlcms4/releases");
 	}
 }