From c1bc3dfc293022167a53175261887c67a6e5595a Mon Sep 17 00:00:00 2001 From: manuelgu Date: Fri, 13 May 2016 19:07:56 +0200 Subject: [PATCH] Add HttpUtil utility class --- .../intellectualcrafters/plot/Updater.java | 41 ++----------------- .../plot/commands/PluginCmd.java | 34 +-------------- .../plot/util/HttpUtil.java | 40 ++++++++++++++++++ 3 files changed, 46 insertions(+), 69 deletions(-) create mode 100644 Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java diff --git a/Core/src/main/java/com/intellectualcrafters/plot/Updater.java b/Core/src/main/java/com/intellectualcrafters/plot/Updater.java index f1e24c170..f7406c9ee 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/Updater.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/Updater.java @@ -1,52 +1,19 @@ package com.intellectualcrafters.plot; -import static com.intellectualcrafters.plot.PS.log; - import com.intellectualcrafters.json.JSONArray; import com.intellectualcrafters.json.JSONObject; -import com.intellectualcrafters.plot.config.Settings; +import com.intellectualcrafters.plot.util.HttpUtil; import com.intellectualcrafters.plot.util.StringMan; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; +import static com.intellectualcrafters.plot.PS.log; + public class Updater { - private static String readUrl(String urlString) { - BufferedReader reader = null; - try { - URL url = new URL(urlString); - reader = new BufferedReader(new InputStreamReader(url.openStream())); - StringBuilder buffer = new StringBuilder(); - int read; - char[] chars = new char[1024]; - while ((read = reader.read(chars)) != -1) { - buffer.append(chars, 0, read); - } - - return buffer.toString(); - } catch (IOException e) { - log("&dCould not check for updates"); - if (Settings.DEBUG) { - e.printStackTrace(); - } - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return null; - } - public static URL getUpdate() { - String str = readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); + String str = HttpUtil.readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); JSONObject release = new JSONObject(str); JSONArray assets = (JSONArray) release.get("assets"); String downloadURL = String.format("PlotSquared-%s.jar", PS.get().getPlatform()); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java index 6c3e1afd2..99351dd66 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java @@ -3,13 +3,10 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.json.JSONObject; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.object.PlotPlayer; +import com.intellectualcrafters.plot.util.HttpUtil; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.StringMan; import com.plotsquared.general.commands.CommandDeclaration; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; @CommandDeclaration(command = "plugin", permission = "plots.use", @@ -28,35 +25,8 @@ public class PluginCmd extends SubCommand { } public String getNewestVersionString() { - String str = readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); + String str = HttpUtil.readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); JSONObject release = new JSONObject(str); return release.getString("name"); } - - private static String readUrl(String urlString) { - BufferedReader reader = null; - try { - URL url = new URL(urlString); - reader = new BufferedReader(new InputStreamReader(url.openStream())); - StringBuilder buffer = new StringBuilder(); - int read; - char[] chars = new char[1024]; - while ((read = reader.read(chars)) != -1) { - buffer.append(chars, 0, read); - } - - return buffer.toString(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return null; - } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java new file mode 100644 index 000000000..68f4a4c0e --- /dev/null +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java @@ -0,0 +1,40 @@ +package com.intellectualcrafters.plot.util; + +import com.intellectualcrafters.plot.config.Settings; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; + +public class HttpUtil { + + public static String readUrl(String urlString) { + BufferedReader reader = null; + try { + URL url = new URL(urlString); + reader = new BufferedReader(new InputStreamReader(url.openStream())); + StringBuilder buffer = new StringBuilder(); + int read; + char[] chars = new char[1024]; + while ((read = reader.read(chars)) != -1) { + buffer.append(chars, 0, read); + } + + return buffer.toString(); + } catch (IOException e) { + if (Settings.DEBUG) { + e.printStackTrace(); + } + } finally { + try { + if (reader != null) { + reader.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + return null; + } +}