* Performance improvement: DeepEquals.deepHashCode() - now using `…

…IdentityHashMap()` for cycle (visited) detection.

  * Modernization: `UniqueIdGenerator` - updated to use `Lock.lock()` and `Lock.unlock()` instead of `synchronized` keyword.
  * Using json-io 4.14.1 for cloning object in "test" scope, eliminates cycle depedencies when building both json-io and java-util.

README.md

@@ -15,15 +15,15 @@ The classes in the`.jar`file are version 52 (`JDK 1.8`).
 To include in your project:
 ##### GradleF
 ```
-implementation 'com.cedarsoftware:java-util:2.4.7'
+implementation 'com.cedarsoftware:java-util:2.4.8'
 ```
 
 ##### Maven
 ```
 <dependency>
   <groupId>com.cedarsoftware</groupId>
   <artifactId>java-util</artifactId>
-  <version>2.4.7</version>
+  <version>2.4.8</version>
 </dependency>
 ```
 ---

changelog.md

@@ -1,6 +1,8 @@
 ### Revision History
-* 2.4.8-SNAPSHOT
-  * Using json-io 4.14.2 for cloning object in "test" scope, eliminates cycle depedencies 
+* 2.4.8
+  * Performance improvement: `DeepEquals.deepHashCode()` - now using `IdentityHashMap()` for cycle (visited) detection.
+  * Modernization: `UniqueIdGenerator` - updated to use `Lock.lock()` and `Lock.unlock()` instead of `synchronized` keyword.
+  * Using json-io 4.14.1 for cloning object in "test" scope, eliminates cycle depedencies when building both json-io and java-util.
 * 2.4.7
   * All 687 conversions supported are now 100% cross-product tested.  Converter test suite is complete.
 * 2.4.6

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.cedarsoftware</groupId>
     <artifactId>java-util</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.8-SNAPSHOT</version>
+    <version>2.4.8</version>
     <description>Java Utilities</description>
     <url>https://github.com/jdereg/java-util</url>
 
@@ -33,7 +33,7 @@
         <version.junit-jupiter-api>5.10.2</version.junit-jupiter-api>
         <version.junit-jupiter-params>5.10.2</version.junit-jupiter-params>
         <version.assertj-core>3.25.3</version.assertj-core>
-        <version.json-io>4.14.2</version.json-io>
+        <version.json-io>4.14.1</version.json-io>
         <version.mockito-junit-jupiter>4.11.0</version.mockito-junit-jupiter>
         <version.agrona>1.21.1</version.agrona>
 

src/main/java/com/cedarsoftware/util/CaseInsensitiveMap.java

@@ -623,12 +623,12 @@ public boolean equals(Object other)
             {
                 return true;
             }
-            else if (other instanceof CaseInsensitiveString)
+            if (other instanceof CaseInsensitiveString)
             {
                 return hash == ((CaseInsensitiveString)other).hash &&
                         original.equalsIgnoreCase(((CaseInsensitiveString)other).original);
             }
-            else if (other instanceof String)
+            if (other instanceof String)
             {
                 return original.equalsIgnoreCase((String)other);
             }
@@ -642,15 +642,13 @@ public int compareTo(Object o)
                 CaseInsensitiveString other = (CaseInsensitiveString) o;
                 return original.compareToIgnoreCase(other.original);
             }
-            else if (o instanceof String)
+            if (o instanceof String)
             {
                 String other = (String)o;
                 return original.compareToIgnoreCase(other);
             }
-            else
-            {   // Strings are less than non-Strings (come before)
-                return -1;
-            }
+            // Strings are less than non-Strings (come before)
+            return -1;
         }
     }
 }

src/main/java/com/cedarsoftware/util/CaseInsensitiveSet.java

@@ -44,11 +44,11 @@ public CaseInsensitiveSet(Collection<? extends E> collection)
     {
         if (collection instanceof ConcurrentSkipListSet)
         {
-            map = new CaseInsensitiveMap<>(new ConcurrentSkipListMap());
+            map = new CaseInsensitiveMap<>(new ConcurrentSkipListMap<>());
         }
         else if (collection instanceof SortedSet)
         {
-            map = new CaseInsensitiveMap<>(new TreeMap());
+            map = new CaseInsensitiveMap<>(new TreeMap<>());
         }
         else
         {

src/main/java/com/cedarsoftware/util/DeepEquals.java

@@ -10,6 +10,7 @@
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -736,22 +737,22 @@ public static boolean hasCustomEquals(Class<?> c)
      * @return the 'deep' hashCode value for the passed in object.
      */
     public static int deepHashCode(Object obj) {
-        Set<Object> visited = new HashSet<>();
+        Map<Object, Object> visited = new IdentityHashMap<>();
         return deepHashCode(obj, visited);
     }
 
-    private static int deepHashCode(Object obj, Set<Object> visited) {
+    private static int deepHashCode(Object obj, Map<Object, Object> visited) {
         LinkedList<Object> stack = new LinkedList<>();
         stack.addFirst(obj);
         int hash = 0;
 
         while (!stack.isEmpty()) {
             obj = stack.removeFirst();
-            if (obj == null || visited.contains(obj)) {
+            if (obj == null || visited.containsKey(obj)) {
                 continue;
             }
 
-            visited.add(obj);
+            visited.put(obj, null);
 
             // Ensure array order matters to hash
             if (obj.getClass().isArray()) {

src/main/java/com/cedarsoftware/util/MapUtilities.java

@@ -12,6 +12,7 @@
  * Usefule utilities for Maps
  *
  * @author Kenneth Partlow
+ * @author John DeRegnaucourt
  *         <br>
  *         Copyright (c) Cedar Software LLC
  *         <br><br>

src/main/java/com/cedarsoftware/util/StringUtilities.java

@@ -107,7 +107,7 @@ public static boolean equalsIgnoreCase(CharSequence cs1, CharSequence cs2) {
     }
 
     /**
-     * @see StringUtilities@equalsIgnoreCase(CharSequence, CharSequence)
+     * @see StringUtilities#equalsIgnoreCase(CharSequence, CharSequence)
      */
     public static boolean equalsIgnoreCase(String s1, String s2) {
         return equalsIgnoreCase((CharSequence) s1, (CharSequence) s2);