This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11832 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 2540c1f94cbaf711bcbb333c76356b21e90b2e23 Author: rishabhdaim <rishabhdaim1...@gmail.com> AuthorDate: Thu Aug 21 09:02:39 2025 +0530 OAK-11832 : moved Traverser to internal.graph package and marked as internal --- .../jackrabbit/oak/commons/{ => internal/graph}/Traverser.java | 2 +- .../jackrabbit/oak/commons/{ => internal/graph}/package-info.java | 8 +++++--- .../org/apache/jackrabbit/oak/commons/io/FileTreeTraverser.java | 2 +- .../main/java/org/apache/jackrabbit/oak/commons/package-info.java | 2 +- .../oak/commons/{ => internal/graph}/TraverserTest.java | 2 +- .../oak/plugins/index/property/jmx/PropertyIndexStats.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java | 2 +- .../plugins/index/lucene/property/HybridPropertyIndexInfo.java | 2 +- .../oak/plugins/index/lucene/property/RecursiveDeleteTest.java | 2 +- .../oak/plugins/tika/NodeStoreBinaryResourceProvider.java | 2 +- .../apache/jackrabbit/oak/plugins/document/DocumentNodeState.java | 2 +- 11 files changed, 15 insertions(+), 13 deletions(-) diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Traverser.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/graph/Traverser.java similarity index 99% rename from oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Traverser.java rename to oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/graph/Traverser.java index ae240e0b60..3912317359 100644 --- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Traverser.java +++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/graph/Traverser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.commons; +package org.apache.jackrabbit.oak.commons.internal.graph; import org.apache.commons.collections4.FluentIterable; import org.apache.commons.collections4.iterators.UnmodifiableIterator; diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/graph/package-info.java similarity index 80% copy from oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java copy to oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/graph/package-info.java index 628d8b92bb..2c0f75dde4 100644 --- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java +++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/internal/graph/package-info.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("2.5.0") -package org.apache.jackrabbit.oak.commons; +@Version("1.0.0") +@Internal +package org.apache.jackrabbit.oak.commons.internal.graph; -import org.osgi.annotation.versioning.Version; +import org.apache.jackrabbit.oak.commons.annotations.Internal; +import org.osgi.annotation.versioning.Version; \ No newline at end of file diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileTreeTraverser.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileTreeTraverser.java index ffa98f3e67..bed1997983 100644 --- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileTreeTraverser.java +++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileTreeTraverser.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.commons.io; -import org.apache.jackrabbit.oak.commons.Traverser; +import org.apache.jackrabbit.oak.commons.internal.graph.Traverser; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java index 628d8b92bb..718a93ef89 100644 --- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java +++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("2.5.0") +@Version("2.4.0") package org.apache.jackrabbit.oak.commons; import org.osgi.annotation.versioning.Version; diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/TraverserTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/internal/graph/TraverserTest.java similarity index 99% rename from oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/TraverserTest.java rename to oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/internal/graph/TraverserTest.java index 64f8087310..977fc00575 100644 --- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/TraverserTest.java +++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/internal/graph/TraverserTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.commons; +package org.apache.jackrabbit.oak.commons.internal.graph; import org.apache.jackrabbit.guava.common.collect.TreeTraverser; import org.jetbrains.annotations.NotNull; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java index 0986a6f0d7..0954a2f934 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; -import org.apache.jackrabbit.oak.commons.Traverser; +import org.apache.jackrabbit.oak.commons.internal.graph.Traverser; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java index f1dd71f446..5254f16604 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java @@ -48,7 +48,7 @@ import javax.management.openmbean.TabularType; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.jmx.Name; import org.apache.jackrabbit.oak.commons.PathUtils; -import org.apache.jackrabbit.oak.commons.Traverser; +import org.apache.jackrabbit.oak.commons.internal.graph.Traverser; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexInfo.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexInfo.java index 37df70899b..83e629cd55 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexInfo.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexInfo.java @@ -23,7 +23,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import org.apache.jackrabbit.oak.commons.Traverser; +import org.apache.jackrabbit.oak.commons.internal.graph.Traverser; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/RecursiveDeleteTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/RecursiveDeleteTest.java index ce33fe0a3c..9bc6e7b8ee 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/RecursiveDeleteTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/RecursiveDeleteTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.commons.Traverser; +import org.apache.jackrabbit.oak.commons.internal.graph.Traverser; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.fixture.DocumentMemoryFixture; import org.apache.jackrabbit.oak.fixture.MemoryFixture; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java index ba1add35f3..4139f60f89 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProvider.java @@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.commons.Traverser; +import org.apache.jackrabbit.oak.commons.internal.graph.Traverser; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.jetbrains.annotations.Nullable; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java index 7ef95028b5..974adbf7f0 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java @@ -27,7 +27,7 @@ import java.util.function.Function; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.commons.Traverser; +import org.apache.jackrabbit.oak.commons.internal.graph.Traverser; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.conditions.Validate;