Sync with underscore-java

Author: javadev

README.md

@@ -24,23 +24,23 @@ Java 17 and later, [Java 11](https://github.com/javadev/underscore-java) or [Kot
 
 ## Installation
 
-Include the following in your `pom.xml` for Maven:
+To configure your Maven project, add the following code to your pom.xml file:
 
-```
+```xml
 <dependencies>
   <dependency>
     <groupId>com.github.javadev</groupId>
     <artifactId>underscore17</artifactId>
-    <version>1.66</version>
+    <version>1.67</version>
   </dependency>
   ...
 </dependencies>
 ```
 
-Gradle:
+Gradle configuration:
 
 ```groovy
-implementation 'com.github.javadev:underscore17:1.66'
+implementation 'com.github.javadev:underscore17:1.67'
 ```
 
 ### Usage
@@ -91,7 +91,7 @@ U.xmlToJson(
         + "   <many>elements</many>\n"
         + "    <many>more elements</many>\n"
         + "   </and>\n"
-        + " <plus a=\"complex\">\n"
+        + "   <plus a=\"complex\">\n"
         + "     element as well\n"
         + "   </plus>\n"
         + "</mydocument>",
@@ -113,6 +113,45 @@ U.xmlToJson(
     //   "#omit-xml-declaration": "yes"
     // }
 
+U.xmlToJsonMinimum(
+    "<data>\n"
+        + "    <string>Example Text</string>\n"
+        + "    <integer>42</integer>\n"
+        + "    <float>3.14</float>\n"
+        + "    <boolean>true</boolean>\n"
+        + "    <date>2025-02-26</date>\n"
+        + "    <time>14:30:00</time>\n"
+        + "    <datetime>2025-02-26T14:30:00Z</datetime>\n"
+        + "    <array>Item 1</array>\n"
+        + "    <array>Item 2</array>\n"
+        + "    <object>\n"
+        + "        <key1>Value 1</key1>\n"
+        + "        <key2>Value 2</key2>\n"
+        + "    </object>\n"
+        + "    <null/>\n"
+        + "</data>\n",
+    Json.JsonStringBuilder.Step.TWO_SPACES);
+    // {
+    //   "data": {
+    //     "string": "Example Text",
+    //     "integer": "42",
+    //     "float": "3.14",
+    //     "boolean": "true",
+    //     "date": "2025-02-26",
+    //     "time": "14:30:00",
+    //     "datetime": "2025-02-26T14:30:00Z",
+    //     "array": [
+    //       "Item 1",
+    //       "Item 2"
+    //     ],
+    //     "object": {
+    //       "key1": "Value 1",
+    //       "key2": "Value 2"
+    //     },
+    //     "null": ""
+    //   }
+    // }
+
 U.jsonToXml(
     "{\n"
         + "  \"mydocument\": {\n"
@@ -141,6 +180,45 @@ U.jsonToXml(
     //    </plus>
     // </mydocument>
 
+U.jsonToXmlMinimum(
+    "{\n"
+        + "  \"data\": {\n"
+        + "    \"string\": \"Example Text\",\n"
+        + "    \"integer\": \"42\",\n"
+        + "    \"float\": \"3.14\",\n"
+        + "    \"boolean\": \"true\",\n"
+        + "    \"date\": \"2025-02-26\",\n"
+        + "    \"time\": \"14:30:00\",\n"
+        + "    \"datetime\": \"2025-02-26T14:30:00Z\",\n"
+        + "    \"array\": [\n"
+        + "      \"Item 1\",\n"
+        + "      \"Item 2\"\n"
+        + "    ],\n"
+        + "    \"object\": {\n"
+        + "      \"key1\": \"Value 1\",\n"
+        + "      \"key2\": \"Value 2\"\n"
+        + "    },\n"
+        + "    \"null\": \"\"\n"
+        + "  }\n"
+        + "}",
+    Xml.XmlStringBuilder.Step.TWO_SPACES);
+    // <data>
+    //   <string>Example Text</string>
+    //   <integer>42</integer>
+    //   <float>3.14</float>
+    //   <boolean>true</boolean>
+    //   <date>2025-02-26</date>
+    //   <time>14:30:00</time>
+    //   <datetime>2025-02-26T14:30:00Z</datetime>
+    //   <array>Item 1</array>
+    //   <array>Item 2</array>
+    //   <object>
+    //     <key1>Value 1</key1>
+    //     <key2>Value 2</key2>
+    //   </object>
+    //   <null string="true"/>
+    // </data>
+
 U.Builder builder = U.objectBuilder()
     .add("firstName", "John")
     .add("lastName", "Smith")
@@ -212,79 +290,6 @@ System.out.println(builder.toXml());
 </root>
 ```
 
-```java
-String inventory =
-    "{\n"
-        + "  \"inventory\": {\n"
-        + "    \"#comment\": \"Test is test comment\",\n"
-        + "    \"book\": [\n"
-        + "      {\n"
-        + "        \"-year\": \"2000\",\n"
-        + "        \"title\": \"Snow Crash\",\n"
-        + "        \"author\": \"Neal Stephenson\",\n"
-        + "        \"publisher\": \"Spectra\",\n"
-        + "        \"isbn\": \"0553380958\",\n"
-        + "        \"price\": \"14.95\"\n"
-        + "      },\n"
-        + "      {\n"
-        + "        \"-year\": \"2005\",\n"
-        + "        \"title\": \"Burning Tower\",\n"
-        + "        \"author\": [\n"
-        + "          \"Larry Niven\",\n"
-        + "          \"Jerry Pournelle\"\n"
-        + "        ],\n"
-        + "        \"publisher\": \"Pocket\",\n"
-        + "        \"isbn\": \"0743416910\",\n"
-        + "        \"price\": \"5.99\"\n"
-        + "      },\n"
-        + "      {\n"
-        + "        \"-year\": \"1995\",\n"
-        + "        \"title\": \"Zodiac\",\n"
-        + "        \"author\": \"Neal Stephenson\",\n"
-        + "        \"publisher\": \"Spectra\",\n"
-        + "        \"isbn\": \"0553573862\",\n"
-        + "        \"price\": \"7.50\"\n"
-        + "      }\n"
-        + "    ]\n"
-        + "  }\n"
-        + "}";
-String title = U.selectToken(U.fromJsonMap(inventory), "//book[@year>2001]/title/text()");
-// "Burning Tower"
-
-String json =
-    "{\n"
-        + "  \"Stores\": [\n"
-        + "    \"Lambton Quay\",\n"
-        + "    \"Willis Street\"\n"
-        + "  ],\n"
-        + "  \"Manufacturers\": [\n"
-        + "    {\n"
-        + "      \"Name\": \"Acme Co\",\n"
-        + "      \"Products\": [\n"
-        + "        {\n"
-        + "          \"Name\": \"Anvil\",\n"
-        + "          \"Price\": 50\n"
-        + "        }\n"
-        + "      ]\n"
-        + "    },\n"
-        + "    {\n"
-        + "      \"Name\": \"Contoso\",\n"
-        + "      \"Products\": [\n"
-        + "        {\n"
-        + "          \"Name\": \"Elbow Grease\",\n"
-        + "          \"Price\": 99.95\n"
-        + "        },\n"
-        + "        {\n"
-        + "          \"Name\": \"Headlight Fluid\",\n"
-        + "          \"Price\": 4\n"
-        + "        }\n"
-        + "      ]\n"
-        + "    }\n"
-        + "  ]\n"
-        + "}";
-List<String> names = U.selectTokens(U.fromJsonMap(json), "//Products[Price>=50]/Name/text()");
-// [Anvil, Elbow Grease]
-```
 Simplify XML document creation by structuring your code like the final document.
 
 This code:
@@ -299,9 +304,11 @@ XmlBuilder builder = XmlBuilder.create("Projects")
     .e("JetS3t").a("language", "Java").a("scm", "CVS")
         .e("Location").a("type", "URL")
             .t("https://jets3t.s3.amazonaws.com/index.html");
+System.out.println(builder.toXml(Xml.XmlStringBuilder.Step.TWO_SPACES));
+System.out.println(builder.toJson(Json.JsonStringBuilder.Step.TWO_SPACES));
 ```
 
-Generates the following XML document:
+Generates the following XML and JSON documents:
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -314,6 +321,28 @@ Generates the following XML document:
     </JetS3t>
 </Projects>
 ```
+```json
+{
+  "Projects": {
+    "underscore-java": {
+      "-language": "Java",
+      "-scm": "SVN",
+      "Location": {
+        "-type": "URL",
+        "#text": "https://github.com/javadev/underscore-java/"
+      }
+    },
+    "JetS3t": {
+      "-language": "Java",
+      "-scm": "CVS",
+      "Location": {
+        "-type": "URL",
+        "#text": "https://jets3t.s3.amazonaws.com/index.html"
+      }
+    }
+  }
+}
+```
 
 Underscore-java is a java port of [Underscore.js](https://underscorejs.org/).
 

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright 2015-2024 Valentyn Kolesnikov
+ * Copyright 2015-2025 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/main/java/com/github/underscore/Json.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright 2015-2024 Valentyn Kolesnikov
+ * Copyright 2015-2025 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
@@ -83,7 +83,9 @@ public JsonStringBuilder append(final String string) {
         }
 
         public JsonStringBuilder fillSpaces() {
-            builder.append(String.valueOf(identStep == Step.TABS ? '\t' : ' ').repeat(Math.max(0, indent)));
+            builder.append(
+                    String.valueOf(identStep == Step.TABS ? '\t' : ' ')
+                            .repeat(Math.max(0, indent)));
             return this;
         }
 

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright 2015-2024 Valentyn Kolesnikov
+ * Copyright 2015-2025 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
@@ -98,16 +98,7 @@ public class U<T> extends Underscore<T> {
     private static final String YES = "yes";
     private static final java.util.regex.Pattern RE_WORDS =
             java.util.regex.Pattern.compile(
-                    UPPER
-                            + "+(?="
-                            + UPPER
-                            + LOWER
-                            + ")|"
-                            + UPPER
-                            + "?"
-                            + LOWER
-                            + "|"
-                            + UPPER
+                    UPPER + "+(?=" + UPPER + LOWER + ")|" + UPPER + "?" + LOWER + "|" + UPPER
                             + "+|\\d+");
 
     static {
@@ -2069,8 +2060,7 @@ public static long downloadUrl(final String url, final String fileName)
 
     public static void decompressGzip(final String sourceFileName, final String targetFileName)
             throws IOException {
-        try (GZIPInputStream gis =
-                new GZIPInputStream(new FileInputStream(sourceFileName))) {
+        try (GZIPInputStream gis = new GZIPInputStream(new FileInputStream(sourceFileName))) {
             Files.copy(gis, Paths.get(targetFileName));
         }
     }
@@ -2524,12 +2514,16 @@ public static <T> String join(final Iterable<T> iterable, final String separator
         return Underscore.join(iterable, separator);
     }
 
-    public static <T> String joinToString(final Iterable<T> iterable, final String separator,
-                                  final String prefix, final String postfix,
-                                  final int limit,
-                                  final String truncated,
-                                  final Function<T, String> transform) {
-        return Underscore.joinToString(iterable, separator, prefix, postfix, limit, truncated, transform);
+    public static <T> String joinToString(
+            final Iterable<T> iterable,
+            final String separator,
+            final String prefix,
+            final String postfix,
+            final int limit,
+            final String truncated,
+            final Function<T, String> transform) {
+        return Underscore.joinToString(
+                iterable, separator, prefix, postfix, limit, truncated, transform);
     }
 
     public static String toJson(Collection collection) {
@@ -2914,8 +2908,7 @@ public static Map<String, Object> removeMinusesAndConvertNumbers(Map<String, Obj
             } else {
                 newKey = entry.getKey();
             }
-            if (!entry.getKey().equals(SELF_CLOSING)
-                    && !entry.getKey().equals(OMIT_XML_DECL)) {
+            if (!entry.getKey().equals(SELF_CLOSING) && !entry.getKey().equals(OMIT_XML_DECL)) {
                 outMap.put(newKey, makeObject(entry.getValue()));
             }
         }