Sync with underscore-java.

Author: javadev

.github/workflows/maven.yml

@@ -6,13 +6,16 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [11, 16]
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: ${{ matrix.java }}
     - name: Build with Maven
       run: mvn test jacoco:report --file pom.xml -B 
 

pom.xml

@@ -63,12 +63,13 @@
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>3.2.0</version>
           <configuration>
               <archive>
-                  <manifest>
-                      <mainClass>com.github.underscore.U</mainClass>
-                  </manifest>
+                  <manifestEntries>
+                       <Automatic-Module-Name>com.github.underscore</Automatic-Module-Name>
+                       <mainClass>com.github.underscore.U</mainClass>
+                  </manifestEntries>
               </archive>
           </configuration>
       </plugin>
@@ -106,7 +107,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.5</version>
+        <version>0.8.7</version>
         <executions>
           <execution>
             <id>prepare-agent</id>
@@ -125,12 +126,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.9</version>
+        <version>3.1.2</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.7.1</version>
+        <version>3.9.1</version>
       </plugin>
     </plugins>
   </build>
@@ -139,7 +140,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.5</version>
+        <version>0.8.7</version>
         <configuration>
           <excludes>
             <exclude>**/U$BaseHttpSslSocketFactory*.class</exclude>
@@ -150,12 +151,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.22.0</version>
+        <version>2.18</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.5</version>
+        <version>3.1.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -169,7 +170,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.5</version>
+        <version>3.14.0</version>
             <configuration>
                 <targetJdk>1.8</targetJdk> 
                 <rulesets>
@@ -204,15 +205,15 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>4.0.3</version>
+      <version>4.1.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
 </project>

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

@@ -6,7 +6,7 @@
 import java.util.function.Supplier;
 
 public final class Optional<T> {
-    private static final Optional<?> EMPTY = new Optional();
+    private static final Optional<?> EMPTY = new Optional<>();
     private final T arg;
     private final boolean absent;
 
@@ -99,7 +99,7 @@ public boolean equals(final Object o) {
             return false;
         }
 
-        final Optional optional = (Optional) o;
+        final Optional<?> optional = (Optional) o;
 
         return absent == optional.absent && Objects.equals(arg, optional.arg);
     }

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

@@ -2537,8 +2537,8 @@ public static String escape(final String value) {
     }
 
     public static String unescape(final String value) {
-        return value.replaceAll("&#x60;", "`").replaceAll("&#x27;", "'").replaceAll("&lt;", "<")
-            .replaceAll("&gt;", ">").replaceAll("&quot;", "\"").replaceAll("&amp;", "&");
+        return value.replace("&#x60;", "`").replace("&#x27;", "'").replace("&lt;", "<")
+            .replace("&gt;", ">").replace("&quot;", "\"").replace("&amp;", "&");
     }
 
     /*
@@ -2892,8 +2892,7 @@ public Chain<T> tap(final Consumer<T> func) {
         }
 
         public Chain<T> forEach(final Consumer<T> func) {
-            U.each(list, func);
-            return new Chain<>(list);
+            return tap(func);
         }
 
         public Chain<T> forEachRight(final Consumer<T> func) {
@@ -3180,9 +3179,7 @@ public String join() {
     @SuppressWarnings("unchecked")
     public static <T> List<T> push(final List<T> list, final T ... values) {
         final List<T> result = newArrayList(list);
-        for (T value : values) {
-            result.add(value);
-        }
+        Collections.addAll(result, values);
         return result;
     }
 

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

@@ -30,6 +30,7 @@
 
 public final class Json {
     private static final String NULL = "null";
+    private static final String DIGIT = "digit";
 
     public static class JsonStringBuilder {
         public enum Step {
@@ -689,7 +690,7 @@ private Number readNumber() {
             readChar('-');
             int firstDigit = current;
             if (!readDigit()) {
-                throw expected("digit");
+                throw expected(DIGIT);
             }
             if (firstDigit != '0') {
                 while (readDigit()) {
@@ -722,7 +723,7 @@ private boolean readFraction() {
                 return false;
             }
             if (!readDigit()) {
-                throw expected("digit");
+                throw expected(DIGIT);
             }
             while (readDigit()) {
             }
@@ -737,7 +738,7 @@ private boolean readExponent() {
                 readChar('-');
             }
             if (!readDigit()) {
-                throw expected("digit");
+                throw expected(DIGIT);
             }
             while (readDigit()) {
             }