(tika) branch tika-grpc-3x-features updated: TIKA-4252: make metadata optional

[ndipiazza]

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

ndipiazza pushed a commit to branch tika-grpc-3x-features
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/tika-grpc-3x-features by this 
push:
     new bdf2853ca TIKA-4252: make metadata optional
bdf2853ca is described below

commit bdf2853ca5672c4cd26b64867865911f346ff575
Author: Nicholas DiPiazza <ndipia...@apache.org>
AuthorDate: Thu May 9 15:39:46 2024 -0500

    TIKA-4252: make metadata optional
---
 tika-pipes/tika-grpc/example-dockerfile/Dockerfile             |  2 --
 .../java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java    | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tika-pipes/tika-grpc/example-dockerfile/Dockerfile 
b/tika-pipes/tika-grpc/example-dockerfile/Dockerfile
index 64c46cc94..dca5866a3 100644
--- a/tika-pipes/tika-grpc/example-dockerfile/Dockerfile
+++ b/tika-pipes/tika-grpc/example-dockerfile/Dockerfile
@@ -6,8 +6,6 @@ ARG JRE='openjdk-17-jre-headless'
 RUN set -eux \
     && apt-get update \
     && apt-get install --yes --no-install-recommends gnupg2 
software-properties-common \
-    && add-apt-repository -y ppa:alex-p/tesseract-ocr5 \
-    && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes 
--no-install-recommends $JRE \
         gdal-bin \
         tesseract-ocr \
diff --git 
a/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java
 
b/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java
index 06dba228f..ce298a1af 100644
--- 
a/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java
+++ 
b/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java
@@ -36,6 +36,7 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.rpc.Status;
@@ -73,6 +74,7 @@ import org.apache.tika.pipes.emitter.EmitKey;
 import org.apache.tika.pipes.fetcher.AbstractFetcher;
 import org.apache.tika.pipes.fetcher.FetchKey;
 import org.apache.tika.pipes.fetcher.config.AbstractConfig;
+import org.apache.tika.utils.StringUtils;
 
 class TikaGrpcServerImpl extends TikaGrpc.TikaImplBase {
     private static final Logger LOG = 
LoggerFactory.getLogger(TikaConfigSerializer.class);
@@ -188,7 +190,13 @@ class TikaGrpcServerImpl extends TikaGrpc.TikaImplBase {
         }
         Metadata tikaMetadata = new Metadata();
         try {
-            Map<String, Object> metadataJsonObject = 
OBJECT_MAPPER.readValue(request.getMetadataJson(), new TypeReference<>() {});
+            Map<String, Object> metadataJsonObject = new HashMap<>();
+            if (!StringUtils.isBlank(request.getMetadataJson())) {
+                try {
+                    metadataJsonObject = 
OBJECT_MAPPER.readValue(request.getMetadataJson(), new TypeReference<>() {});
+                } catch (JsonProcessingException e) {
+                }
+            }
             for (Map.Entry<String, Object> entry : 
metadataJsonObject.entrySet()) {
                 if (entry.getValue() instanceof List) {
                     List<Object> list = (List<Object>) entry.getValue();