diff --git a/pom.xml b/pom.xml index 42a67ff..483a2d1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.imyeyu.network timi-network - 0.0.3 + 0.0.4 jar @@ -28,10 +28,42 @@ maven-source-plugin 3.3.1 + + org.projectlombok + lombok-maven-plugin + 1.18.20.0 + + ${project.basedir}/src/main/java + ${project.build.directory}/delombok + false + UTF-8 + + + + generate-sources + + delombok + + + + + + org.projectlombok + lombok + 1.18.36 + + + org.apache.maven.plugins maven-javadoc-plugin 3.11.2 + + ${project.build.directory}/delombok + UTF-8 + UTF-8 + UTF-8 + @@ -65,12 +97,17 @@ org.apache.httpcomponents.client5 httpclient5-fluent - 5.2.1 + 5.6 com.google.code.gson gson - 2.11.0 + 2.13.2 + + + org.projectlombok + lombok + 1.18.40 junit diff --git a/src/main/java/com/imyeyu/network/CommonRequest.java b/src/main/java/com/imyeyu/network/CommonRequest.java index cc0721a..58b64a6 100644 --- a/src/main/java/com/imyeyu/network/CommonRequest.java +++ b/src/main/java/com/imyeyu/network/CommonRequest.java @@ -1,22 +1,22 @@ package com.imyeyu.network; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; import org.apache.hc.client5.http.fluent.Request; import org.apache.hc.core5.util.Timeout; import java.io.IOException; +import java.io.InputStream; /** * @author 夜雨 * @since 2025-07-15 14:27 */ +@AllArgsConstructor(access = AccessLevel.PROTECTED) public class CommonRequest { protected final Request request; - protected CommonRequest(Request request) { - this.request = request; - } - public static CommonRequest wrap(Request request) { return new CommonRequest(request); } @@ -61,6 +61,10 @@ public class CommonRequest { return request.execute().returnContent().asBytes(); } + public InputStream asStream() throws IOException { + return request.execute().returnContent().asStream(); + } + public void execute() throws IOException { request.execute(); } diff --git a/src/main/java/com/imyeyu/network/FileRequest.java b/src/main/java/com/imyeyu/network/FileRequest.java index ba685f0..a75dd2d 100644 --- a/src/main/java/com/imyeyu/network/FileRequest.java +++ b/src/main/java/com/imyeyu/network/FileRequest.java @@ -40,16 +40,19 @@ public class FileRequest extends CommonRequest { return this; } + @Override public FileRequest header(String key, String value) { request.addHeader(key, value); return this; } + @Override public FileRequest token(String token) { request.addHeader("Token", token); return this; } + @Override public FileRequest language(String langHeader) { request.addHeader("Accept-Language", langHeader); return this; diff --git a/src/main/java/com/imyeyu/network/GsonRequest.java b/src/main/java/com/imyeyu/network/GsonRequest.java index 41e2067..7bcdee6 100644 --- a/src/main/java/com/imyeyu/network/GsonRequest.java +++ b/src/main/java/com/imyeyu/network/GsonRequest.java @@ -52,16 +52,19 @@ public class GsonRequest extends CommonRequest { return this; } + @Override public GsonRequest header(String key, String value) { request.addHeader(key, value); return this; } + @Override public GsonRequest token(String token) { request.addHeader("Token", token); return this; } + @Override public GsonRequest language(String langHeader) { request.addHeader("Accept-Language", langHeader); return this; diff --git a/src/main/java/com/imyeyu/network/Network.java b/src/main/java/com/imyeyu/network/Network.java index 1d2b445..5c384bc 100644 --- a/src/main/java/com/imyeyu/network/Network.java +++ b/src/main/java/com/imyeyu/network/Network.java @@ -32,7 +32,7 @@ public class Network { dp.browse(URI.create(Encoder.url(url))); } } catch (IOException e) { - e.printStackTrace(); + throw new RuntimeException(e); } } diff --git a/src/main/java/com/imyeyu/network/ProgressiveRequest.java b/src/main/java/com/imyeyu/network/ProgressiveRequest.java index 0c97378..cd24c3f 100644 --- a/src/main/java/com/imyeyu/network/ProgressiveRequest.java +++ b/src/main/java/com/imyeyu/network/ProgressiveRequest.java @@ -48,16 +48,19 @@ public class ProgressiveRequest extends FileRequest { return this; } + @Override public ProgressiveRequest header(String key, String value) { request.addHeader(key, value); return this; } + @Override public ProgressiveRequest token(String token) { request.addHeader("Token", token); return this; } + @Override public ProgressiveRequest language(String langHeader) { request.addHeader("Accept-Language", langHeader); return this; diff --git a/src/main/java/com/imyeyu/network/TimiRequest.java b/src/main/java/com/imyeyu/network/TimiRequest.java index c636965..43a4a25 100644 --- a/src/main/java/com/imyeyu/network/TimiRequest.java +++ b/src/main/java/com/imyeyu/network/TimiRequest.java @@ -34,16 +34,19 @@ public class TimiRequest extends GsonRequest { return this; } + @Override public TimiRequest header(String key, String value) { request.addHeader(key, value); return this; } + @Override public TimiRequest token(String token) { request.addHeader("Token", token); return this; } + @Override public TimiRequest language(String langHeader) { request.addHeader("Accept-Language", langHeader); return this;