(tika) branch branch_2x updated: TIKA-4274: improve ExtractReaderException and logging

[tilman]

This is an automated email from the ASF dual-hosted git repository.

tilman pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_2x by this push:
     new 3570f885a TIKA-4274: improve ExtractReaderException and logging
3570f885a is described below

commit 3570f885a1ce8be445252b50ceb5bddea0d3fd93
Author: Tilman Hausherr <til...@apache.org>
AuthorDate: Sun Jul 7 12:27:58 2024 +0200

    TIKA-4274: improve ExtractReaderException and logging
---
 .../main/java/org/apache/tika/eval/app/io/ExtractReader.java   | 10 +++++++---
 .../org/apache/tika/eval/app/io/ExtractReaderException.java    |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReader.java
 
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReader.java
index a0ec4b5a4..be4064875 100644
--- 
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReader.java
+++ 
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReader.java
@@ -111,7 +111,7 @@ public class ExtractReader {
         try {
             length = Files.size(extractFile);
         } catch (IOException e) {
-            throw new 
ExtractReaderException(ExtractReaderException.TYPE.IO_EXCEPTION);
+            throw new 
ExtractReaderException(ExtractReaderException.TYPE.IO_EXCEPTION, e);
         }
 
         if (length == 0L) {
@@ -119,9 +119,13 @@ public class ExtractReader {
         }
 
         if (minExtractLength > IGNORE_LENGTH && length < minExtractLength) {
+            LOG.info("minExtractLength {} > IGNORE_LENGTH {} and length {} < 
minExtractLength {}", 
+                    minExtractLength, IGNORE_LENGTH, length, minExtractLength);
             throw new 
ExtractReaderException(ExtractReaderException.TYPE.EXTRACT_FILE_TOO_SHORT);
         }
         if (maxExtractLength > IGNORE_LENGTH && length > maxExtractLength) {
+            LOG.info("maxExtractLength {} > IGNORE_LENGTH {} and length {} > 
maxExtractLength {}", 
+                    maxExtractLength, IGNORE_LENGTH, length, maxExtractLength);
             throw new 
ExtractReaderException(ExtractReaderException.TYPE.EXTRACT_FILE_TOO_LONG);
         }
 
@@ -148,7 +152,7 @@ public class ExtractReader {
             }
             reader = new BufferedReader(new InputStreamReader(is, 
StandardCharsets.UTF_8));
         } catch (IOException e) {
-            throw new 
ExtractReaderException(ExtractReaderException.TYPE.IO_EXCEPTION);
+            throw new 
ExtractReaderException(ExtractReaderException.TYPE.IO_EXCEPTION, e);
         }
 
         try {
@@ -180,7 +184,7 @@ public class ExtractReader {
                 metadataList = generateListFromTextFile(reader, fileSuffixes);
             }
         } catch (IOException e) {
-            throw new 
ExtractReaderException(ExtractReaderException.TYPE.IO_EXCEPTION);
+            throw new 
ExtractReaderException(ExtractReaderException.TYPE.IO_EXCEPTION, e);
         } finally {
             IOUtils.closeQuietly(reader);
             IOUtils.closeQuietly(is);
diff --git 
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReaderException.java
 
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReaderException.java
index 5f48a363a..a8d68abd1 100644
--- 
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReaderException.java
+++ 
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/io/ExtractReaderException.java
@@ -26,6 +26,12 @@ public class ExtractReaderException extends IOException {
     private final TYPE type;
 
     public ExtractReaderException(TYPE exceptionType) {
+        super(exceptionType.toString());
+        this.type = exceptionType;
+    }
+
+    public ExtractReaderException(TYPE exceptionType, Throwable t) {
+        super(exceptionType.toString(), t);
         this.type = exceptionType;
     }