prepare generic getReleaseByPredicate

HSGamer · HSGamer · commit a0a0ec32c580 · 2024-11-08T00:39:56.000+07:00
diff --git a/lib/src/main/java/me/hsgamer/mcserverupdater/api/GithubReleaseUpdater.java b/lib/src/main/java/me/hsgamer/mcserverupdater/api/GithubReleaseUpdater.java
@@ -66,20 +66,18 @@ protected JSONObject getReleaseByTag(String tag) {
         }
     }
 
-    protected JSONObject getReleaseByTagMatch(Predicate<String> tagPredicate) {
-        String url = releasesUrl;
+    protected JSONObject getReleaseByPredicate(Predicate<JSONObject> predicate) {
         int page = 1;
         while (true) {
-            String pageUrl = url + "?per_page=100&page=" + page;
+            String pageUrl = releasesUrl + "?per_page=100&page=" + page;
             debug("Getting release from " + pageUrl);
             try {
                 URLConnection connection = UserAgent.CHROME.assignToConnection(WebUtils.createConnection(pageUrl));
                 InputStream inputStream = connection.getInputStream();
                 JSONArray array = new JSONArray(new JSONTokener(inputStream));
                 for (int i = 0; i < array.length(); i++) {
                     JSONObject object = array.getJSONObject(i);
-                    String tag = object.getString("tag_name");
-                    if (tagPredicate.test(tag)) {
+                    if (predicate.test(object)) {
                         return object;
                     }
                 }
@@ -94,6 +92,10 @@ protected JSONObject getReleaseByTagMatch(Predicate<String> tagPredicate) {
         throw new RuntimeException("Cannot find the release");
     }
 
+    protected JSONObject getReleaseByTagMatch(Predicate<String> tagPredicate) {
+        return getReleaseByPredicate(object -> tagPredicate.test(object.getString("tag_name")));
+    }
+
     private String getBuild() {
         JSONObject object = getReleaseObject();
         if (object == null) {
