🐛 Fixes (#1)

* 🐛 Fixes

* 🔥 Remove .gradle

* 🐛 Fix errors reported in PR

* fix other problems from comments

* Other fixes

Author: Hyd3r1

src/main/java/com/eternalcode/eternalupdater/EternalUpdater.java

@@ -7,28 +7,27 @@
 import org.json.simple.JSONObject;
 
 public class EternalUpdater {
-    private PluginData pluginData;
+    private final PluginData pluginData;
 
     /**
      * @param pluginName Name of the checked plugin
      * @param pluginVersion Current version the plugin
      * @param githubRepo Github remote repository name (ex. eternalcodeteam/eternalcore)
      */
     public EternalUpdater(@NotNull String pluginName, @NotNull String pluginVersion, @NotNull String githubRepo) {
-        this.pluginData = new PluginData();
-        this.pluginData.setPluginName(pluginName);
-        this.pluginData.setPluginVersion(pluginVersion);
-        this.pluginData.setGithubRepository(githubRepo);
+        this.pluginData = new PluginData(githubRepo, pluginVersion, pluginName);
     }
 
     public RemoteInformation checkUpdates() {
         JSONObject response = HttpClient.doRequest("repos/" + this.pluginData.getGithubRepository() + "/releases/latest");
-        RemoteInformation remoteInformation = new RemoteInformation();
+        boolean newVersionAvailable = this.pluginData.getPluginVersion() != (String) response.get("tag_name");
+        String latestTag = (String) response.get("tag_name");
+        String newDownloadUri = (String) response.get("zipball_url");
 
-        remoteInformation.setCurrentVersion(response.isEmpty() ? this.pluginData.getPluginVersion() : (String) response.get("tag_name"));
-        remoteInformation.setAvailableNewVersion(response.isEmpty() ? false : this.pluginData.getPluginVersion() != (String) response.get("tag_name"));
-        remoteInformation.setDownloadUri(response.isEmpty() ? "https://github.com/" + this.pluginData.getGithubRepository() : (String) response.get("zipball_url"));
-
-        return remoteInformation;
+        return new RemoteInformation(
+                newVersionAvailable,
+                latestTag,
+                newDownloadUri
+        );
     }
 }

src/main/java/com/eternalcode/eternalupdater/data/PluginData.java

@@ -1,31 +1,27 @@
 package com.eternalcode.eternalupdater.data;
 
 public class PluginData {
-    private String githubRepository;
-    private String pluginVersion;
-    private String pluginName;
 
-    public String getGithubRepository() {
-        return githubRepository;
-    }
+    private final String githubRepository;
+    private final String pluginVersion;
+    private final String pluginName;
 
-    public void setGithubRepository(String githubRepository) {
+    public PluginData(String githubRepository, String pluginVersion, String pluginName) {
         this.githubRepository = githubRepository;
+        this.pluginVersion = pluginVersion;
+        this.pluginName = pluginName;
     }
 
-    public String getPluginVersion() {
-        return pluginVersion;
+    public String getGithubRepository() {
+        return this.githubRepository;
     }
 
-    public void setPluginVersion(String pluginVersion) {
-        this.pluginVersion = pluginVersion;
+    public String getPluginVersion() {
+        return this.pluginVersion;
     }
 
     public String getPluginName() {
-        return pluginName;
+        return this.pluginName;
     }
 
-    public void setPluginName(String pluginName) {
-        this.pluginName = pluginName;
-    }
 }

src/main/java/com/eternalcode/eternalupdater/data/RemoteInformation.java

@@ -1,31 +1,27 @@
 package com.eternalcode.eternalupdater.data;
 
 public class RemoteInformation {
-    private boolean isAvailableNewVersion;
-    private String currentVersion;
-    private String downloadUri;
 
-    public String getDownloadUri() {
-        return downloadUri;
-    }
+    private final boolean isAvailableNewVersion;
+    private final String currentVersion;
+    private final String downloadUri;
 
-    public void setDownloadUri(String downloadUri) {
+    public RemoteInformation(boolean isAvailableNewVersion, String currentVersion, String downloadUri) {
+        this.isAvailableNewVersion = isAvailableNewVersion;
+        this.currentVersion = currentVersion;
         this.downloadUri = downloadUri;
     }
 
-    public boolean isAvailableNewVersion() {
-        return isAvailableNewVersion;
+    public String getDownloadUri() {
+        return this.downloadUri;
     }
 
-    public void setAvailableNewVersion(boolean availableNewVersion) {
-        isAvailableNewVersion = availableNewVersion;
+    public boolean isAvailableNewVersion() {
+        return this.isAvailableNewVersion;
     }
 
     public String getCurrentVersion() {
-        return currentVersion;
+        return this.currentVersion;
     }
 
-    public void setCurrentVersion(String currentVersion) {
-        this.currentVersion = currentVersion;
-    }
 }

src/main/java/com/eternalcode/eternalupdater/util/HttpClient.java

@@ -7,16 +7,27 @@
 import org.json.simple.parser.JSONParser;
 
 public class HttpClient {
-    public static String baseUri = "https://api.github.com/";
-    public static OkHttpClient client = new OkHttpClient();
 
-    public static JSONObject doRequest(String url)
-    {
-        Request request = new Request.Builder().url(baseUri + "/" + url).build();
-        try (Response response = client.newCall(request).execute()){
-            return response.body() != null ? (JSONObject) new JSONParser().parse(response.body().string()) : null;
+    private final static String baseUri = "https://api.github.com/";
+    private final static OkHttpClient client = new OkHttpClient();
+
+    public static JSONObject doRequest(String url) {
+        Request request = new Request
+                .Builder()
+                .url(baseUri + "" + url)
+                .build();
+
+        try (Response response = client.newCall(request).execute()) {
+            JSONObject jsonResponse = (JSONObject) new JSONParser().parse(response.body().string());
+
+            if (jsonResponse.containsKey("message")) {
+                throw new Exception("[EternalUpdater] Provided repository was not found");
+            }
+            else {
+                return jsonResponse;
+            }
         } catch (Exception e) {
-            return null;
+            throw new RuntimeException(e);
         }
     }