From 487699a945bdc58f8bd23700a50e41164312d263 Mon Sep 17 00:00:00 2001
From: Rishabh Kumar <diam@adobe.com>
Date: Tue, 22 Oct 2024 15:50:00 +0530
Subject: [PATCH] OAK-11213 : removed usage of Guava
 Queues.newConcurrentLinkedQueue

---
 .../org/apache/jackrabbit/oak/segment/CommitsTracker.java    | 5 ++---
 .../jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java  | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
index f580e798d84..4116468ee41 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
@@ -18,14 +18,13 @@
  */
 package org.apache.jackrabbit.oak.segment;
 
-import static org.apache.jackrabbit.guava.common.collect.Queues.newConcurrentLinkedQueue;
-
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Supplier;
 
@@ -53,7 +52,7 @@ class CommitsTracker {
     private final String[] threadGroups;
     private final int otherWritersLimit;
     private final ConcurrentMap<String, Commit> queuedWritersMap;
-    private final Queue<Commit> commits = newConcurrentLinkedQueue();
+    private final Queue<Commit> commits = new ConcurrentLinkedQueue<>();
 
     /*
      * Read access via getCurrentWriter() happens usually on a separate thread, thus volatile
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java
index 211c6f7155a..c6ac98affdf 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceMonitor.java
@@ -18,7 +18,6 @@
 
 package org.apache.jackrabbit.oak.segment.tool.iotrace;
 
-import static org.apache.jackrabbit.guava.common.collect.Queues.newConcurrentLinkedQueue;
 import static java.lang.String.join;
 
 import java.io.File;
@@ -53,7 +52,7 @@ public class IOTraceMonitor extends IOMonitorAdapter implements Flushable {
     private final Lock ioLock = new ReentrantLock();
 
     @NotNull
-    private final ConcurrentLinkedQueue<IOEvent> ioEvents = newConcurrentLinkedQueue();
+    private final ConcurrentLinkedQueue<IOEvent> ioEvents = new ConcurrentLinkedQueue<>();
 
     /**
      * Create a new instance writing to {@code traceWriter} with additional context fields.