You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/12/16 18:10:19 UTC

(jackrabbit-oak) branch OAK-11311 updated: OAK-11311: Remove usage of Guava ImmutableList - oak-segment-tar

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-11311
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/OAK-11311 by this push:
     new 9f20a7f78a OAK-11311: Remove usage of Guava ImmutableList - oak-segment-tar
9f20a7f78a is described below

commit 9f20a7f78a195863ca891807d20ca3c1020581ba
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Dec 16 19:10:09 2024 +0100

    OAK-11311: Remove usage of Guava ImmutableList - oak-segment-tar
---
 .../jackrabbit/oak/segment/file/proc/TarNode.java     |  5 ++---
 .../oak/segment/tool/iotrace/BreadthFirstTrace.java   |  3 +--
 .../oak/segment/tool/iotrace/DepthFirstTrace.java     |  4 +---
 .../oak/segment/tool/iotrace/IOTraceMonitor.java      |  3 +--
 .../oak/segment/tool/iotrace/RandomAccessTrace.java   |  4 +---
 .../oak/segment/SegmentDataStoreBlobGCIT.java         |  4 +---
 .../jackrabbit/oak/segment/SegmentParserTest.java     |  5 ++---
 .../segment/spi/monitor/CompositeIOMonitorTest.java   | 11 +++++------
 .../segment/tool/iotrace/BreadthFirstTraceTest.java   | 19 +++++++++----------
 .../oak/segment/tool/iotrace/DepthFirstTraceTest.java | 19 +++++++++----------
 .../oak/segment/tool/iotrace/IOTracerTest.java        |  3 +--
 .../oak/segment/tool/iotrace/RandomTraceTest.java     |  7 +++----
 12 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java
index 34554d546d..735e0b7b01 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/proc/TarNode.java
@@ -15,15 +15,14 @@
  * limitations under the License.
  *
  */
-
 package org.apache.jackrabbit.oak.segment.file.proc;
 
 import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
 
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
 import org.apache.jackrabbit.oak.segment.file.proc.Proc.Backend;
