This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 941a1505fb4cfc87cfdbd2a1305c02173055c6cb Author: tallison <[email protected]> AuthorDate: Wed Jul 15 14:59:06 2020 -0400 fix merge conflicts and unit test --- .../main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java | 2 +- .../test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java index 9e1bec3..e4f24cd 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java @@ -80,7 +80,7 @@ public class ImageMetadataExtractor { private static final ParseContext EMPTY_PARSE_CONTEXT = new ParseContext(); private static final String GEO_DECIMAL_FORMAT_STRING = "#.######"; // 6 dp seems to be reasonable - private static final String ICC_NS = "ICC" + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER; + private static final String ICC_NS = "ICC" + Metadata.NAMESPACE_PREFIX_DELIMITER; private final Metadata metadata; private DirectoryHandler[] handlers; diff --git a/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java b/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java index a65efdc..544a602 100644 --- a/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java +++ b/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java @@ -370,7 +370,7 @@ public class RecursiveMetadataResourceTest extends CXFTestBase { metadataList = JsonMetadataList.fromJson(reader); assertEquals(12, metadataList.size()); assertEquals("true", metadataList.get(6).get(AbstractRecursiveParserWrapperHandler.WRITE_LIMIT_REACHED)); - assertContains("When in the Course of human events it becomes necessary for one people", + assertContains("When in the Course of human events it becomes",// necessary for one people" metadataList.get(6).get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT)); assertNotContained("to dissolve", metadataList.get(6).get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT));
