Repository: tika Updated Branches: refs/heads/2.x 44612ae40 -> 61532258f
TIKA-1332 3rd time's the charm. Fix dependencies with IOUtils. Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/61532258 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/61532258 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/61532258 Branch: refs/heads/2.x Commit: 61532258f2ff44787050f0f3a0bb8ba17d8e50b0 Parents: 44612ae Author: tballison <talli...@mitre.org> Authored: Thu Feb 16 14:41:13 2017 -0500 Committer: tballison <talli...@mitre.org> Committed: Thu Feb 16 14:41:13 2017 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/tika/eval/XMLErrorLogUpdater.java | 2 +- tika-eval/src/main/java/org/apache/tika/eval/db/DBUtil.java | 2 +- tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java | 2 +- .../src/main/java/org/apache/tika/eval/io/ExtractReader.java | 2 +- .../src/main/java/org/apache/tika/eval/io/XMLLogReader.java | 7 ++++--- .../main/java/org/apache/tika/eval/tokens/TokenIntPair.java | 4 +--- 6 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/61532258/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java ---------------------------------------------------------------------- diff --git a/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java b/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java index 9a7e7aa..eaaf228 100644 --- a/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java +++ b/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java @@ -32,6 +32,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import org.apache.commons.io.IOExceptionWithCause; import org.apache.log4j.Level; import org.apache.tika.eval.db.Cols; import org.apache.tika.eval.db.DBUtil; @@ -40,7 +41,6 @@ import org.apache.tika.eval.db.TableInfo; import org.apache.tika.eval.io.XMLLogMsgHandler; import org.apache.tika.eval.io.XMLLogReader; import org.apache.tika.eval.reports.ResultsReporter; -import org.apache.tika.io.IOExceptionWithCause; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/tika/blob/61532258/tika-eval/src/main/java/org/apache/tika/eval/db/DBUtil.java ---------------------------------------------------------------------- diff --git a/tika-eval/src/main/java/org/apache/tika/eval/db/DBUtil.java b/tika-eval/src/main/java/org/apache/tika/eval/db/DBUtil.java index 1efa48a..d99798d 100644 --- a/tika-eval/src/main/java/org/apache/tika/eval/db/DBUtil.java +++ b/tika-eval/src/main/java/org/apache/tika/eval/db/DBUtil.java @@ -31,8 +31,8 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import org.apache.commons.io.IOExceptionWithCause; import org.apache.log4j.Logger; -import org.apache.tika.io.IOExceptionWithCause; public abstract class DBUtil { http://git-wip-us.apache.org/repos/asf/tika/blob/61532258/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java ---------------------------------------------------------------------- diff --git a/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java b/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java index db4cd04..383f25c 100644 --- a/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java +++ b/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; +import org.apache.commons.io.IOExceptionWithCause; import org.apache.log4j.Logger; import org.apache.tika.config.TikaConfig; import org.apache.tika.eval.db.ColInfo; @@ -32,7 +33,6 @@ import org.apache.tika.eval.db.Cols; import org.apache.tika.eval.db.DBUtil; import org.apache.tika.eval.db.MimeBuffer; import org.apache.tika.eval.db.TableInfo; -import org.apache.tika.io.IOExceptionWithCause; /** * This is still in its early stages. The idea is to http://git-wip-us.apache.org/repos/asf/tika/blob/61532258/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java ---------------------------------------------------------------------- diff --git a/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java b/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java index cd90f76..f703408 100644 --- a/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java +++ b/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java @@ -15,9 +15,9 @@ import java.util.regex.Pattern; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.commons.compress.compressors.z.ZCompressorInputStream; +import org.apache.commons.io.IOUtils; import org.apache.tika.config.TikaConfig; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.serialization.JsonMetadataList; import org.apache.tika.mime.MediaType; http://git-wip-us.apache.org/repos/asf/tika/blob/61532258/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java ---------------------------------------------------------------------- diff --git a/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java b/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java index bb47b77..2db160a 100644 --- a/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java +++ b/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java @@ -23,11 +23,12 @@ import javax.xml.stream.XMLStreamReader; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.sql.SQLException; +import org.apache.commons.io.IOUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.ParseContext; @@ -92,9 +93,9 @@ public class XMLLogReader { private LogXMLWrappingInputStream(InputStream xmlLogFileIs){ streams = new InputStream[3]; - streams[0] = new ByteArrayInputStream(HEADER.getBytes(IOUtils.UTF_8)); + streams[0] = new ByteArrayInputStream(HEADER.getBytes(StandardCharsets.UTF_8)); streams[1] = xmlLogFileIs; - streams[2] = new ByteArrayInputStream(FOOTER.getBytes(IOUtils.UTF_8)); + streams[2] = new ByteArrayInputStream(FOOTER.getBytes(StandardCharsets.UTF_8)); } http://git-wip-us.apache.org/repos/asf/tika/blob/61532258/tika-eval/src/main/java/org/apache/tika/eval/tokens/TokenIntPair.java ---------------------------------------------------------------------- diff --git a/tika-eval/src/main/java/org/apache/tika/eval/tokens/TokenIntPair.java b/tika-eval/src/main/java/org/apache/tika/eval/tokens/TokenIntPair.java index 4b57d25..a924f07 100644 --- a/tika-eval/src/main/java/org/apache/tika/eval/tokens/TokenIntPair.java +++ b/tika-eval/src/main/java/org/apache/tika/eval/tokens/TokenIntPair.java @@ -17,8 +17,6 @@ package org.apache.tika.eval.tokens; -import org.jetbrains.annotations.NotNull; - public class TokenIntPair implements Comparable<TokenIntPair> { final String token; @@ -63,7 +61,7 @@ public class TokenIntPair implements Comparable<TokenIntPair> { * @return comparison */ @Override - public int compareTo(@NotNull TokenIntPair o) { + public int compareTo(TokenIntPair o) { if (this.value > o.value) { return -1; } else if (this.value < o.value) {
