Merge branch '1.x'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.2.1
+
+* Fix known issues before parsing response (see [LOG4J2-2537](https://issues.apache.org/jira/browse/LOG4J2-2537))
+* Tested up to Apache Tika 1.28 and 2.2.0
+
 ## v1.2.0
 
 * Added specific methods to set OCR languages on web client (thanks to @aleksanm)

README.md

@@ -30,7 +30,7 @@ to work with the new versions of the tool.
 * Support for local and remote resources
 * No heavyweight library dependencies
 * Compatible with Apache Tika 1.15 or greater
-    * Tested up to 1.27 and 2.1.0
+    * Tested up to 1.28 and 2.2.0
 * Works on Linux, macOS, Windows and probably on FreeBSD
 
 ## Requirements

composer.json

@@ -47,7 +47,7 @@
         "supported-versions": [
             "1.15", "1.16", "1.17", "1.18", "1.19", "1.19.1", "1.20",
             "1.21", "1.22", "1.23", "1.24", "1.24.1", "1.25", "1.26",
-            "1.27", "2.0.0", "2.1.0"
+            "1.27", "1.28", "2.0.0", "2.1.0", "2.2.0"
         ]
     }
 }

src/Client.php

@@ -530,6 +530,25 @@ public function checkRequest(string $type, string $file = null): ?string
         return $file;
     }
 
+    /**
+     * Filter response to fix common issues
+     *
+     * @param string $response
+     * @return string
+     */
+    protected function filterResponse(string $response): string
+    {
+        // fix Log4j2 warning
+        $response = trim(str_replace
+        (
+            'WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance.',
+            '',
+            $response
+        ));
+
+        return trim($response);
+    }
+
     /**
      * Parse the response returned by Apache Tika
      *
@@ -550,6 +569,8 @@ protected function parseJsonResponse(string $response)
         // exceptions if metadata is not valid
         if(json_last_error())
         {
+            dd($response);
+
             $message = function_exists('json_last_error_msg') ? json_last_error_msg() : 'Error parsing JSON response';
 
             throw new Exception($message, json_last_error());
@@ -639,5 +660,5 @@ abstract public function check(): void;
      *
      * @throws \Exception
      */
-    abstract public function request(string $type, string $file = null): string;
+    abstract public function request(string $type, string $file = null): ?string;
 }

src/Clients/CLIClient.php

@@ -362,7 +362,7 @@ public function request(string $type, string $file = null): string
             $this->cacheResponse($type, $response, $file);
         }
 
-        return $response;
+        return $this->filterResponse($response);
     }
 
     /**
@@ -409,7 +409,7 @@ public function exec(string $command): ?string
             throw new Exception("Unexpected exit value ($exit) for command $command");
         }
 
-        return trim($this->response);
+        return $this->filterResponse($this->response);
     }
 
     /**

src/Clients/WebClient.php

@@ -498,7 +498,7 @@ public function request(string $type, string $file = null): string
             $this->error($status, $resource, $file);
         }
 
-        return $response;
+        return $this->filterResponse($response);
     }
 
     /**