Repository: tika Updated Branches: refs/heads/master 011f33807 -> 15a923025
TIKA-2111 - set instead of add "Content-Type" in the ExecutableParser Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/15a92302 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/15a92302 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/15a92302 Branch: refs/heads/master Commit: 15a92302501d5ee6a319442c8109eafe37ec4595 Parents: 011f338 Author: tballison <[email protected]> Authored: Tue Nov 1 09:57:15 2016 -0400 Committer: tballison <[email protected]> Committed: Tue Nov 1 09:57:15 2016 -0400 ---------------------------------------------------------------------- .../apache/tika/parser/executable/ExecutableParser.java | 12 ++++++------ .../tika/parser/executable/ExecutableParserTest.java | 5 +---- 2 files changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/15a92302/tika-parsers/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java index 1096e99..b962e42 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java @@ -87,7 +87,7 @@ public class ExecutableParser extends AbstractParser implements MachineMetadata */ public void parsePE(XHTMLContentHandler xhtml, Metadata metadata, InputStream stream, byte[] first4) throws TikaException, IOException { - metadata.add(Metadata.CONTENT_TYPE, PE_EXE.toString()); + metadata.set(Metadata.CONTENT_TYPE, PE_EXE.toString()); metadata.set(PLATFORM, PLATFORM_WINDOWS); // Skip over the MS-DOS bit @@ -321,23 +321,23 @@ public class ExecutableParser extends AbstractParser implements MachineMetadata } switch(type) { case 1: - metadata.add(Metadata.CONTENT_TYPE, ELF_OBJECT.toString()); + metadata.set(Metadata.CONTENT_TYPE, ELF_OBJECT.toString()); break; case 2: - metadata.add(Metadata.CONTENT_TYPE, ELF_EXECUTABLE.toString()); + metadata.set(Metadata.CONTENT_TYPE, ELF_EXECUTABLE.toString()); break; case 3: - metadata.add(Metadata.CONTENT_TYPE, ELF_SHAREDLIB.toString()); + metadata.set(Metadata.CONTENT_TYPE, ELF_SHAREDLIB.toString()); break; case 4: - metadata.add(Metadata.CONTENT_TYPE, ELF_COREDUMP.toString()); + metadata.set(Metadata.CONTENT_TYPE, ELF_COREDUMP.toString()); break; default: - metadata.add(Metadata.CONTENT_TYPE, ELF_GENERAL.toString()); + metadata.set(Metadata.CONTENT_TYPE, ELF_GENERAL.toString()); break; } http://git-wip-us.apache.org/repos/asf/tika/blob/15a92302/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java index 859cc7d..e7bd24d 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java @@ -31,10 +31,7 @@ public class ExecutableParserTest extends TikaTest { XMLResult r = getXML("testWindows-x86-32.exe"); Metadata metadata = r.metadata; - //not clear why ExecutableParser is adding instead of - //setting CONTENT_TYPE - assertContains("application/x-msdownload", - Arrays.asList(metadata.getValues(Metadata.CONTENT_TYPE))); + assertEquals("application/x-msdownload", metadata.get(Metadata.CONTENT_TYPE)); assertEquals("2012-05-13T13:40:11Z", metadata.get(Metadata.CREATION_DATE));
