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 308b004d1e3e8e06796ac49e8324a717e990cd5c Author: tballison <[email protected]> AuthorDate: Fri Nov 22 16:50:27 2019 -0500 TIKA_2998 -- fix capitalization and failed cherry-pick --- .../src/main/java/org/apache/tika/metadata/{FONT.java => Font.java} | 5 ++--- .../src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java | 5 ++--- .../src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tika-core/src/main/java/org/apache/tika/metadata/FONT.java b/tika-core/src/main/java/org/apache/tika/metadata/Font.java similarity index 91% rename from tika-core/src/main/java/org/apache/tika/metadata/FONT.java rename to tika-core/src/main/java/org/apache/tika/metadata/Font.java index 71bb505..e7aa01c 100644 --- a/tika-core/src/main/java/org/apache/tika/metadata/FONT.java +++ b/tika-core/src/main/java/org/apache/tika/metadata/Font.java @@ -15,14 +15,13 @@ package org.apache.tika.metadata; /* * limitations under the License. */ -public interface FONT { +public interface Font { String PREFIX_FONT_META = "font"; /** * Basic name of a font used in a file */ - Property FONT_NAME = Property.internalTextBag(PREFIX_FONT_META + - TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER + "name"); + Property FONT_NAME = Property.internalTextBag(PREFIX_FONT_META +":name"); } diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java index 19972c4..c15a82c 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java @@ -44,7 +44,6 @@ import java.util.TreeMap; import org.apache.commons.io.IOExceptionWithCause; import org.apache.commons.io.IOUtils; import org.apache.pdfbox.cos.COSName; -import org.apache.pdfbox.cos.COSString; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentCatalog; import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary; @@ -91,7 +90,7 @@ import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.EmbeddedDocumentUtil; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; -import org.apache.tika.metadata.FONT; +import org.apache.tika.metadata.Font; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.PDF; import org.apache.tika.metadata.TikaCoreProperties; @@ -603,7 +602,7 @@ class AbstractPDF2XHTML extends PDFTextStripper { } if (fontNames.size() > 0) { for (String fontName : fontNames) { - metadata.add(FONT.FONT_NAME, fontName); + metadata.add(Font.FONT_NAME, fontName); } } } diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java index 5649d56..31dc2a6 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java @@ -47,7 +47,7 @@ import org.apache.tika.extractor.ContainerExtractor; import org.apache.tika.extractor.DocumentSelector; import org.apache.tika.extractor.ParserContainerExtractor; import org.apache.tika.io.TikaInputStream; -import org.apache.tika.metadata.FONT; +import org.apache.tika.metadata.Font; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.OfficeOpenXMLCore; import org.apache.tika.metadata.PDF; @@ -155,7 +155,7 @@ public class PDFParserTest extends TikaTest { ParseContext pc = new ParseContext(); pc.set(PDFParserConfig.class, config); XMLResult r = getXML("testPDFVarious.pdf", pc); - assertContains("ABCDEE+Calibri", r.metadata.get(FONT.FONT_NAME)); + assertContains("ABCDEE+Calibri", r.metadata.get(Font.FONT_NAME)); } @Test
