(jackrabbit-oak) branch OAK-12010-subset updated: OAK-12010 Simplified index management

[thomasm]

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

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


The following commit(s) were added to refs/heads/OAK-12010-subset by this push:
     new fc19b5a4aa OAK-12010 Simplified index management
fc19b5a4aa is described below

commit fc19b5a4aa7d91eeae4a2e6d69c5ff35d12a7660
Author: Thomas Mueller <muel...@adobe.com>
AuthorDate: Mon Feb 9 17:14:56 2026 +0100

    OAK-12010 Simplified index management
---
 .../java/org/apache/jackrabbit/oak/plugins/index/diff/DiffIndex.java   | 3 +++
 .../index/diff/{JsonNodeBuilderTest.java => JsonNodeUpdaterTest.java}  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diff/DiffIndex.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diff/DiffIndex.java
index aab502b8fb..6df72e2ce8 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diff/DiffIndex.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diff/DiffIndex.java
@@ -116,6 +116,9 @@ public class DiffIndex {
                 LOG.warn("{}: {}", message, e.getMessage(), e);
                 diffIndexDefinition.setProperty("error", message + ": " + 
e.getMessage());
             }
+            if (!diffIndexDefinition.hasProperty("info")) {
+                diffIndexDefinition.setProperty("info", "This diff is are 
automatically merged with other indexes. See 
https://oak-indexing.github.io/oakTools/simplified.html";);
+            }
         }
         return diffs;
     }
diff --git 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diff/JsonNodeBuilderTest.java
 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diff/JsonNodeUpdaterTest.java
similarity index 99%
rename from 
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diff/JsonNodeBuilderTest.java
rename to 
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diff/JsonNodeUpdaterTest.java
index ea29bb23a3..4bcc5db181 100644
--- 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diff/JsonNodeBuilderTest.java
+++ 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diff/JsonNodeUpdaterTest.java
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.junit.Test;
 
-public class JsonNodeBuilderTest {
+public class JsonNodeUpdaterTest {
 
     @Test
     public void addNodeTypeAndUUID() throws CommitFailedException, IOException 
{