Sync with underscore-java

Author: javadev

pom-central.xml

@@ -67,7 +67,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.13</version>
+        <version>0.8.14</version>
         <executions>
           <execution>
             <id>prepare-agent</id>
@@ -274,19 +274,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.13.2</version>
+      <version>5.14.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.13.2</version>
+      <version>1.14.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>[4.2.0,)</version>
+      <version>[4.3.0,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

pom.xml

@@ -47,7 +47,7 @@
           <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.13.2</version>
+            <version>5.14.1</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -198,19 +198,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.13.4</version>
+      <version>5.14.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.13.2</version>
+      <version>1.14.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>[4.2.0,)</version>
+      <version>[4.3.0,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/com/github/underscore/U.java

@@ -2246,7 +2246,7 @@ public static FetchResponse fetch(
             final java.io.ByteArrayOutputStream result = new java.io.ByteArrayOutputStream();
             final byte[] buffer = new byte[BUFFER_LENGTH_1024];
             int length;
-            while ((length = inputStream.read(buffer)) != -1) {
+            while ((length = readWithRetry(inputStream, buffer)) != -1) {
                 result.write(buffer, 0, length);
             }
             inputStream.close();
@@ -2260,6 +2260,18 @@ public static FetchResponse fetch(
         }
     }
 
+    public static int readWithRetry(java.io.InputStream inputStream, byte[] buffer) throws java.io.IOException {
+        java.io.IOException lastException = null;
+        for (int attempt = 0; attempt < 2; attempt++) {
+            try {
+                return inputStream.read(buffer);
+            } catch (java.io.IOException ex) {
+                lastException = ex;
+            }
+        }
+        throw lastException;
+    }
+
     public static class Fetch {
         private Fetch() {}
 

src/test/java/com/github/underscore/LodashTest.java

@@ -619,7 +619,8 @@ void fetchGet() {
                         + "}",
                 resultChain.item());
         U.chain(
-                        "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json")
+                        "https://raw.githubusercontent.com/javadev/underscore-java/refs/heads/"
+                                + "main/src/test/resources/example.json")
                 .fetch();
     }
 
@@ -666,7 +667,8 @@ void fetchGetWithTimeouts() {
     void fetchGetWithTimeoutsAndRetry() {
         U.FetchResponse result =
                 U.fetch(
-                        "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json",
+                        "https://raw.githubusercontent.com/javadev/underscore-java/refs/heads/"
+                                + "main/src/test/resources/example.json",
                         30000,
                         30000,
                         1,
@@ -763,6 +765,85 @@ void fetchPut() {
                 resultChain.item().replace("\r\n", "\n"));
     }
 
+    static class TestInputStream extends java.io.InputStream {
+        private final int[] returnValues;
+        private final IOException[] exceptions;
+        private int callCount = 0;
+
+        public TestInputStream(int[] returnValues, IOException[] exceptions) {
+            this.returnValues = returnValues;
+            this.exceptions = exceptions;
+        }
+
+        @Override
+        public int read() {
+            return 0;
+        }
+
+        @Override
+        public int read(byte[] b) throws IOException {
+            int index = callCount++;
+            if (exceptions != null && index < exceptions.length && exceptions[index] != null) {
+                throw exceptions[index];
+            }
+            if (returnValues != null && index < returnValues.length) {
+                return returnValues[index];
+            }
+            return -1;
+        }
+    }
+
+    @Test
+    void testSuccessfulReadOnFirstAttempt() throws IOException {
+        java.io.InputStream inputStream = new TestInputStream(new int[]{100}, null);
+        byte[] buffer = new byte[1024];
+        int result = U.readWithRetry(inputStream, buffer);
+        assertEquals(100, result);
+    }
+
+    @Test
+    void testSuccessfulReadOnSecondAttempt() throws IOException {
+        java.io.InputStream inputStream = new TestInputStream(
+            new int[]{0, 50},
+            new IOException[]{new IOException("First failed"), null}
+        );
+        byte[] buffer = new byte[1024];
+        int result = U.readWithRetry(inputStream, buffer);
+        assertEquals(50, result);
+    }
+
+    @Test
+    void testBothAttemptsFailWithIOException() {
+        java.io.InputStream inputStream = new TestInputStream(
+            null,
+            new IOException[]{
+                new IOException("First attempt failed"),
+                new IOException("Second attempt failed")
+            }
+        );
+        byte[] buffer = new byte[1024];
+        IOException thrown = assertThrows(IOException.class, () -> {
+            U.readWithRetry(inputStream, buffer);
+        });
+        assertEquals("Second attempt failed", thrown.getMessage());
+    }
+
+    @Test
+    void testReadReturnsMinusOne() throws IOException {
+        java.io.InputStream inputStream = new TestInputStream(new int[]{-1}, null);
+        byte[] buffer = new byte[1024];
+        int result = U.readWithRetry(inputStream, buffer);
+        assertEquals(-1, result);
+    }
+
+    @Test
+    void testReadReturnsZero() throws IOException {
+        java.io.InputStream inputStream = new TestInputStream(new int[]{0}, null);
+        byte[] buffer = new byte[1024];
+        int result = U.readWithRetry(inputStream, buffer);
+        assertEquals(0, result);
+    }
+
     @Test
     void fetchWrongUrl() {
         assertThrows(IllegalArgumentException.class, () -> U.fetch("ttt"));