Sync with underscore-java

Author: javadev

.github/workflows/maven.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Build with Maven
       run: mvn test jacoco:report --file pom.xml -B 
 
-    - uses: codecov/codecov-action@v2
+    - uses: codecov/codecov-action@v3
       with:
         file: target/site/jacoco/jacoco.xml
         name: codecov

pom-central17.xml

@@ -57,7 +57,7 @@
           <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>[5.9.2,)</version>
+            <version>[5.9.3,)</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.2,)</version>
+      <version>[5.9.3,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

pom-pack17.xml

@@ -58,7 +58,7 @@
           <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>[5.9.2,)</version>
+            <version>[5.9.3,)</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -239,7 +239,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.2,)</version>
+      <version>[5.9.3,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

pom.xml

@@ -60,7 +60,7 @@
           <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>[5.9.2,)</version>
+            <version>[5.9.3,)</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -211,7 +211,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.2,)</version>
+      <version>[5.9.3,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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

@@ -365,7 +365,7 @@ private static void doWriteJson(Object value, JsonStringBuilder builder) {
             } else if (value instanceof Object[]) {
                 JsonArray.writeJson((Object[]) value, builder);
             } else {
-                builder.append(value.toString());
+                builder.append('"').append(escape(value.toString())).append('"');
             }
         }
 

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright 2015-2023 Valentyn Kolesnikov
+ * Copyright 2023 Valentyn Kolesnikov
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -537,7 +537,7 @@ public String toString() {
             }
         }
         assertEquals(
-                "[\n  [\n    test,\n    test\n  ]\n]",
+                "[\n  [\n    \"test\",\n    \"test\"\n  ]\n]",
                 U.toJson(
                         new ArrayList<Test[]>() {
                             {
@@ -546,6 +546,22 @@ public String toString() {
                         }));
     }
 
+    enum A {
+        X,
+        Y,
+        Z
+    }
+
+    @Test
+    void testJsonArrayCollectionEnum() {
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(A.X);
+        list.add(A.Y);
+        map.put("l", list);
+        assertEquals("{\n  \"l\": [\n    \"X\",\n    \"Y\"\n  ]\n}", U.toJson(map));
+    }
+
     @Test
     void escape() {
         assertNull(Json.JsonValue.escape(null));

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright 2015-2023 Valentyn Kolesnikov
+ * Copyright 2023 Valentyn Kolesnikov
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal