From 4605db9dce2b6a23d937bb963651359820eb6886 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Sat, 1 Aug 2020 06:19:05 +0300
Subject: [PATCH] Introduce version 1.14.

---
 README.md                                              | 4 ++--
 pom-central.xml                                        | 8 ++++----
 pom-pack.xml                                           | 8 ++++----
 pom.xml                                                | 8 ++++----
 src/main/java/com/github/underscore/U.java             | 6 ++++++
 src/main/java/com/github/underscore/lodash/U.java      | 9 +++++++--
 src/test/java/com/github/underscore/FunctionsTest.java | 2 +-
 7 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 605cce3..b1ce07c 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Include the following in your `pom.xml` for Maven:
   <dependency>
     <groupId>com.github.javadev</groupId>
     <artifactId>underscore11</artifactId>
-    <version>1.13</version>
+    <version>1.14</version>
   </dependency>
   ...
 </dependencies>
@@ -34,7 +34,7 @@ Include the following in your `pom.xml` for Maven:
 Gradle:
 
 ```groovy
-compile 'com.github.javadev:underscore11:1.13'
+compile 'com.github.javadev:underscore11:1.14'
 ```
 
 Underscore-java is a java port of [Underscore.js](http://underscorejs.org/).
diff --git a/pom-central.xml b/pom-central.xml
index c4fc5d1..696a50e 100644
--- a/pom-central.xml
+++ b/pom-central.xml
@@ -5,7 +5,7 @@
   <groupId>com.github.javadev</groupId>
   <artifactId>underscore11</artifactId>
   <packaging>jar</packaging>
-  <version>1.13</version>
+  <version>1.14</version>
   <name>java 11 port of Underscore.js</name>
   <description>The java 11 port of Underscore.js</description>
   <url>https://github.com/javadev/underscore-java11</url>
@@ -50,7 +50,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.8.1</version>
         <configuration>
           <source>11</source>
           <target>11</target>
@@ -117,13 +117,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>4.0.2</version>
+      <version>4.0.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/pom-pack.xml b/pom-pack.xml
index 79462f8..69b56a3 100644
--- a/pom-pack.xml
+++ b/pom-pack.xml
@@ -5,7 +5,7 @@
   <groupId>com.github.javadev</groupId>
   <artifactId>underscore11</artifactId>
   <packaging>jar</packaging>
-  <version>1.13</version>
+  <version>1.14</version>
   <name>java 11 port of Underscore.js</name>
   <description>The java 11 port of Underscore.js</description>
   <url>https://github.com/javadev/underscore-java11</url>
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.8.1</version>
         <configuration>
           <source>10</source>
           <target>10</target>
@@ -240,13 +240,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>4.0.2</version>
+      <version>4.0.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 265aa59..41e32e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>com.github.javadev</groupId>
   <artifactId>underscore11</artifactId>
   <packaging>jar</packaging>
-  <version>1.13-SNAPSHOT</version>
+  <version>1.14-SNAPSHOT</version>
   <name>java 11 port of Underscore.js</name>
   <description>The java 11 port of Underscore.js</description>
   <url>https://github.com/javadev/underscore-java11</url>
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.8.1</version>
         <configuration>
           <source>11</source>
           <target>11</target>
@@ -204,13 +204,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>4.0.2</version>
+      <version>4.0.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java
index 9ce941a..198d592 100644
--- a/src/main/java/com/github/underscore/U.java
+++ b/src/main/java/com/github/underscore/U.java
@@ -3652,6 +3652,12 @@ protected static <T> List<T> newArrayList(final Iterable<T> iterable) {
         return result;
     }
 
+    protected static <T> List<T> newArrayList(final T object) {
+        final List<T> result = new ArrayList<T>();
+        result.add(object);
+        return result;
+    }
+
     protected static <T> List<T> newArrayList(final Iterable<T> iterable, final int size) {
         final List<T> result = new ArrayList<T>();
         for (int index = 0; iterable.iterator().hasNext() && index < size; index += 1) {
diff --git a/src/main/java/com/github/underscore/lodash/U.java b/src/main/java/com/github/underscore/lodash/U.java
index 8a0ff9e..dad7805 100644
--- a/src/main/java/com/github/underscore/lodash/U.java
+++ b/src/main/java/com/github/underscore/lodash/U.java
@@ -1653,14 +1653,19 @@ private static Object makeObjectForSetValue(Object value, final String key,
     @SuppressWarnings("unchecked")
     public static Map<String, Object> update(final Map<String, Object> map1, final Map<String, Object> map2) {
         Map<String, Object> outMap = newLinkedHashMap();
-        for (String key : map2.keySet()) {
-            Object value2 = map2.get(key);
+        for (Map.Entry<String, Object> entry : map2.entrySet()) {
+            String key = entry.getKey();
+            Object value2 = entry.getValue();
             if (map1.containsKey(key)) {
                 Object value1 = map1.get(key);
                 if (value1 instanceof Map && value2 instanceof Map) {
                     outMap.put(key, update((Map<String, Object>) value1, (Map<String, Object>) value2));
                 } else if (value1 instanceof List && value2 instanceof List) {
                     outMap.put(key, merge((List<Object>) value1, (List<Object>) value2));
+                } else if (value1 instanceof List) {
+                    outMap.put(key, merge((List<Object>) value1, newArrayList(value2)));
+                } else if (value2 instanceof List) {
+                    outMap.put(key, merge(newArrayList(value1), (List<Object>) value2));
                 } else {
                     outMap.put(key, value2);
                 }
diff --git a/src/test/java/com/github/underscore/FunctionsTest.java b/src/test/java/com/github/underscore/FunctionsTest.java
index b99a159..979ce88 100644
--- a/src/test/java/com/github/underscore/FunctionsTest.java
+++ b/src/test/java/com/github/underscore/FunctionsTest.java
@@ -120,7 +120,7 @@ public void throttle() {
         final Integer[] counter = new Integer[] {0};
         Supplier<Void> incr = new Supplier<Void>() { public Void get() {
             counter[0]++; return null; } };
-        final Supplier<Void> throttleIncr = U.throttle(incr, 40);
+        final Supplier<Void> throttleIncr = U.throttle(incr, 50);
         throttleIncr.get();
         throttleIncr.get();
         U.delay(throttleIncr, 16);