This is an automated email from the ASF dual-hosted git repository.
baedke 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 9d7f223709 OAK-11625: Move
o.a.j.o.plugins.bundlor.BundlingConfigInitializer to … (#2201)
9d7f223709 is described below
commit 9d7f223709f5b4422977836de9595cb139a352e3
Author: mbaedke <[email protected]>
AuthorDate: Tue Apr 8 17:08:39 2025 +0200
OAK-11625: Move o.a.j.o.plugins.bundlor.BundlingConfigInitializer to …
(#2201)
Done.
---
.../jackrabbit/oak/jcr/AbstractRepositoryTest.java | 2 +-
.../jackrabbit/oak/jcr/BaseRepositoryStub.java | 2 +-
.../oak/jcr/OakSegmentTarRepositoryStub.java | 2 +-
.../oak/composite/blueGreen/Persistence.java | 2 +-
.../oak/index/DocumentStoreIndexerIT.java | 2 +-
oak-store-document/pom.xml | 3 ++-
.../bundlor/BundlingConfigInitializer.java | 30 +++++-----------------
.../BundlingConfigInitializer.java | 3 ++-
.../oak/plugins/document/init/package-info.java | 18 +++++++++++++
.../oak/plugins/document/CommitDiffTest.java | 2 +-
.../LastRevRecoveryWithBundledNodesTest.java | 2 +-
.../document/VersionGarbageCollectorIT.java | 2 +-
.../bundlor/BundledDocumentDifferTest.java | 1 +
.../bundlor/BundlingConfigInitializerTest.java | 1 +
.../document/bundlor/DocumentBundlingTest.java | 1 +
.../secondary/SecondaryStoreCacheTest.java | 2 +-
16 files changed, 41 insertions(+), 34 deletions(-)
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
index 647c2dc5ec..1b444a3eca 100644
---
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
+++
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.commons.FixturesHelper;
import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.jcr.util.ComponentHolder;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/BaseRepositoryStub.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/BaseRepositoryStub.java
index 619f49df60..39ac13e4e3 100644
---
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/BaseRepositoryStub.java
+++
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/BaseRepositoryStub.java
@@ -24,7 +24,7 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.test.NotExecutableException;
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
index 093f70a9c2..81aee6139d 100644
---
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
+++
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
@@ -71,7 +71,7 @@ public class OakSegmentTarRepositoryStub extends
BaseRepositoryStub {
* {@link Jcr} builder before the repository is created. This default
* implementation set query engine settings as returned by
* {@link #getQueryEngineSettings()} and adds a
- * {@link
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer}.
+ * {@link
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer}.
*
* @param jcr the builder.
* @param whiteboard the oak whiteboard
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
index 3b69f6b4f4..d260a09a2f 100644
---
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
+++
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/composite/blueGreen/Persistence.java
@@ -56,7 +56,7 @@ import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.atomic.AtomicCounterEditorProvider;
import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
import org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.WhiteboardIndexEditorProvider;
import
org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
index 6d5fbc95a2..9c3ff5d0ac 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
@@ -41,7 +41,7 @@ import
org.apache.jackrabbit.oak.plugins.document.MongoConnectionFactory;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.bundlor.BundledTypesRegistry;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
diff --git a/oak-store-document/pom.xml b/oak-store-document/pom.xml
index dc0d2aec23..5ba53d8292 100644
--- a/oak-store-document/pom.xml
+++ b/oak-store-document/pom.xml
@@ -49,7 +49,8 @@
</Import-Package>
<Export-Package>
org.apache.jackrabbit.oak.plugins.document.spi,
- org.apache.jackrabbit.oak.plugins.document.spi.lease
+ org.apache.jackrabbit.oak.plugins.document.spi.lease,
+ org.apache.jackrabbit.oak.plugins.document.init
</Export-Package>
<Embed-Dependency>quartz;inline=org/quartz/CronExpression*|org/quartz/ValueSet*</Embed-Dependency>
</instructions>
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
old mode 100644
new mode 100755
index b0d85c15c1..15d88929c0
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
@@ -19,37 +19,21 @@
package org.apache.jackrabbit.oak.plugins.document.bundlor;
-import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
-import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
-import static
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler.BUNDLOR;
-import static
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler.DOCUMENT_NODE_STORE;
+import org.jetbrains.annotations.NotNull;
+/** This class is deprecated and will be removed in future releases.
+ *
+ * @deprecated use {@link
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer}
instead
+ */
+@Deprecated(forRemoval = true)
public enum BundlingConfigInitializer implements RepositoryInitializer {
INSTANCE;
@Override
public void initialize(@NotNull NodeBuilder builder) {
- if (builder.hasChildNode(JCR_SYSTEM)){
- NodeBuilder system = builder.getChildNode(JCR_SYSTEM);
-
- if (!system.hasChildNode(DOCUMENT_NODE_STORE)){
- NodeBuilder dns = system.child(DOCUMENT_NODE_STORE);
- dns.setProperty(JCR_PRIMARYTYPE,
NodeTypeConstants.NT_OAK_UNSTRUCTURED, Type.NAME);
-
- NodeState registryState = BundledTypesRegistry.builder()
- .forType("nt:file", "jcr:content")
- .build();
- NodeBuilder bundlor = dns.setChildNode(BUNDLOR, registryState);
- bundlor.setProperty(JCR_PRIMARYTYPE,
NodeTypeConstants.NT_OAK_UNSTRUCTURED, Type.NAME);
- }
- }
-
+
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer.INSTANCE.initialize(builder);
}
}
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/init/BundlingConfigInitializer.java
similarity index 94%
copy from
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
copy to
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/init/BundlingConfigInitializer.java
index b0d85c15c1..fd18f95dac 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/init/BundlingConfigInitializer.java
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.bundlor;
+package org.apache.jackrabbit.oak.plugins.document.init;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.document.bundlor.BundledTypesRegistry;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/init/package-info.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/init/package-info.java
new file mode 100755
index 0000000000..f94a6cce1a
--- /dev/null
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/init/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
[email protected]("1.0.0")
+package org.apache.jackrabbit.oak.plugins.document.init;
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitDiffTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitDiffTest.java
index e8d0609d2b..52978223ec 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitDiffTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitDiffTest.java
@@ -22,7 +22,7 @@ import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingHandler;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryWithBundledNodesTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryWithBundledNodesTest.java
index 4acb01a569..a0646e89f0 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryWithBundledNodesTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryWithBundledNodesTest.java
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.apache.jackrabbit.oak.plugins.document.bundlor.BundledTypesRegistry;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
index fe7890f7d7..7342cd7d43 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
@@ -116,7 +116,7 @@ import
org.apache.jackrabbit.oak.commons.collections.ListUtils;
import
org.apache.jackrabbit.oak.plugins.document.DocumentStoreFixture.RDBFixture;
import
org.apache.jackrabbit.oak.plugins.document.FailingDocumentStore.FailedUpdateOpListener;
import
org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoTestUtils;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java
index f257561ee6..934e1a262c 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java
@@ -31,6 +31,7 @@ import
org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState;
import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import
org.apache.jackrabbit.oak.plugins.document.secondary.DelegatingDocumentNodeState;
import
org.apache.jackrabbit.oak.plugins.document.secondary.SecondaryStoreBuilder;
import
org.apache.jackrabbit.oak.plugins.document.secondary.SecondaryStoreCache;
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java
index 1da9a6f714..9931c96c78 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.plugins.document.bundlor;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
index db419bd4f8..8a07823692 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
@@ -43,6 +43,7 @@ import
org.apache.jackrabbit.oak.plugins.document.RandomStream;
import org.apache.jackrabbit.oak.plugins.document.TestNodeObserver;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.persistentCache.CacheType;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheTest.java
index e3ebbdaae3..df0459c5dd 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheTest.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.bundlor.BundledTypesRegistry;
import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler;
-import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
+import
org.apache.jackrabbit.oak.plugins.document.init.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.InitialContent;
