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/11 14:31:27 UTC

(jackrabbit-oak) 01/01: OAK-11302: Remove usage of Guava annotations

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

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

commit 24d5191d4dd75d031b67b93ade112d643a3df211
Author: Julian Reschke <re...@apache.org>
AuthorDate: Wed Dec 11 15:30:45 2024 +0100

    OAK-11302: Remove usage of Guava annotations
---
 .../apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java   | 3 +--
 .../jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java      | 3 +--
 .../document/mongo/MongoDocumentStoreThrottlingMetricsUpdater.java    | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
index 7f2ae83ec3..e0b914e534 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.plugins.version;
 
-import org.apache.jackrabbit.guava.common.annotations.VisibleForTesting;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
@@ -159,7 +158,7 @@ class VersionStorageEditor extends DefaultEditor {
 
     //-------------------------< internal >-------------------------------------
 
-    @VisibleForTesting
+    // VisibleForTesting
     static boolean isVersionStorageNode(NodeState state) {
         String ntName = state.getName(JCR_PRIMARYTYPE);
         return (Objects.nonNull(ntName) && VERSION_STORE_NT_NAMES.contains(ntName))
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java
index 014e42d43b..fea2506618 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java
@@ -26,7 +26,6 @@ import static org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo.Recover
 import static org.apache.jackrabbit.oak.plugins.document.Revision.fromString;
 import static org.apache.jackrabbit.oak.plugins.document.Revision.getTimestampDifference;
 
-import org.apache.jackrabbit.guava.common.annotations.VisibleForTesting;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -187,8 +186,8 @@ public class ClusterNodeInfoDocument extends Document {
      *
      * @return {@link Predicate} to filter revisions older than lastWrittenRootRev
      */
+    // VisibleForTesting
     @NotNull
-    @VisibleForTesting
     Predicate<Revision> isOlderThanLastWrittenRootRevPredicate() {
         return r -> nonNull(getLastWrittenRootRev()) && getTimestampDifference(r, fromString(getLastWrittenRootRev())) < 0;
     }
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreThrottlingMetricsUpdater.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreThrottlingMetricsUpdater.java
index 6708b068ac..2e7aea8102 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreThrottlingMetricsUpdater.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreThrottlingMetricsUpdater.java
@@ -18,7 +18,6 @@
  */
 package org.apache.jackrabbit.oak.plugins.document.mongo;
 
-import org.apache.jackrabbit.guava.common.annotations.VisibleForTesting;
 import org.apache.jackrabbit.guava.common.util.concurrent.AtomicDouble;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
@@ -95,8 +94,7 @@ public class MongoDocumentStoreThrottlingMetricsUpdater implements Closeable {
         }, 10, 30, SECONDS);
     }
 
-    // helper methods
-    @VisibleForTesting
+    // helper methods, visible for testing
     static double updateOplogWindow(final double maxSize, final double usedSize, final @NotNull Document first,
                                    final @NotNull Document last) {
         final BsonTimestamp startTime = first.get(TS_TIME, BsonTimestamp.class);