timi/timi-network
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix GsonRequest serialize fail

Browse Source
This commit is contained in:
Timi
2025-07-19 17:27:29 +08:00
parent 12bb7603a1
commit 91ef5e3bc3
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/imyeyu/network/GsonRequest.java
View File

@ -14,7 +14,7 @@ import java.io.IOException;
* @author 夜雨 * @author 夜雨
* @since 2025-07-15 14:27 * @since 2025-07-15 14:27
*/ */
public class GsonRequest<T> { public class GsonRequest {
private static final Gson GSON = new Gson(); private static final Gson GSON = new Gson();
@ -30,25 +30,29 @@ public class GsonRequest<T> {
return TimiJava.firstNotNull(gson, GSON); return TimiJava.firstNotNull(gson, GSON);
} }
public static <T> GsonRequest<T> wrap(Request request) { public static GsonRequest wrap(Request request) {
return new GsonRequest<>(request); return new GsonRequest(request);
} }
public static <T> GsonRequest<T> get(String url) { public static GsonRequest get(String url) {
return new GsonRequest<>(Request.get(url)); return new GsonRequest(Request.get(url));
} }
public static <T> GsonRequest<T> post(String url) { public static GsonRequest post(String url) {
return new GsonRequest<>(Request.post(url)); return new GsonRequest(Request.post(url));
} }
public GsonRequest<T> gson(Gson gson) { public GsonRequest gson(Gson gson) {
this.gson = gson; this.gson = gson;
return this; return this;
} }
public T result() throws IOException { public <T> T resultAs(Class<T> clazz) throws IOException {
return getGson().fromJson(request.execute().returnContent().asString(), new TypeToken<T>() {}.getType()); return getGson().fromJson(request.execute().returnContent().asString(), clazz);
}
public <T> T resultAs(TypeToken<T> typeToken) throws IOException {
return getGson().fromJson(request.execute().returnContent().asString(), typeToken);
} }
public JsonObject asJsonObject() throws IOException { public JsonObject asJsonObject() throws IOException {

26
src/main/java/com/imyeyu/network/TimiRequest.java
View File

@ -10,26 +10,34 @@ import java.io.IOException;
* @author 夜雨 * @author 夜雨
* @since 2025-07-15 14:34 * @since 2025-07-15 14:34
*/ */
public class TimiRequest<T> extends GsonRequest<T> { public class TimiRequest extends GsonRequest {
protected TimiRequest(Request request) { protected TimiRequest(Request request) {
super(request); super(request);
} }
public static <T> TimiRequest<T> wrap(Request request) { public static TimiRequest wrap(Request request) {
return new TimiRequest<>(request); return new TimiRequest(request);
} }
public static <T> TimiRequest<T> get(String url) { public static TimiRequest get(String url) {
return new TimiRequest<>(Request.get(url)); return new TimiRequest(Request.get(url));
} }
public static <T> TimiRequest<T> post(String url) { public static TimiRequest post(String url) {
return new TimiRequest<>(Request.post(url)); return new TimiRequest(Request.post(url));
} }
public T result() throws IOException { public <T> T resultAs(Class<T> clazz) throws IOException {
TimiResponse<T> resp = getGson().fromJson(request.execute().returnContent().asString(), new TypeToken<TimiResponse<T>>() {}.getType()); TimiResponse<T> resp = getGson().fromJson(request.execute().returnContent().asString(), TypeToken.getParameterized(TimiResponse.class, clazz).getType());
if (resp.isFail()) {
throw resp.toException();
}
return resp.getData();
}
public <T> T resultAs(TypeToken<T> typeToken) throws IOException {
TimiResponse<T> resp = getGson().fromJson(request.execute().returnContent().asString(), TypeToken.getParameterized(TimiResponse.class, typeToken.getType()).getType());
if (resp.isFail()) { if (resp.isFail()) {
throw resp.toException(); throw resp.toException();
} }