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 da...@apache.org on 2026/05/06 18:43:08 UTC
(jackrabbit-oak) 07/11: OAK-12162 : moved cachestatssnapshot back to api package
This is an automated email from the ASF dual-hosted git repository.
rishabhdaim pushed a commit to branch OAK-12162
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 6b5ae46cbcfbd2f84e5961870d87f13b866ea494
Author: rishabhdaim <ri...@gmail.com>
AuthorDate: Thu Apr 16 17:05:56 2026 +0530
OAK-12162 : moved cachestatssnapshot back to api package
---
.../main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java | 1 +
.../src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java | 1 +
.../src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java | 1 -
.../org/apache/jackrabbit/oak/cache/{ => api}/CacheStatsSnapshot.java | 3 +--
.../jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java | 2 +-
.../org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java | 2 +-
.../org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java | 1 -
.../java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java | 2 +-
.../jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java | 2 +-
.../apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java | 2 +-
.../org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java | 2 +-
.../src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java | 2 +-
.../main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java | 2 +-
.../src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java | 2 +-
.../java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java | 2 +-
.../java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java | 2 +-
.../oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java | 2 +-
.../jackrabbit/oak/plugins/document/persistentCache/NodeCache.java | 2 +-
18 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
index 7d788de862..e2e90fd073 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
@@ -26,6 +26,7 @@ import java.util.StringJoiner;
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
index 78749ef3d5..d621b9c35b 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.cache;
import java.util.Map;
import org.apache.jackrabbit.oak.cache.api.Cache;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java
index 59d29b445e..ed4bb976b4 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java
@@ -20,7 +20,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java
similarity index 98%
rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java
rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java
index 7fdeaed491..929c502603 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.cache;
+package org.apache.jackrabbit.oak.cache.api;
-import org.apache.jackrabbit.oak.cache.api.Cache;
import org.jetbrains.annotations.NotNull;
/**
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java
index 3aca4d0ccc..cc11a8cd3a 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java
@@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
import com.github.benmanes.caffeine.cache.RemovalCause;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java
index a812c8af16..02fbf7f44c 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java
@@ -24,7 +24,7 @@ import java.util.function.Function;
import org.apache.jackrabbit.guava.common.cache.RemovalCause;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java
index 6de1e1d05c..4820634fec 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.cache.api;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
import org.junit.Assert;
import org.junit.Test;
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java
index 1625b0bebd..04f040abaf 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.CompletionException;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.jackrabbit.oak.cache.api.Cache;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.LoadingCache;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java
index 84e70b2d24..cda9f1ff4d 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.RemovalCause;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.junit.Assert;
import org.junit.Test;
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java
index 760964483d..b231067c66 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.ExecutionException;
import org.apache.jackrabbit.guava.common.cache.RemovalCause;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.junit.Assert;
import org.junit.Test;
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
index 1112ad8cb0..9a3deb4304 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
@@ -26,7 +26,7 @@ import com.codahale.metrics.MetricRegistry;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
index 46c5f77e69..7601673743 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.LongAdder;
import java.util.function.Supplier;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
index 76a70e0b50..8ddef87152 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
@@ -23,7 +23,7 @@ import static java.util.Objects.requireNonNull;
import java.util.function.Supplier;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.jetbrains.annotations.NotNull;
/**
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
index 28bbb0d462..5754061338 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
@@ -31,7 +31,7 @@ import java.util.function.Supplier;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.apache.jackrabbit.oak.segment.CacheWeights.SegmentCacheWeigher;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
index 21a749f67e..16d54af499 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
@@ -30,7 +30,7 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.segment.file.PriorityCache;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
index f8fa8521a4..58dc75f6c3 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.segment.CacheWeights;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Weigher;
/**
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
index 06e2736d56..49aec4196e 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.jetbrains.annotations.NotNull;
public class SegmentCacheStats extends AbstractCacheStats {
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
index 278272b669..2811d2cb4d 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
import org.apache.jackrabbit.oak.cache.api.Cache;
-import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;