version 1.2.9: update JsonBodyConverter

youngmonkeys · Mar 30, 2024 · 734f173 · 734f173
1 parent acf6f1e
commit 734f173
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 11 deletions.
diff --git a/ezyhttp-client/pom.xml b/ezyhttp-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>ezyhttp-client</artifactId>

diff --git a/ezyhttp-core/pom.xml b/ezyhttp-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>ezyhttp-core</artifactId>

diff --git a/ezyhttp-core/src/main/java/com/tvd12/ezyhttp/core/codec/JsonBodyConverter.java b/ezyhttp-core/src/main/java/com/tvd12/ezyhttp/core/codec/JsonBodyConverter.java
@@ -5,6 +5,7 @@
 import java.nio.charset.StandardCharsets;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.tvd12.ezyfox.stream.EzyInputStreams;
 import com.tvd12.ezyhttp.core.data.BodyData;
 
 public class JsonBodyConverter implements BodyConverter {
@@ -33,8 +34,11 @@ public <T> T deserialize(BodyData data, Class<T> bodyType) throws IOException {
         return deserialize(inputStream, bodyType);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public <T> T deserialize(InputStream inputStream, Class<T> bodyType) throws IOException {
-        return objectMapper.readValue(inputStream, bodyType);
+        return bodyType == String.class
+            ? (T) EzyInputStreams.toStringUtf8(inputStream)
+            : objectMapper.readValue(inputStream, bodyType);
     }
 }
diff --git a/ezyhttp-core/src/test/java/com/tvd12/ezyhttp/core/test/codec/JsonBodyConverterTest.java b/ezyhttp-core/src/test/java/com/tvd12/ezyhttp/core/test/codec/JsonBodyConverterTest.java
@@ -117,6 +117,23 @@ public void deserializeFromBodyData() throws Exception {
         verify(bodyData, times(1)).getInputStream();
     }
 
+    @Test
+    public void deserializeStringToStringTest() throws Exception {
+        // given
+        JsonBodyConverter sut = new JsonBodyConverter(new ObjectMapper());
+
+        String body = "{\"hello\":\"world\",\"foo\":\"bar\"}";
+
+        // when
+        String actual = sut.deserialize(
+            new ByteArrayInputStream(body.getBytes()),
+            String.class
+        );
+
+        // then
+        Asserts.assertEquals(body, actual);
+    }
+
 
     @Data
     @AllArgsConstructor

diff --git a/ezyhttp-core/src/test/java/com/tvd12/ezyhttp/core/test/io/BytesRangeFileInputStreamTest.java b/ezyhttp-core/src/test/java/com/tvd12/ezyhttp/core/test/io/BytesRangeFileInputStreamTest.java
@@ -8,6 +8,7 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.file.Files;
 
@@ -311,4 +312,23 @@ public void seekErrorTest() {
         // then
         Asserts.assertEqualsType(e, IllegalArgumentException.class);
     }
+
+    @Test
+    public void seekIoErrorTest() {
+        // given
+        final String pomFilePath = "pom.xml";
+        final String range = "bytes=-1-2";
+
+        // when
+        final Throwable e = Asserts.assertThrows(
+            () -> new BytesRangeFileInputStream(
+                pomFilePath,
+                -1,
+                -2
+            )
+        );
+
+        // then
+        Asserts.assertEqualsType(e, IOException.class);
+    }
 }
diff --git a/ezyhttp-server-boot/pom.xml b/ezyhttp-server-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>ezyhttp-server-boot</artifactId>

diff --git a/ezyhttp-server-core/pom.xml b/ezyhttp-server-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>ezyhttp-server-core</artifactId>

diff --git a/ezyhttp-server-graphql/pom.xml b/ezyhttp-server-graphql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>ezyhttp-server-graphql</artifactId>
 

diff --git a/ezyhttp-server-jetty/pom.xml b/ezyhttp-server-jetty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>ezyhttp-server-jetty</artifactId>

diff --git a/ezyhttp-server-management/pom.xml b/ezyhttp-server-management/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>ezyhttp-server-management</artifactId>
     <name>ezyhttp-server-management</name>

diff --git a/ezyhttp-server-thymeleaf/pom.xml b/ezyhttp-server-thymeleaf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
     <artifactId>ezyhttp-server-thymeleaf</artifactId>
 

diff --git a/ezyhttp-server-tomcat/pom.xml b/ezyhttp-server-tomcat/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
     </parent>
 
     <artifactId>ezyhttp-server-tomcat</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
         <version>1.0.6</version>
     </parent>
     <artifactId>ezyhttp</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.9</version>
     <packaging>pom</packaging>
 
     <name>ezyhttp</name>