Repository: tika Updated Branches: refs/heads/master 1caba4d0b -> 54c590963
TIKA-1885: Updated MimeType to application/x-empty to match Unix file command Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/114b6044 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/114b6044 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/114b6044 Branch: refs/heads/master Commit: 114b6044a74fe463b90712345ea8e3b2cb085b62 Parents: a91d083 Author: David Meikle <[email protected]> Authored: Sun May 8 23:53:24 2016 +0100 Committer: David Meikle <[email protected]> Committed: Sun May 8 23:53:24 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/tika/detect/ZeroSizeFileDetector.java | 2 +- tika-core/src/main/java/org/apache/tika/mime/MediaType.java | 4 ++-- .../src/main/java/org/apache/tika/mime/MediaTypeRegistry.java | 4 ++-- .../java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/114b6044/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java b/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java index f39b45a..d46bd21 100644 --- a/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java +++ b/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java @@ -31,7 +31,7 @@ public class ZeroSizeFileDetector implements Detector { if (stream != null) { if(stream.read() == -1) { - return MediaType.ZERO_SIZE; + return MediaType.EMPTY; } } return MediaType.OCTET_STREAM; http://git-wip-us.apache.org/repos/asf/tika/blob/114b6044/tika-core/src/main/java/org/apache/tika/mime/MediaType.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/mime/MediaType.java b/tika-core/src/main/java/org/apache/tika/mime/MediaType.java index d0aaf5c..1d91e84 100644 --- a/tika-core/src/main/java/org/apache/tika/mime/MediaType.java +++ b/tika-core/src/main/java/org/apache/tika/mime/MediaType.java @@ -71,8 +71,8 @@ public final class MediaType implements Comparable<MediaType>, Serializable { public static final MediaType OCTET_STREAM = parse("application/octet-stream"); - public static final MediaType ZERO_SIZE = - parse("application/x-zerosize"); + public static final MediaType EMPTY = + parse("application/x-empty"); public static final MediaType TEXT_PLAIN = parse("text/plain"); http://git-wip-us.apache.org/repos/asf/tika/blob/114b6044/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java b/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java index 37aecda..813eda0 100644 --- a/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java +++ b/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java @@ -197,8 +197,8 @@ public class MediaTypeRegistry implements Serializable { } else if ("text".equals(type.getType()) && !MediaType.TEXT_PLAIN.equals(type)) { return MediaType.TEXT_PLAIN; - } else if(type.getType().contains("zero") && !MediaType.ZERO_SIZE.equals(type)){ - return MediaType.ZERO_SIZE; + } else if(type.getType().contains("empty") && !MediaType.EMPTY.equals(type)){ + return MediaType.EMPTY; } else if (!MediaType.OCTET_STREAM.equals(type)) { return MediaType.OCTET_STREAM; } else { http://git-wip-us.apache.org/repos/asf/tika/blob/114b6044/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java ---------------------------------------------------------------------- diff --git a/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java index 257d7f1..8761c5f 100644 --- a/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java +++ b/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java @@ -41,7 +41,7 @@ public class ZeroSizeFileDetectorTest { @Test public void testDetectZeroValue() { byte[] data = "".getBytes(UTF_8); - detect(data, MediaType.ZERO_SIZE); + detect(data, MediaType.EMPTY); System.out.println(); }
