Merge pull request #1947 from apache/OAK-11349

OAK-11348 : removed usage of Guava's Maps.newIdentityHashMap

Author: rishabhdaim

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SetPropertyTest.java

@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.oak.benchmark;
 
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -27,8 +28,6 @@
 
 import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
-
 /**
  * Test for measuring the performance of setting a single property and
  * saving the change.
@@ -108,7 +107,7 @@ private Map<Thread, Node> getOrCreateNodesMap() {
 
         Map<Thread, Node> nodes = map.get(currentFixtureName);
         if (nodes == null) {
-            nodes = Maps.newIdentityHashMap();
+            nodes = new IdentityHashMap<>();
         }
         return nodes;
     }

oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/collections/CollectionUtils.java

@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -39,7 +40,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -377,7 +377,7 @@ public static <K> Set<K> newLinkedHashSet(final int capacity) {
      */
     @NotNull
     public static <E> Set<E> newIdentityHashSet() {
-        return Collections.newSetFromMap(Maps.newIdentityHashMap());
+        return Collections.newSetFromMap(new IdentityHashMap<>());
     }
 
     /**

oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java

@@ -41,6 +41,7 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -97,8 +98,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
-
 import ch.qos.logback.classic.Level;
 import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
 
@@ -521,7 +520,7 @@ public void run() {
     // OAK-1784
     @Test
     public void failOnConflict() throws Exception {
-        final Map<Thread, Semaphore> locks = Maps.newIdentityHashMap();
+        final Map<Thread, Semaphore> locks = new IdentityHashMap<>();
         NodeStore store = new MemoryNodeStore() {
             @NotNull
             @Override

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java

@@ -20,6 +20,7 @@
 import static java.util.Objects.requireNonNull;
 
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -31,8 +32,6 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
-
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -56,7 +55,7 @@ final class CommitQueue {
     /**
      * Map of currently suspended commits until a given Revision is visible.
      */
-    private final Map<Semaphore, SuspendedCommit> suspendedCommits = Maps.newIdentityHashMap();
+    private final Map<Semaphore, SuspendedCommit> suspendedCommits = new IdentityHashMap<>();
 
     private final RevisionContext context;
 

oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCWithSplitTest.java

@@ -20,13 +20,12 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
-
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.plugins.document.util.TimingDocumentStoreWrapper;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -61,7 +60,7 @@ public class VersionGCWithSplitTest {
 
     private Clock clock;
 
-    private Map<Thread, Semaphore> updateLocks = Maps.newIdentityHashMap();
+    private Map<Thread, Semaphore> updateLocks = new IdentityHashMap<>();
 
     private DocumentNodeStore store;