This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new a356a9bfb0 OAK-11656: Remove usage of Guava Suppliers.memoize - move
commons.function to commons.internal.function (#2463)
a356a9bfb0 is described below
commit a356a9bfb0b17d40fea58dbe6c9eed4e422267e1
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Thu Aug 21 10:08:55 2025 +0200
OAK-11656: Remove usage of Guava Suppliers.memoize - move commons.function
to commons.internal.function (#2463)
---
oak-commons/pom.xml | 2 +-
.../jackrabbit/oak/commons/{ => internal}/function/Suppliers.java | 2 +-
.../jackrabbit/oak/commons/{ => internal}/function/package-info.java | 2 +-
.../jackrabbit/oak/commons/{ => internal}/function/SuppliersTest.java | 4 ++--
.../jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java | 2 +-
.../jackrabbit/oak/plugins/index/reference/ReferenceEditor.java | 2 +-
.../index/property/strategy/ContentMirrorStoreStrategyTest.java | 2 +-
.../plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java | 2 +-
.../java/org/apache/jackrabbit/oak/run/osgi/RunnableJobTracker.java | 2 +-
.../main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java | 2 +-
.../java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java | 2 +-
.../jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java | 2 +-
.../org/apache/jackrabbit/oak/plugins/document/SplitOperations.java | 2 +-
.../oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java | 2 +-
.../oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml
index 230ac1c761..74f51e1854 100644
--- a/oak-commons/pom.xml
+++ b/oak-commons/pom.xml
@@ -51,8 +51,8 @@
org.apache.jackrabbit.oak.commons.collections,
org.apache.jackrabbit.oak.commons.conditions,
org.apache.jackrabbit.oak.commons.concurrent,
- org.apache.jackrabbit.oak.commons.function,
org.apache.jackrabbit.oak.commons.forkjoin,
+ org.apache.jackrabbit.oak.commons.internal.function,
org.apache.jackrabbit.oak.commons.io,
org.apache.jackrabbit.oak.commons.json,
org.apache.jackrabbit.oak.commons.log,
diff --git
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/function/Suppliers.java
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/function/Suppliers.java
similarity index 97%
rename from
oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/function/Suppliers.java
rename to
oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/function/Suppliers.java
index 1009820da5..a79d9d11f8 100644
---
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/function/Suppliers.java
+++
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/function/Suppliers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.commons.function;
+package org.apache.jackrabbit.oak.commons.internal.function;
import java.util.function.Supplier;
diff --git
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/function/package-info.java
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/function/package-info.java
similarity index 94%
rename from
oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/function/package-info.java
rename to
oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/function/package-info.java
index ddbf6306f5..dfa2a71691 100644
---
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/function/package-info.java
+++
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/function/package-info.java
@@ -20,7 +20,7 @@
*/
@Version("1.0.0")
@Internal
-package org.apache.jackrabbit.oak.commons.function;
+package org.apache.jackrabbit.oak.commons.internal.function;
import org.apache.jackrabbit.oak.commons.annotations.Internal;
import org.osgi.annotation.versioning.Version;
diff --git
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/function/SuppliersTest.java
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/internal/function/SuppliersTest.java
similarity index 96%
rename from
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/function/SuppliersTest.java
rename to
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/internal/function/SuppliersTest.java
index a5977c0d0a..c847cf6d2d 100644
---
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/function/SuppliersTest.java
+++
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/internal/function/SuppliersTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.commons.function;
+package org.apache.jackrabbit.oak.commons.internal.function;
import org.junit.Test;
@@ -29,7 +29,7 @@ import java.util.function.Supplier;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static org.junit.Assert.assertNull;
public class SuppliersTest {
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
index 623381d8c8..69e9f429bc 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
@@ -23,7 +23,7 @@ import static
org.apache.jackrabbit.oak.api.CommitFailedException.CONSTRAINT;
import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_CONTENT_NODE_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.PROPERTY_NAMES;
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
index eafca9e362..62248b3f1c 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
@@ -25,7 +25,7 @@ import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static
org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants.REF_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants.WEAK_REF_NAME;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
index 3fe4fc554e..0afbe4c90a 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
@@ -18,7 +18,7 @@ package
org.apache.jackrabbit.oak.plugins.index.property.strategy;
import static java.util.Arrays.asList;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.ENTRY_COUNT_PROPERTY_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_CONTENT_NODE_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.KEY_COUNT_PROPERTY_NAME;
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java
index 2a31b9edfb..34125e3526 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategyTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.property.strategy;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_CONTENT_NODE_NAME;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git
a/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/RunnableJobTracker.java
b/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/RunnableJobTracker.java
index 107cd6a4bf..beab53058c 100644
---
a/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/RunnableJobTracker.java
+++
b/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/RunnableJobTracker.java
@@ -26,7 +26,7 @@ import java.util.function.Supplier;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
-import org.apache.jackrabbit.oak.commons.function.Suppliers;
+import org.apache.jackrabbit.oak.commons.internal.function.Suppliers;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.Filter;
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
index df18008358..3a57091523 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
@@ -30,7 +30,7 @@ import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static
org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
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 d2e1f9ddab..a0d4ba9b33 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
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.segment;
import static java.util.Objects.requireNonNull;
import static java.lang.Integer.getInteger;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static org.apache.jackrabbit.oak.segment.RecordCache.newRecordCache;
import java.util.Iterator;
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
index b14c69257b..2099d524fb 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
@@ -46,7 +46,7 @@ import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.cache.EmpiricalWeigher;
import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.commons.function.Suppliers;
+import org.apache.jackrabbit.oak.commons.internal.function.Suppliers;
import org.apache.jackrabbit.oak.plugins.blob.BlobStoreStats;
import org.apache.jackrabbit.oak.plugins.blob.CachingBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.ReferencedBlob;
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
index 66aab19ab7..58870d486d 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.apache.jackrabbit.oak.commons.collections.StreamUtils;
-import org.apache.jackrabbit.oak.commons.function.Suppliers;
+import org.apache.jackrabbit.oak.commons.internal.function.Suppliers;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.jetbrains.annotations.NotNull;
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
index 95ab7fc0b2..fd0003c59e 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
@@ -32,7 +32,7 @@ import
org.apache.jackrabbit.oak.plugins.document.VersionGCSupport;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import static
org.apache.jackrabbit.oak.plugins.document.mongo.MongoDBConnection.newMongoDBConnection;
/**
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
index 1a36a6869e..fb64f2e69a 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document.rdb;
import static java.util.Set.of;
-import static org.apache.jackrabbit.oak.commons.function.Suppliers.memoize;
+import static
org.apache.jackrabbit.oak.commons.internal.function.Suppliers.memoize;
import javax.sql.DataSource;
