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 e36fafefa989706741f15e4a92dcb788b38edc3d Author: Konstantin Gribov <[email protected]> AuthorDate: Tue Sep 18 16:54:01 2018 +0300 Fixed javadocs # Conflicts: # tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java # tika-core/src/main/java/org/apache/tika/parser/multiple/FallbackParser.java # tika-core/src/main/java/org/apache/tika/parser/multiple/SupplementingParser.java --- .../main/java/org/apache/tika/metadata/TikaCoreProperties.java | 9 +++++---- .../apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java | 4 +--- .../java/org/apache/tika/parser/microsoft/xml/WordMLParser.java | 5 +---- .../src/main/java/org/apache/tika/parser/mp3/ID3Tags.java | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java b/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java index f883699..0155070 100644 --- a/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java +++ b/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java @@ -91,6 +91,7 @@ public interface TikaCoreProperties { Property TIKA_META_EXCEPTION_EMBEDDED_STREAM = Property.internalTextBag(TIKA_META_EXCEPTION_PREFIX+"embedded_stream_exception"); + String EMBEDDED_RESOURCE_TYPE_KEY = "embeddedResourceType"; /** * Some file formats can store information about their original @@ -327,9 +328,9 @@ public interface TikaCoreProperties { /** * Embedded resource type property */ - public static final Property EMBEDDED_RESOURCE_TYPE = - Property.internalClosedChoise(TikaMetadataKeys.EMBEDDED_RESOURCE_TYPE, - new String[]{EmbeddedResourceType.ATTACHMENT.toString(), EmbeddedResourceType.INLINE.toString()}); + Property EMBEDDED_RESOURCE_TYPE = Property.internalClosedChoise(EMBEDDED_RESOURCE_TYPE_KEY, + EmbeddedResourceType.ATTACHMENT.toString(), + EmbeddedResourceType.INLINE.toString()); + - } diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java index ad8dd59..8674279 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java @@ -48,9 +48,7 @@ public class SpreadsheetMLParser extends AbstractXML2003Parser { final static String WORKSHEET = "worksheet"; private static final MediaType MEDIA_TYPE = MediaType.application("vnd.ms-spreadsheetml"); - private static final Set<MediaType> SUPPORTED_TYPES = - Collections.unmodifiableSet(new HashSet<>(Arrays.asList( - MEDIA_TYPE))); + private static final Set<MediaType> SUPPORTED_TYPES = Collections.singleton(MEDIA_TYPE); @Override public Set<MediaType> getSupportedTypes(ParseContext context) { diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java index 8c18d1c..6d1ea8e 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java @@ -49,8 +49,6 @@ import org.xml.sax.helpers.DefaultHandler; * See <a href="https://en.wikipedia.org/wiki/Microsoft_Office_XML_formats";>https://en.wikipedia.org/wiki/Microsoft_Office_XML_formats</a> */ public class WordMLParser extends AbstractXML2003Parser { - - //map between wordml and xhtml entities private static final Map<String, String> WORDML_TO_XHTML; static { @@ -72,8 +70,7 @@ public class WordMLParser extends AbstractXML2003Parser { private static final MediaType MEDIA_TYPE = MediaType.application("vnd.ms-wordml"); - private static final Set<MediaType> SUPPORTED_TYPES = - Collections.singleton(MEDIA_TYPE); //immutable + private static final Set<MediaType> SUPPORTED_TYPES = Collections.singleton(MEDIA_TYPE); //immutable @Override public Set<MediaType> getSupportedTypes(ParseContext context) { diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java b/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java index 63577e6..b8d723f 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java @@ -212,7 +212,7 @@ public interface ID3Tags { * Represents a comments in ID3 (especially ID3 v2), where are * made up of several parts */ - public static class ID3Comment { + class ID3Comment { private String language; private String description; private String text;
