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
commit 09a603ba0bac80f5907902b36443f158a21f8aab Author: Julian Reschke <[email protected]> AuthorDate: Tue Oct 28 12:31:59 2025 +0100 Revert "OAK-11936: Allow updating the inference config via JMX - line ends in test case" This reverts commit dea095688e37c9a5c0a99694cc8d0d42f2de831a. --- .../org/apache/jackrabbit/oak/json/JsonNodeBuilderTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonNodeBuilderTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonNodeBuilderTest.java index f03b7621be..5abc7094ef 100644 --- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonNodeBuilderTest.java +++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonNodeBuilderTest.java @@ -55,7 +55,6 @@ public class JsonNodeBuilderTest { JsonNodeBuilder.addOrReplace(ns, "/test", "nt:test", json.toString()); String json2 = JsonUtils.nodeStateToJson(ns.getRoot(), 5); json2 = json2.replaceAll("jcr:uuid\" : \".*\"", "jcr:uuid\" : \"...\""); - json2 = json2.replace("\r\n", "\n"); assertEquals("{\n" + " \"test\" : {\n" + " \"queryPaths\" : \"/same\",\n" @@ -89,7 +88,7 @@ public class JsonNodeBuilderTest { + " \"jcr:primaryType\" : \"nt:test\"\n" + " }\n" + " }\n" - + "}", JsonUtils.nodeStateToJson(ns.getRoot(), 5).replace("\r\n", "\n")); + + "}", JsonUtils.nodeStateToJson(ns.getRoot(), 5)); } @Test @@ -115,7 +114,7 @@ public class JsonNodeBuilderTest { + " \"jcr:primaryType\" : \"nt:test\"\n" + " }\n" + " }\n" - + "}", JsonUtils.nodeStateToJson(ns.getRoot(), 5).replace("\r\n", "\n")); + + "}", JsonUtils.nodeStateToJson(ns.getRoot(), 5)); json = JsonObject.fromJson( "{\"number\":1," + @@ -136,13 +135,13 @@ public class JsonNodeBuilderTest { + " \"jcr:primaryType\" : \"nt:test\"\n" + " }\n" + " }\n" - + "}", JsonUtils.nodeStateToJson(ns.getRoot(), 5).replace("\r\n", "\n")); + + "}", JsonUtils.nodeStateToJson(ns.getRoot(), 5)); } @Test public void illegalNodeTypesAreProhibited() { String simpleJson = "{\"property\": \"value\"}"; - + IllegalStateException exception = assertThrows( IllegalStateException.class, () -> JsonNodeBuilder.addOrReplace(ns, "/test", "invalid/nodetype", simpleJson) @@ -153,7 +152,7 @@ public class JsonNodeBuilderTest { @Test public void removingEntriesIsProhibited() { String jsonWithNull = "{\"nullProperty\": null}"; - + IllegalArgumentException exception = assertThrows( IllegalArgumentException.class, () -> JsonNodeBuilder.addOrReplace(ns, "/test", "nt:unstructured", jsonWithNull)
