This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-4545-jsonify-all-the-things in repository https://gitbox.apache.org/repos/asf/tika.git
commit 9a366ccebe683978abcf44a9758f49726daaef3d Author: tallison <[email protected]> AuthorDate: Tue Dec 2 17:29:25 2025 -0500 TIKA-4545: fix tika-serialization tests --- .../apache/tika/serialization/JsonMetadataList.java | 6 ++++-- .../tika/serialization/JsonMetadataListTest.java | 7 +++---- .../apache/tika/serialization/JsonMetadataTest.java | 7 +++---- .../src/test/resources/configs/tika-config-json.json | 3 +++ .../src/test/resources/configs/tika-config-json.xml | 20 -------------------- 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/tika-serialization/src/main/java/org/apache/tika/serialization/JsonMetadataList.java b/tika-serialization/src/main/java/org/apache/tika/serialization/JsonMetadataList.java index 4b84e9f3a..ef1385a84 100644 --- a/tika-serialization/src/main/java/org/apache/tika/serialization/JsonMetadataList.java +++ b/tika-serialization/src/main/java/org/apache/tika/serialization/JsonMetadataList.java @@ -29,7 +29,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; +import org.apache.tika.config.GlobalSettings; import org.apache.tika.config.TikaConfig; +import org.apache.tika.config.loader.TikaLoader; import org.apache.tika.metadata.Metadata; public class JsonMetadataList { @@ -100,8 +102,8 @@ public class JsonMetadataList { return null; } if (OBJECT_MAPPER.getFactory().streamReadConstraints().getMaxStringLength() - != TikaConfig.getMaxJsonStringFieldLength()) { - OBJECT_MAPPER = buildObjectMapper(TikaConfig.getMaxJsonStringFieldLength()); + != GlobalSettings.getMaxJsonStringFieldLength()) { + OBJECT_MAPPER = buildObjectMapper(GlobalSettings.getMaxJsonStringFieldLength()); } return OBJECT_MAPPER.readValue(reader, new TypeReference<List<Metadata>>(){}); diff --git a/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataListTest.java b/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataListTest.java index b94305d9b..c4a7496b1 100644 --- a/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataListTest.java +++ b/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataListTest.java @@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -32,6 +33,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import org.junit.jupiter.api.Test; import org.apache.tika.config.TikaConfig; +import org.apache.tika.config.loader.TikaLoader; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; @@ -136,10 +138,7 @@ public class JsonMetadataListTest { @Test public void testLargeValues() throws Exception { //TIKA-4154 - TikaConfig tikaConfig = null; - try (InputStream is = JsonMetadata.class.getResourceAsStream("/configs/tika-config-json.xml")) { - tikaConfig = new TikaConfig(is); - } + TikaLoader.load(Paths.get(JsonMetadata.class.getResource("/configs/tika-config-json.json").toURI())); StringBuilder sb = new StringBuilder(); for (int i = 0; i < 30000000; i++) { sb.append("v"); diff --git a/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataTest.java b/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataTest.java index 7b658fa46..d2b9f88e7 100644 --- a/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataTest.java +++ b/tika-serialization/src/test/java/org/apache/tika/serialization/JsonMetadataTest.java @@ -24,10 +24,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; +import java.nio.file.Paths; import org.junit.jupiter.api.Test; import org.apache.tika.config.TikaConfig; +import org.apache.tika.config.loader.TikaLoader; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; @@ -118,10 +120,7 @@ public class JsonMetadataTest { @Test public void testLargeValues() throws Exception { //TIKA-4154 - TikaConfig tikaConfig = null; - try (InputStream is = JsonMetadata.class.getResourceAsStream("/configs/tika-config-json.xml")) { - tikaConfig = new TikaConfig(is); - } + TikaLoader.load(Paths.get(JsonMetadata.class.getResource("/configs/tika-config-json.json").toURI())); StringBuilder sb = new StringBuilder(); for (int i = 0; i < 30000000; i++) { sb.append("v"); diff --git a/tika-serialization/src/test/resources/configs/tika-config-json.json b/tika-serialization/src/test/resources/configs/tika-config-json.json new file mode 100644 index 000000000..8d1e5feb0 --- /dev/null +++ b/tika-serialization/src/test/resources/configs/tika-config-json.json @@ -0,0 +1,3 @@ +{ + "maxJsonStringFieldLength": 50000000 +} \ No newline at end of file diff --git a/tika-serialization/src/test/resources/configs/tika-config-json.xml b/tika-serialization/src/test/resources/configs/tika-config-json.xml deleted file mode 100644 index 8c76bd45a..000000000 --- a/tika-serialization/src/test/resources/configs/tika-config-json.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<properties> - <maxJsonStringFieldLength>50000000</maxJsonStringFieldLength> -</properties>
