From 016e0b0962e7bcb477367e243271a1539f1c86f9 Mon Sep 17 00:00:00 2001 From: Timi Date: Thu, 24 Jul 2025 18:46:35 +0800 Subject: [PATCH] extend CommonRequest for GsonRequest --- .../java/com/imyeyu/network/CommonRequest.java | 4 ++++ src/main/java/com/imyeyu/network/GsonRequest.java | 14 ++++++-------- src/main/java/com/imyeyu/network/TimiRequest.java | 14 ++++++++++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/imyeyu/network/CommonRequest.java b/src/main/java/com/imyeyu/network/CommonRequest.java index d4994d3..6bc447b 100644 --- a/src/main/java/com/imyeyu/network/CommonRequest.java +++ b/src/main/java/com/imyeyu/network/CommonRequest.java @@ -32,6 +32,10 @@ public class CommonRequest { return request.execute().returnContent().asString(); } + public Number asNumber() throws IOException { + return Double.parseDouble(asString()); + } + public byte[] asBytes() throws IOException { return request.execute().returnContent().asBytes(); } diff --git a/src/main/java/com/imyeyu/network/GsonRequest.java b/src/main/java/com/imyeyu/network/GsonRequest.java index 5d7a4d9..e27744d 100644 --- a/src/main/java/com/imyeyu/network/GsonRequest.java +++ b/src/main/java/com/imyeyu/network/GsonRequest.java @@ -14,16 +14,14 @@ import java.io.IOException; * @author 夜雨 * @since 2025-07-15 14:27 */ -public class GsonRequest { +public class GsonRequest extends CommonRequest { private static final Gson GSON = new Gson(); - protected final Request request; - private Gson gson = null; protected GsonRequest(Request request) { - this.request = request; + super(request); } protected Gson getGson() { @@ -48,18 +46,18 @@ public class GsonRequest { } public T resultAs(Class clazz) throws IOException { - return getGson().fromJson(request.execute().returnContent().asString(), clazz); + return getGson().fromJson(super.asString(), clazz); } public T resultAs(TypeToken typeToken) throws IOException { - return getGson().fromJson(request.execute().returnContent().asString(), typeToken); + return getGson().fromJson(super.asString(), typeToken); } public JsonObject asJsonObject() throws IOException { - return JsonParser.parseString(request.execute().returnContent().asString()).getAsJsonObject(); + return JsonParser.parseString(super.asString()).getAsJsonObject(); } public JsonArray asJsonArray() throws IOException { - return JsonParser.parseString(request.execute().returnContent().asString()).getAsJsonArray(); + return JsonParser.parseString(super.asString()).getAsJsonArray(); } } diff --git a/src/main/java/com/imyeyu/network/TimiRequest.java b/src/main/java/com/imyeyu/network/TimiRequest.java index bb18e7c..8de9d24 100644 --- a/src/main/java/com/imyeyu/network/TimiRequest.java +++ b/src/main/java/com/imyeyu/network/TimiRequest.java @@ -28,8 +28,18 @@ public class TimiRequest extends GsonRequest { return new TimiRequest(Request.post(url)); } + @Override + public String asString() throws IOException { + return resultAs(String.class); + } + + @Override + public Number asNumber() throws IOException { + return Double.parseDouble(asString()); + } + public T resultAs(Class clazz) throws IOException { - TimiResponse resp = getGson().fromJson(request.execute().returnContent().asString(), TypeToken.getParameterized(TimiResponse.class, clazz).getType()); + TimiResponse resp = getGson().fromJson(asJsonObject(), TypeToken.getParameterized(TimiResponse.class, clazz).getType()); if (resp.isFail()) { throw resp.toException(); } @@ -37,7 +47,7 @@ public class TimiRequest extends GsonRequest { } public T resultAs(TypeToken typeToken) throws IOException { - TimiResponse resp = getGson().fromJson(request.execute().returnContent().asString(), TypeToken.getParameterized(TimiResponse.class, typeToken.getType()).getType()); + TimiResponse resp = getGson().fromJson(asJsonObject(), TypeToken.getParameterized(TimiResponse.class, typeToken.getType()).getType()); if (resp.isFail()) { throw resp.toException(); }