You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2026/01/08 10:44:20 UTC
(tika) branch branch_2x updated (c95697127f -> c62e875a0b)
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a change to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
from c95697127f TIKA-4614: add Media Management metadata extraction, avoid NPE, add test
new 096f17091c TIKA-4614: fix types
new c62e875a0b TIKA-4614: replace unknown type
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tika/parser/xmp/XMPMetadataExtractor.java | 2 +-
.../tika/parser/xmp/XmpboxExtractorTest.java | 33 +++++++++++-----------
2 files changed, 17 insertions(+), 18 deletions(-)
(tika) 02/02: TIKA-4614: replace unknown type
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit c62e875a0b92a201ec79e240382704533ca3117c
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Thu Jan 8 11:44:09 2026 +0100
TIKA-4614: replace unknown type
---
.../src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java
index 4f1f656eca..17fff169c8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java
@@ -184,7 +184,7 @@ public class XMPMetadataExtractor {
String action = stevt.getAction();
Calendar when = stevt.getWhen();
String softwareAgent = stevt.getSoftwareAgent();
- if (instanceId != null && !instanceId.isBlank())
+ if (instanceId != null && instanceId.trim().length() > 0)
{
// for absent data elements, pass in empty strings so
// that parallel arrays will have matching offsets for absent data
(tika) 01/02: TIKA-4614: fix types
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 096f17091cc2220c847eeba167f7893e2d962737
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Thu Jan 8 11:35:59 2026 +0100
TIKA-4614: fix types
---
.../tika/parser/xmp/XmpboxExtractorTest.java | 33 +++++++++++-----------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/XmpboxExtractorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/XmpboxExtractorTest.java
index b56e9b3be5..4c72a04ff6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/XmpboxExtractorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/XmpboxExtractorTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.metadata.XMPMM;
@@ -50,9 +49,9 @@ public class XmpboxExtractorTest extends TikaTest {
@Test // parsing fails because of bad date "2010-07-28T11:02:12.000CEST" = UTC+02:00
public void testParseJpeg() throws IOException, TikaException {
Metadata metadata = new Metadata();
- try (TikaInputStream tis = getResourceAsStream("/test-documents/testJPEG_commented.jpg")) {
+ try (InputStream is = getResourceAsStream("/test-documents/testJPEG_commented.jpg")) {
UnsynchronizedByteArrayOutputStream xmpraw = UnsynchronizedByteArrayOutputStream.builder().get();
- boolean parsed = scanner.parse(tis, xmpraw);
+ boolean parsed = scanner.parse(is, xmpraw);
assertTrue(parsed);
// set some values before extraction to see that they are overridden
@@ -89,14 +88,14 @@ public class XmpboxExtractorTest extends TikaTest {
@Test
public void testParseJpegPhotoshop() throws IOException, TikaException {
Metadata metadata = new Metadata();
- try (TikaInputStream tis = getResourceAsStream(
+ try (InputStream is = getResourceAsStream(
"/test-documents/testJPEG_commented_pspcs2mac.jpg")) {
UnsynchronizedByteArrayOutputStream xmpraw = UnsynchronizedByteArrayOutputStream.builder().get();
- boolean parsed = scanner.parse(tis, xmpraw);
+ boolean parsed = scanner.parse(is, xmpraw);
assertTrue(parsed);
- try (InputStream is = xmpraw.toInputStream()) {
- XMPMetadataExtractor.parse(is, metadata);
+ try (InputStream is2 = xmpraw.toInputStream()) {
+ XMPMetadataExtractor.parse(is2, metadata);
}
// DublinCore fields
@@ -114,14 +113,14 @@ public class XmpboxExtractorTest extends TikaTest {
@Test
public void testParseJpegXnviewmp() throws IOException, TikaException {
Metadata metadata = new Metadata();
- try (TikaInputStream tis = getResourceAsStream(
+ try (InputStream is = getResourceAsStream(
"/test-documents/testJPEG_commented_xnviewmp026.jpg")) {
UnsynchronizedByteArrayOutputStream xmpraw = UnsynchronizedByteArrayOutputStream.builder().get();
- boolean parsed = scanner.parse(tis, xmpraw);
+ boolean parsed = scanner.parse(is, xmpraw);
assertTrue(parsed);
- try (InputStream is = xmpraw.toInputStream()) {
- XMPMetadataExtractor.parse(is, metadata);
+ try (InputStream is2 = xmpraw.toInputStream()) {
+ XMPMetadataExtractor.parse(is2, metadata);
}
assertEquals("Bird site in north eastern Sk\u00E5ne, Sweden.\n(new line)",
@@ -138,21 +137,21 @@ public class XmpboxExtractorTest extends TikaTest {
Metadata metadata = new Metadata();
int maxHistory = XMPMetadataExtractor.getMaxXMPMMHistory();
try {
- try (TikaInputStream tis = getResourceAsStream("/test-documents/testXMP.xmp")) {
+ try (InputStream is = getResourceAsStream("/test-documents/testXMP.xmp")) {
UnsynchronizedByteArrayOutputStream xmpraw = UnsynchronizedByteArrayOutputStream.builder().get();
- boolean parsed = scanner.parse(tis, xmpraw);
+ boolean parsed = scanner.parse(is, xmpraw);
assertTrue(parsed);
- try (InputStream is = xmpraw.toInputStream()) {
- XMPMetadataExtractor.parse(is, metadata);
+ try (InputStream is2 = xmpraw.toInputStream()) {
+ XMPMetadataExtractor.parse(is2, metadata);
}
assertEquals(7, metadata.getValues(XMPMM.HISTORY_EVENT_INSTANCEID).length);
XMPMetadataExtractor.setMaxXMPMMHistory(5);
metadata = new Metadata();
- try (InputStream is = xmpraw.toInputStream()) {
- XMPMetadataExtractor.parse(is, metadata);
+ try (InputStream is2 = xmpraw.toInputStream()) {
+ XMPMetadataExtractor.parse(is2, metadata);
}
assertEquals(5, metadata.getValues(XMPMM.HISTORY_EVENT_INSTANCEID).length);