From c32782a23352d3b1f89bf56acb4bb15a4a976af8 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 16 May 2017 19:23:48 -0400 Subject: [PATCH] http-api: catch and rethrown json exceptions as ioexceptions - we don't check return code from the http response.. --- .../main/java/net/runelite/http/api/account/LoginClient.java | 5 +++++ .../main/java/net/runelite/http/api/config/ConfigClient.java | 5 +++++ .../java/net/runelite/http/api/hiscore/HiscoreClient.java | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java b/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java index 4e8209d3d9..54642159f3 100644 --- a/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java +++ b/http-api/src/main/java/net/runelite/http/api/account/LoginClient.java @@ -24,6 +24,7 @@ */ package net.runelite.http.api.account; +import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -60,5 +61,9 @@ public class LoginClient InputStream in = body.byteStream(); return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), OAuthResponse.class); } + catch (JsonParseException ex) + { + throw new IOException(ex); + } } } diff --git a/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java b/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java index 7ff535aca9..0799bbce9a 100644 --- a/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java +++ b/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java @@ -24,6 +24,7 @@ */ package net.runelite.http.api.config; +import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -71,6 +72,10 @@ public class ConfigClient InputStream in = body.byteStream(); return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), Configuration.class); } + catch (JsonParseException ex) + { + throw new IOException(ex); + } } public void set(String key, String value) throws IOException diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java index 5ac42e4779..4662dd9942 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java @@ -24,6 +24,7 @@ */ package net.runelite.http.api.hiscore; +import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -60,5 +61,9 @@ public class HiscoreClient InputStream in = body.byteStream(); return RuneliteAPI.GSON.fromJson(new InputStreamReader(in), HiscoreResult.class); } + catch (JsonParseException ex) + { + throw new IOException(ex); + } } }