v3.1.4 (#89)

scx567888 · Oct 3, 2024 · 7fbad36 · 7fbad36
1 parent 153416b
commit 7fbad36
Show file tree

Hide file tree

Showing 39 changed files with 447 additions and 186 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <artifactId>scx</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.3</version>
+    <version>3.1.4</version>
 
     <name>SCX</name>
     <url>https://github.com/scx567888/scx</url>

diff --git a/scx-ansi/pom.xml b/scx-ansi/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-ansi</artifactId>

diff --git a/scx-common/pom.xml b/scx-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-common</artifactId>

diff --git a/scx-config/pom.xml b/scx-config/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-config</artifactId>

diff --git a/scx-core/pom.xml b/scx-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-core</artifactId>

diff --git a/scx-core/src/main/java/cool/scx/core/ScxVersion.java b/scx-core/src/main/java/cool/scx/core/ScxVersion.java
@@ -13,7 +13,7 @@ public class ScxVersion {
     /**
      * SCX 版本号
      */
-    public static final String SCX_VERSION = "3.1.3";
+    public static final String SCX_VERSION = "3.1.4";
 
     /**
      * 在控制台上打印 banner

diff --git a/scx-data-jdbc/pom.xml b/scx-data-jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-data-jdbc</artifactId>

diff --git a/scx-data-mysql-x/pom.xml b/scx-data-mysql-x/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-data-mysql-x</artifactId>

diff --git a/scx-data/pom.xml b/scx-data/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-data</artifactId>

diff --git a/scx-ext/pom.xml b/scx-ext/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-ext</artifactId>

diff --git a/scx-ffm/pom.xml b/scx-ffm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-ffm</artifactId>

diff --git a/scx-http-helidon/pom.xml b/scx-http-helidon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-http-helidon</artifactId>

diff --git a/scx-http-helidon/src/main/java/cool/scx/http/helidon/HelidonHelper.java b/scx-http-helidon/src/main/java/cool/scx/http/helidon/HelidonHelper.java
@@ -3,7 +3,9 @@
 import cool.scx.http.ScxHttpHeaders;
 import cool.scx.http.ScxHttpHeadersWritable;
 import cool.scx.reflect.ReflectFactory;
-import io.helidon.http.*;
+import io.helidon.http.Header;
+import io.helidon.http.Headers;
+import io.helidon.http.PathMatchers;
 import io.helidon.webserver.websocket.WsRoute;
 import io.helidon.webserver.websocket.WsRouting;
 import io.helidon.websocket.WsListener;
@@ -41,11 +43,4 @@ public static ScxHttpHeadersWritable convertHeaders(Headers o) {
         return h;
     }
 
-    public static void updateHeaders(ScxHttpHeaders o, ServerResponseHeaders u) {
-        u.clear();
-        for (var header : o) {
-            u.add(HeaderNames.create(header.getKey().value()), header.getValue().toArray(String[]::new));
-        }
-    }
-
 }
diff --git a/scx-http-helidon/src/test/java/cool/scx/http/helidon/test/Apple.java b/scx-http-helidon/src/test/java/cool/scx/http/helidon/test/Apple.java
@@ -0,0 +1,5 @@
+package cool.scx.http.helidon.test;
+
+public record Apple(String color, String name, int weight) {
+
+}
diff --git a/scx-http-helidon/src/test/java/cool/scx/http/helidon/test/ClientTest.java b/scx-http-helidon/src/test/java/cool/scx/http/helidon/test/ClientTest.java
@@ -1,11 +1,15 @@
 package cool.scx.http.helidon.test;
 
+import cool.scx.http.MediaType;
 import cool.scx.http.ScxHttpServerOptions;
 import cool.scx.http.helidon.HelidonHttpClient;
 import cool.scx.http.helidon.HelidonHttpServer;
+import cool.scx.http.media.form_params.FormParams;
 
 import java.io.IOException;
 
+import static cool.scx.http.HttpFieldName.ACCEPT;
+
 public class ClientTest {
 
     public static void main(String[] args) throws IOException, InterruptedException {
@@ -18,7 +22,8 @@ public static void test1() throws IOException, InterruptedException {
         var httpServer = new HelidonHttpServer(new ScxHttpServerOptions().setPort(8990));
         httpServer.requestHandler(c -> {
             System.out.println(c.uri());
-            c.response().send("Hi Client !!!");
+            System.out.println(c.body().asFormParams());
+            c.response().send(new Apple("red", "red apple", 99));
         });
         httpServer.webSocketHandler(c -> {
             System.out.println(c.uri());
@@ -32,7 +37,7 @@ public static void test1() throws IOException, InterruptedException {
 
     public static void test2() {
         var httpClient = new HelidonHttpClient();
-        var webSocketBuilder = httpClient.webSocket().uri("http://localhost:8990/中:文|路径/ddd?查询=🎈🎈|🎈");
+        var webSocketBuilder = httpClient.webSocket().uri("http://localhost:8990/中:文|路@径/ddd?查询=🎈🎈|🎈#🎃🎃");
         webSocketBuilder.onConnect(webSocket -> {
             webSocket.onTextMessage(t -> {
                 System.out.println(t);
@@ -45,9 +50,17 @@ public static void test2() {
     public static void test3() {
         var httpClient = new HelidonHttpClient();
         var response = httpClient.request()
-                .uri("http://localhost:8990/中:文|路径/ddd?查询=🎈🎈|🎈")
-                .send();
+                //支持 ACCEPT
+                .addHeader(ACCEPT, MediaType.APPLICATION_XML.value())
+                .uri("http://localhost:8990/中:文|路@径/ddd?查询=🎈🎈|🎈#🎃🎃")
+                .send(new FormParams()
+                        .add("中文|||/ |||===", "嘎 嘎  嘎🧶🧶🛒")
+                        .add("🏓🏓🏓", "!@#%^%&*%%")
+                );
+        //可以用不同的方式重复读取
+        var apple = response.body().asObject(Apple.class);
         var string = response.body().asString();
+        var jsonNode = response.body().asJsonNode();
         System.out.println(string);
     }
 

diff --git a/scx-http/pom.xml b/scx-http/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
 
     <artifactId>scx-http</artifactId>

diff --git a/scx-http/src/main/java/cool/scx/http/ScxHttpBody.java b/scx-http/src/main/java/cool/scx/http/ScxHttpBody.java
@@ -1,6 +1,7 @@
 package cool.scx.http;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import cool.scx.http.media.MediaReader;
 import cool.scx.http.media.form_params.FormParams;
 import cool.scx.http.media.multi_part.MultiPart;
@@ -16,6 +17,7 @@
 
 import static cool.scx.http.media.byte_array.ByteArrayReader.BYTE_ARRAY_READER;
 import static cool.scx.http.media.form_params.FormParamsReader.FORM_PARAMS_READER;
+import static cool.scx.http.media.json_node.JsonNodeReader.JSON_NODE_READER;
 import static cool.scx.http.media.multi_part.MultiPartStreamCachedReader.MULTI_PART_READER_CACHED;
 import static cool.scx.http.media.multi_part.MultiPartStreamReader.MULTI_PART_READER;
 import static cool.scx.http.media.string.StringReader.STRING_READER;
@@ -27,7 +29,11 @@ public interface ScxHttpBody {
 
     InputStream inputStream();
 
-    <T> T as(MediaReader<T> t);
+    ScxHttpHeaders headers();
+
+    default <T> T as(MediaReader<T> t) {
+        return t.read(inputStream(), headers());
+    }
 
     default byte[] asBytes() {
         return as(BYTE_ARRAY_READER);
@@ -61,6 +67,10 @@ default Path asPath(Path path, OpenOption... options) {
         return as(new PathReader(path, options));
     }
 
+    default JsonNode asJsonNode() {
+        return as(JSON_NODE_READER);
+    }
+
     default <T> T asObject(Class<T> c) {
         return as(new ObjectReader<>(c));
     }

diff --git a/scx-http/src/main/java/cool/scx/http/ScxHttpBodyImpl.java b/scx-http/src/main/java/cool/scx/http/ScxHttpBodyImpl.java
@@ -1,38 +1,42 @@
 package cool.scx.http;
 
-import cool.scx.http.media.MediaReader;
-
+import java.io.BufferedInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 
 public class ScxHttpBodyImpl implements ScxHttpBody {
 
     private final InputStream inputStream;
     private final ScxHttpHeaders headers;
 
-    // 简单做一个缓存
-    private String cacheString;
+    // InputStream 的缓存
+    private final BufferedInputStream bufferedInputStream;
 
     public ScxHttpBodyImpl(InputStream inputStream, ScxHttpHeaders headers) {
         this.inputStream = inputStream;
+        this.bufferedInputStream = new BufferedInputStream(inputStream);
         this.headers = headers;
+        this.bufferedInputStream.mark(0);
     }
 
     @Override
-    public InputStream inputStream() {
-        return inputStream;
+    public ScxHttpHeaders headers() {
+        return headers;
     }
 
     @Override
-    public <T> T as(MediaReader<T> t) {
-        return t.read(inputStream, headers);
+    public InputStream inputStream() {
+        try {
+            bufferedInputStream.reset();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return bufferedInputStream;
     }
 
     @Override
-    public String asString() {
-        if (cacheString == null) {
-            cacheString = ScxHttpBody.super.asString();
-        }
-        return cacheString;
+    public String toString() {
+        return asString();
     }
 
 }
diff --git a/scx-http/src/main/java/cool/scx/http/ScxHttpClientRequest.java b/scx-http/src/main/java/cool/scx/http/ScxHttpClientRequest.java
@@ -1,11 +1,15 @@
 package cool.scx.http;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import cool.scx.http.content_type.ContentType;
 import cool.scx.http.cookie.Cookie;
 import cool.scx.http.media.MediaWriter;
 import cool.scx.http.media.byte_array.ByteArrayWriter;
 import cool.scx.http.media.empty.EmptyWriter;
+import cool.scx.http.media.form_params.FormParams;
+import cool.scx.http.media.form_params.FormParamsWriter;
 import cool.scx.http.media.input_stream.InputStreamWriter;
+import cool.scx.http.media.json_node.JsonNodeWriter;
 import cool.scx.http.media.multi_part.MultiPart;
 import cool.scx.http.media.multi_part.MultiPartWriter;
 import cool.scx.http.media.object.ObjectWriter;
@@ -72,10 +76,18 @@ default ScxHttpClientResponse send(InputStream inputStream) {
         return send(new InputStreamWriter(inputStream));
     }
 
+    default ScxHttpClientResponse send(FormParams formParams) {
+        return send(new FormParamsWriter(formParams));
+    }
+
     default ScxHttpClientResponse send(MultiPart multiPart) {
         return send(new MultiPartWriter(multiPart));
     }
 
+    default ScxHttpClientResponse send(JsonNode jsonNode) {
+        return send(new JsonNodeWriter(jsonNode));
+    }
+
     default ScxHttpClientResponse send(Object object) {
         return send(new ObjectWriter(object));
     }

diff --git a/scx-http/src/main/java/cool/scx/http/ScxHttpServerResponse.java b/scx-http/src/main/java/cool/scx/http/ScxHttpServerResponse.java
@@ -1,11 +1,15 @@
 package cool.scx.http;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import cool.scx.http.content_type.ContentType;
 import cool.scx.http.cookie.Cookie;
 import cool.scx.http.media.MediaWriter;
 import cool.scx.http.media.byte_array.ByteArrayWriter;
 import cool.scx.http.media.empty.EmptyWriter;
+import cool.scx.http.media.form_params.FormParams;
+import cool.scx.http.media.form_params.FormParamsWriter;
 import cool.scx.http.media.input_stream.InputStreamWriter;
+import cool.scx.http.media.json_node.JsonNodeWriter;
 import cool.scx.http.media.multi_part.MultiPart;
 import cool.scx.http.media.multi_part.MultiPartWriter;
 import cool.scx.http.media.object.ObjectWriter;
@@ -77,10 +81,18 @@ default void send(InputStream inputStream) {
         send(new InputStreamWriter(inputStream));
     }
 
+    default void send(FormParams formParams) {
+        send(new FormParamsWriter(formParams));
+    }
+
     default void send(MultiPart multiPart) {
         send(new MultiPartWriter(multiPart));
     }
 
+    default void send(JsonNode jsonNode) {
+        send(new JsonNodeWriter(jsonNode));
+    }
+
     default void send(Object object) {
         send(new ObjectWriter(object));
     }

diff --git a/scx-http/src/main/java/cool/scx/http/media/form_params/FormParams.java b/scx-http/src/main/java/cool/scx/http/media/form_params/FormParams.java
@@ -4,4 +4,24 @@
 
 public class FormParams extends ParametersImpl<String, String> {
 
+    @Override
+    public FormParams set(String name, String... value) {
+        return (FormParams) super.set(name, value);
+    }
+
+    @Override
+    public FormParams add(String name, String... value) {
+        return (FormParams) super.add(name, value);
+    }
+
+    @Override
+    public FormParams remove(String name) {
+        return (FormParams) super.remove(name);
+    }
+
+    @Override
+    public FormParams clear() {
+        return (FormParams) super.clear();
+    }
+
 }