Sync with underscore-java

javadev · javadev · commit c43e844f0584 · 2023-08-15T09:29:00.000+03:00
diff --git a/pom-central17.xml b/pom-central17.xml
@@ -57,7 +57,7 @@
           <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>[5.9.3,)</version>
+            <version>[5.10.0,)</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.3,)</version>
+      <version>[5.10.0,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom-pack17.xml b/pom-pack17.xml
@@ -58,7 +58,7 @@
           <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>[5.9.3,)</version>
+            <version>[5.10.0,)</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -94,7 +94,6 @@
             <option>-keep public class com.github.underscore.*$Chain { *; }</option>
             <option>-keep public class com.github.underscore.Underscore.Function3 { *; }</option>
             <option>-keep public class com.github.underscore.Underscore.MemoizeFunction { *; }</option>
-            <option>-keep public class com.github.underscore.Optional { *; }</option>
             <option>-keep public class com.github.underscore.Underscore.PredicateIndexed { *; }</option>
             <option>-keep public class com.github.underscore.Underscore.Template { *; }</option>
             <option>-keep public class com.github.underscore.Base32 { *; }</option>
@@ -239,7 +238,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.3,)</version>
+      <version>[5.10.0,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
           <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>[5.9.3,)</version>
+            <version>[5.10.0,)</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -211,7 +211,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.3,)</version>
+      <version>[5.10.0,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/main/java/com/github/underscore/Optional.java b/src/main/java/com/github/underscore/Optional.java
diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java
@@ -47,6 +47,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
@@ -63,6 +64,7 @@
 @SuppressWarnings({
     "java:S135",
     "java:S1168",
+    "java:S3655",
     "java:S3740",
     "java:S3776",
     "java:S4423",
diff --git a/src/main/java/com/github/underscore/Underscore.java b/src/main/java/com/github/underscore/Underscore.java
@@ -34,16 +34,14 @@
 import java.util.Date;
 import java.util.Deque;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Queue;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.BiConsumer;
@@ -60,7 +58,14 @@
  *
  * @author Valentyn Kolesnikov
  */
-@SuppressWarnings({"java:S106", "java:S2189", "java:S2272", "java:S3740", "java:S5852"})
+@SuppressWarnings({
+    "java:S106",
+    "java:S2189",
+    "java:S2272",
+    "java:S2789",
+    "java:S3740",
+    "java:S5852"
+})
 public class Underscore<T> {
     private static final Map<String, Function<String, String>> FUNCTIONS = newLinkedHashMap();
     private static final Map<String, String> TEMPLATE_SETTINGS = new HashMap<>();
@@ -534,7 +539,7 @@ public static <T, E> E foldr(
     public static <E> Optional<E> find(final Iterable<E> iterable, final Predicate<E> pred) {
         for (E element : iterable) {
             if (pred.test(element)) {
-                return Optional.of(element);
+                return isNull(element) ? null : Optional.of(element);
             }
         }
         return Optional.empty();
@@ -667,7 +672,8 @@ public boolean all(final Predicate<T> pred) {
     }
 
     public static <E> boolean some(final Iterable<E> iterable, final Predicate<E> pred) {
-        return find(iterable, pred).isPresent();
+        Optional<E> optional = find(iterable, pred);
+        return optional == null || optional.isPresent();
     }
 
     public boolean some(final Predicate<T> pred) {
diff --git a/src/main/java/com/github/underscore/Xml.java b/src/main/java/com/github/underscore/Xml.java
@@ -38,13 +38,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-@SuppressWarnings({
-    "java:S107",
-    "java:S1119",
-    "java:S3740",
-    "java:S3776",
-    "java:S4276"
-})
+@SuppressWarnings({"java:S107", "java:S1119", "java:S3740", "java:S3776", "java:S4276"})
 public final class Xml {
     private Xml() {}
 
diff --git a/src/test/java/com/github/underscore/CollectionsTest.java b/src/test/java/com/github/underscore/CollectionsTest.java
@@ -39,6 +39,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
diff --git a/src/test/java/com/github/underscore/FunctionsTest.java b/src/test/java/com/github/underscore/FunctionsTest.java
@@ -33,6 +33,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Predicate;
diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java
@@ -1295,6 +1295,10 @@ void formatXml() {
                                 + "<element>2</element></root>"));
         assertEquals(
                 "<a>\n  <b></b>\n  <b></b>\n</a>", U.formatXml("<a>\n  <b></b>\n  <b></b>\n</a>"));
+        assertEquals(
+                "<a>\n   <b></b>\n   <b></b>\n</a>",
+                U.formatXml(
+                        "<a>\n  <b></b>\n  <b></b>\n</a>", Xml.XmlStringBuilder.Step.THREE_SPACES));
         assertEquals(
                 "<a>\n    <b></b>\n    <b></b>\n</a>",
                 U.formatXml(
diff --git a/src/test/java/com/github/underscore/StringTest.java b/src/test/java/com/github/underscore/StringTest.java
@@ -3555,6 +3555,56 @@ void fromXmlStackoverflowObject() throws IOException {
         }
     }
 
+    private String repeat(String s, int times) {
+        StringBuilder stringBuilder = new StringBuilder(s.length() * times);
+        for (int i = 0; i < times; i++) {
+            stringBuilder.append(s);
+        }
+        return stringBuilder.toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    void testParseDeeplyNestedArrays() throws IOException {
+        int times = 1000;
+        // [[[ ... ]]]
+        String json = repeat("[", times) + repeat("]", times);
+
+        int actualTimes = 0;
+        List<Object> current = U.fromJson(json);
+        while (true) {
+            actualTimes++;
+            if (current.isEmpty()) {
+                break;
+            }
+            assertEquals(1, current.size());
+            current = (List<Object>) current.get(0);
+        }
+        assertEquals(times, actualTimes);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    void testParseDeeplyNestedObjects() throws IOException {
+        int times = 1000;
+        // {"a":{"a": ... {"a":null} ... }}
+        String json = repeat("{\"a\":", times) + "null" + repeat("}", times);
+
+        int actualTimes = 0;
+        Map<String, Object> current = U.fromJsonMap(json);
+        while (true) {
+            assertEquals(1, current.size());
+            actualTimes++;
+            Map<String, Object> next = (Map<String, Object>) current.get("a");
+            if (next == null) {
+                break;
+            } else {
+                current = next;
+            }
+        }
+        assertEquals(times, actualTimes);
+    }
+
     @Test
     void testDecodeParseXmlErr13() {
         assertThrows(IllegalArgumentException.class, () -> U.fromXml("[\"abc\u0010\"]"));
diff --git a/src/test/java/com/github/underscore/UnderscoreTest.java b/src/test/java/com/github/underscore/UnderscoreTest.java
diff --git a/src/test/java/com/github/underscore/UtilityTest.java b/src/test/java/com/github/underscore/UtilityTest.java
