This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11618 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit fe29f35a872d6efc05b28009bed114b2f5c0e64b Author: Julian Reschke <[email protected]> AuthorDate: Fri Apr 4 18:43:16 2025 +0100 OAK-11618: Remove usage of Guava Stopwatch - work in progress --- .../incrementalstore/IncrementalFlatFileStoreStrategy.java | 2 +- .../jackrabbit/oak/exporter/NodeStateExportCommand.java | 2 +- .../org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java | 11 +++++------ oak-security-spi/pom.xml | 6 ++++++ .../oak/spi/security/authentication/AbstractLoginModule.java | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java index 3b33840c1e..ac323f31d1 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.index.indexer.document.incrementalstore; -import com.google.common.base.Stopwatch; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileStoreUtils; @@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.commit.EditorDiff; import org.apache.jackrabbit.oak.spi.commit.VisibleEditor; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java index f61be184b7..cdc87addd2 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java @@ -21,12 +21,12 @@ package org.apache.jackrabbit.oak.exporter; import java.io.File; import joptsimple.OptionParser; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.run.cli.CommonOptions; import org.apache.jackrabbit.oak.run.cli.NodeStoreFixture; import org.apache.jackrabbit.oak.run.cli.NodeStoreFixtureProvider; import org.apache.jackrabbit.oak.run.cli.Options; import org.apache.jackrabbit.oak.run.commons.Command; +import org.apache.jackrabbit.oak.stats.Stopwatch; public class NodeStateExportCommand implements Command { public static final String NAME = "export"; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java index 65acf7f509..815f13c166 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.run; -import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted; import static java.io.File.createTempFile; import static java.util.Arrays.asList; import static org.apache.commons.io.FileUtils.forceDelete; @@ -57,7 +56,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.LineIterator; import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -78,6 +76,7 @@ import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.Nullable; /** @@ -370,7 +369,7 @@ public class DataStoreCheckCommand implements Command { private static void checkConsistency(File ids, File refs, File missing, String trackRoot, String dsType) throws IOException { System.out.println("Starting consistency check"); - Stopwatch watch = createStarted(); + Stopwatch watch = Stopwatch.createStarted(); FileLineDifferenceIterator iter = new FileLineDifferenceIterator(ids, refs, new java.util.function.Function<String, String>() { @Nullable @@ -429,7 +428,7 @@ public class DataStoreCheckCommand implements Command { final GarbageCollectableBlobStore finalBlobStore = blobStore; System.out.println("Starting dump of blob references"); - Stopwatch watch = createStarted(); + Stopwatch watch = Stopwatch.createStarted(); marker.collectReferences( new ReferenceCollector() { @@ -467,7 +466,7 @@ public class DataStoreCheckCommand implements Command { throws Exception { System.out.println("Starting dump of blob ids"); - Stopwatch watch = createStarted(); + Stopwatch watch = Stopwatch.createStarted(); Iterator<String> blobIter = blobStore.getAllChunkIds(0); int count = writeStrings(blobIter, blob, false); @@ -538,7 +537,7 @@ public class DataStoreCheckCommand implements Command { public void traverse(String ... paths) throws IOException { final AtomicInteger count = new AtomicInteger(); System.out.println("Starting dump of blob references by traversing"); - Stopwatch watch = createStarted(); + Stopwatch watch = Stopwatch.createStarted(); try (BufferedWriter writer = new BufferedWriter(new FileWriter(references, StandardCharsets.UTF_8))) { if (paths.length == 0) { diff --git a/oak-security-spi/pom.xml b/oak-security-spi/pom.xml index 384facda56..ea5d9d7547 100644 --- a/oak-security-spi/pom.xml +++ b/oak-security-spi/pom.xml @@ -184,6 +184,12 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>1.79-SNAPSHOT</version> + <scope>compile</scope> + </dependency> </dependencies> </project> diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java index 8c49550772..78619ff928 100644 --- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java +++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java @@ -35,7 +35,6 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.ImmutableSet; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.api.AuthInfo; @@ -55,6 +54,7 @@ import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.apache.jackrabbit.oak.stats.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger;