@@ -45,7 +44,7 @@ class TarNode extends AbstractNode {
     @NotNull
     @Override
     public Iterable<? extends PropertyState> getProperties() {
-        return ImmutableList.of(
+        return List.of(
             createProperty("name", name),
             createProperty("size", backend.getTarSize(name).orElse(-1L))
         );
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java
index 6ba2d618a8..ad2321edbc 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTrace.java
@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
 
@@ -113,7 +112,7 @@ public class BreadthFirstTrace implements Trace {
     }
 
     private static void updateContext(@NotNull Consumer<List<String>> context, int depth, int count) {
-        context.accept(ImmutableList.of(valueOf(depth), valueOf(count)));
+        context.accept(List.of(valueOf(depth), valueOf(count)));
     }
 
 }
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java
index 396824c117..87705aca77 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTrace.java
@@ -15,7 +15,6 @@
  * limitations under the License.
  *
  */
-
 package org.apache.jackrabbit.oak.segment.tool.iotrace;
 
 import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
@@ -29,7 +28,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
 
@@ -100,7 +98,7 @@ public class DepthFirstTrace implements Trace {
 
     private static void updateContext(
             @NotNull Consumer<List<String>> context, int depth, int count, @NotNull String path) {
-        context.accept(ImmutableList.of(valueOf(depth), valueOf(count), path));
+        context.accept(List.of(valueOf(depth), valueOf(count), path));
     }
 
 }
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 c6ac98affd..a7c790d68b 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
@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
 import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter;
 import org.jetbrains.annotations.NotNull;
@@ -43,7 +42,7 @@ import org.jetbrains.annotations.Nullable;
 public class IOTraceMonitor extends IOMonitorAdapter implements Flushable {
     @NotNull
     private final AtomicReference<List<String>> context =
-            new AtomicReference<>(ImmutableList.of());
+            new AtomicReference<>(List.of());
 
     @NotNull
     private final IOTraceWriter traceWriter;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java
index 2c7f63b60e..f58bfbc5be 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomAccessTrace.java
@@ -15,7 +15,6 @@
  * limitations under the License.
  *
  */
-
 package org.apache.jackrabbit.oak.segment.tool.iotrace;
 
 import static java.util.Objects.requireNonNull;
@@ -28,7 +27,6 @@ import java.util.List;
 import java.util.Random;
 import java.util.function.Consumer;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
@@ -73,7 +71,7 @@ public class RandomAccessTrace implements Trace {
         if(!paths.isEmpty()) {
             for (int c = 0; c < count; c++) {
                 String path = paths.get(rnd.nextInt(paths.size()));
-                context.accept(ImmutableList.of(path));
+                context.accept(List.of(path));
 
                 NodeState node = root;
                 for (String name : elements(getParentPath(path))) {
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
index dc2fa92311..b214bac8e8 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
@@ -43,8 +43,6 @@ import java.util.concurrent.TimeUnit;
 
 import ch.qos.logback.classic.Level;
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.Lists;
 import org.apache.jackrabbit.guava.common.collect.Sets;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
@@ -345,7 +343,7 @@ public class SegmentDataStoreBlobGCIT {
         Random rand = new Random(87);
         List<String> existing = new ArrayList<>(state.blobsPresent);
         
-        long count = blobStore.countDeleteChunks(ImmutableList.of(existing.get(rand.nextInt(existing.size()))), 0);
+        long count = blobStore.countDeleteChunks(List.of(existing.get(rand.nextInt(existing.size()))), 0);
         
         ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(10);
         MarkSweepGarbageCollector gcObj = init(86400, executor);
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
index 2ea0bc251c..d9789d14d0 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
@@ -46,7 +46,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
@@ -229,7 +228,7 @@ public class SegmentParserTest {
         builder.setChildNode("n");
         builder.setProperty("p", 1);
         builder.setProperty("jcr:primaryType", "type", NAME);
-        builder.setProperty("jcr:mixinTypes", ImmutableList.of("type1", "type2"), NAMES);
+        builder.setProperty("jcr:mixinTypes", List.of("type1", "type2"), NAMES);
         SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState()));
         NodeInfo nodeInfo = new TestParser(store.getReader(), "template") {
             @Override
@@ -320,7 +319,7 @@ public class SegmentParserTest {
     @Test
     public void multiValueProperty() throws IOException {
         NodeBuilder builder = EMPTY_NODE.builder();
-        builder.setProperty("p", ImmutableList.of(1L, 2L, 3L, 4L), LONGS);
+        builder.setProperty("p", List.of(1L, 2L, 3L, 4L), LONGS);
         SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState()));
         NodeInfo nodeInfo = new TestParser(store.getReader(), "multiValueProperty") {
             @Override
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitorTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitorTest.java
index eaa91f98c8..7d8100061e 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitorTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitorTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  *
  */
-
 package org.apache.jackrabbit.oak.segment.spi.monitor;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
+import java.util.List;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
 import org.junit.Test;
 
@@ -31,8 +30,8 @@ public class CompositeIOMonitorTest {
 
     @Test
     public void testComposition() {
-        ImmutableList<IOMonitorAssertion> ioMonitors =
-                ImmutableList.of(new IOMonitorAssertion(), new IOMonitorAssertion());
+        List<IOMonitorAssertion> ioMonitors =
+                List.of(new IOMonitorAssertion(), new IOMonitorAssertion());
         IOMonitor ioMonitor = new CompositeIOMonitor(ioMonitors);
 
         ioMonitor.beforeSegmentRead(FILE, 0, 0, 0);
@@ -50,8 +49,8 @@ public class CompositeIOMonitorTest {
 
     @Test
     public void testUnregisterComposition() {
-        ImmutableList<IOMonitorAssertion> ioMonitors =
-                ImmutableList.of(new IOMonitorAssertion(), new IOMonitorAssertion());
+        List<IOMonitorAssertion> ioMonitors =
+                List.of(new IOMonitorAssertion(), new IOMonitorAssertion());
 
         CompositeIOMonitor ioMonitor = new CompositeIOMonitor();
         ioMonitor.registerIOMonitor(ioMonitors.get(0));
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java
index b64deaf958..e46f023509 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/BreadthFirstTraceTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
@@ -46,7 +45,7 @@ public class BreadthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new BreadthFirstTrace(4, "/", trace::add).run(createTree(0));
         assertEquals(1, trace.size());
-        assertEquals(ImmutableList.of("0", "1"), trace.get(0));
+        assertEquals(List.of("0", "1"), trace.get(0));
     }
 
     @Test
@@ -54,8 +53,8 @@ public class BreadthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new BreadthFirstTrace(4, "/", trace::add).run(createTree(1));
         assertEquals(2, trace.size());
-        assertEquals(ImmutableList.of("0", "1"), trace.get(0));
-        assertEquals(ImmutableList.of("1", "2"), trace.get(1));
+        assertEquals(List.of("0", "1"), trace.get(0));
+        assertEquals(List.of("1", "2"), trace.get(1));
     }
 
     @Test
@@ -63,9 +62,9 @@ public class BreadthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new BreadthFirstTrace(4, "/", trace::add).run(createTree(2));
         assertEquals(3, trace.size());
-        assertEquals(ImmutableList.of("0", "1"), trace.get(0));
-        assertEquals(ImmutableList.of("1", "2"), trace.get(1));
-        assertEquals(ImmutableList.of("2", "3"), trace.get(2));
+        assertEquals(List.of("0", "1"), trace.get(0));
+        assertEquals(List.of("1", "2"), trace.get(1));
+        assertEquals(List.of("2", "3"), trace.get(2));
     }
 
     @Test
@@ -73,9 +72,9 @@ public class BreadthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new BreadthFirstTrace(2, "/", trace::add).run(createTree(3));
         assertEquals(3, trace.size());
-        assertEquals(ImmutableList.of("0", "1"), trace.get(0));
-        assertEquals(ImmutableList.of("1", "2"), trace.get(1));
-        assertEquals(ImmutableList.of("2", "3"), trace.get(2));
+        assertEquals(List.of("0", "1"), trace.get(0));
+        assertEquals(List.of("1", "2"), trace.get(1));
+        assertEquals(List.of("2", "3"), trace.get(2));
     }
 
 }
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java
index 5f3ef1902a..079b4d5413 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DepthFirstTraceTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
@@ -46,7 +45,7 @@ public class DepthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new DepthFirstTrace(4, "/", trace::add).run(createTree(0));
         assertEquals(1, trace.size());
-        assertEquals(ImmutableList.of("0", "1", "/"), trace.get(0));
+        assertEquals(List.of("0", "1", "/"), trace.get(0));
     }
 
     @Test
@@ -54,8 +53,8 @@ public class DepthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new DepthFirstTrace(4, "/", trace::add).run(createTree(1));
         assertEquals(2, trace.size());
-        assertEquals(ImmutableList.of("0", "1", "/"), trace.get(0));
-        assertEquals(ImmutableList.of("1", "2", "/node-0"), trace.get(1));
+        assertEquals(List.of("0", "1", "/"), trace.get(0));
+        assertEquals(List.of("1", "2", "/node-0"), trace.get(1));
     }
 
     @Test
@@ -63,9 +62,9 @@ public class DepthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new DepthFirstTrace(4, "/", trace::add).run(createTree(2));
         assertEquals(3, trace.size());
-        assertEquals(ImmutableList.of("0", "1", "/"), trace.get(0));
-        assertEquals(ImmutableList.of("1", "2", "/node-0"), trace.get(1));
-        assertEquals(ImmutableList.of("2", "3", "/node-0/node-1"), trace.get(2));
+        assertEquals(List.of("0", "1", "/"), trace.get(0));
+        assertEquals(List.of("1", "2", "/node-0"), trace.get(1));
+        assertEquals(List.of("2", "3", "/node-0/node-1"), trace.get(2));
     }
 
     @Test
@@ -73,9 +72,9 @@ public class DepthFirstTraceTest {
         List<List<String>> trace = new ArrayList<>();
         new DepthFirstTrace(2, "/", trace::add).run(createTree(3));
         assertEquals(3, trace.size());
-        assertEquals(ImmutableList.of("0", "1", "/"), trace.get(0));
-        assertEquals(ImmutableList.of("1", "2", "/node-0"), trace.get(1));
-        assertEquals(ImmutableList.of("2", "3", "/node-0/node-1"), trace.get(2));
+        assertEquals(List.of("0", "1", "/"), trace.get(0));
+        assertEquals(List.of("1", "2", "/node-0"), trace.get(1));
+        assertEquals(List.of("2", "3", "/node-0/node-1"), trace.get(2));
     }
 
 }
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java
index c088d724e6..e5b05ec0ab 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracerTest.java
@@ -39,7 +39,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
 import org.apache.jackrabbit.oak.segment.SegmentNodeState;
 import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -176,7 +175,7 @@ public class IOTracerTest extends IOMonitorAdapter {
             Function<IOMonitor, FileStore> factory = this::createFileStore;
 
             IOTracer ioTracer = newIOTracer(factory, out, RandomAccessTrace.CONTEXT_SPEC);
-            ImmutableList<String> paths = ImmutableList.of("/1a", "/1b", "/foo");
+            List<String> paths = List.of("/1a", "/1b", "/foo");
             ioTracer.collectTrace(
                     new RandomAccessTrace(paths, 0, 10, ioTracer::setContext));
 
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java
index e2e6b04ed6..170c78c7a6 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/tool/iotrace/RandomTraceTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
@@ -61,16 +60,16 @@ public class RandomTraceTest {
     @Test
     public void testTraverseNonExistingPath() {
         List<List<String>> trace = new ArrayList<>();
-        new RandomAccessTrace(ImmutableList.of("/not/here"), 0, 1, trace::add)
+        new RandomAccessTrace(List.of("/not/here"), 0, 1, trace::add)
             .run(createTree(emptyList()));
         assertEquals(1, trace.size());
-        assertEquals(ImmutableList.of("/not/here"), trace.get(0));
+        assertEquals(List.of("/not/here"), trace.get(0));
     }
 
     @Test
     public void testTraverse() {
         List<List<String>> trace = new ArrayList<>();
-        ImmutableList<String> paths = ImmutableList.of("/a/b/c", "/d/e/f");
+        List<String> paths = List.of("/a/b/c", "/d/e/f");
         new RandomAccessTrace(paths, 0, 2, trace::add)
                 .run(createTree(paths));
         assertEquals(2, trace.size());