You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/04/07 16:23:15 UTC

[tika] branch main updated: don't close readers/writers in json serialization

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 4bd278f  don't close readers/writers in json serialization
4bd278f is described below

commit 4bd278f8433b0ae83c2394cb1438216f7beb76ae
Author: tallison <ta...@apache.org>
AuthorDate: Wed Apr 7 12:22:52 2021 -0400

    don't close readers/writers in json serialization
---
 .../org/apache/tika/metadata/serialization/JsonMetadata.java | 11 +++++++++--
 .../apache/tika/metadata/serialization/JsonMetadataList.java | 12 ++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadata.java b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadata.java
index b33c2a9..131432e 100644
--- a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadata.java
+++ b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadata.java
@@ -26,6 +26,9 @@ import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import org.apache.commons.io.input.CloseShieldReader;
+import org.apache.commons.io.output.CloseShieldWriter;
+
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
 
@@ -45,7 +48,8 @@ public class JsonMetadata {
             writer.write("null");
             return;
         }
-        try (JsonGenerator jsonGenerator = new JsonFactory().createGenerator(writer)) {
+        try (JsonGenerator jsonGenerator = new JsonFactory().createGenerator(
+                new CloseShieldWriter(writer))) {
             if (PRETTY_PRINT) {
                 jsonGenerator.useDefaultPrettyPrinter();
             }
@@ -80,13 +84,16 @@ public class JsonMetadata {
     /**
      * Read metadata from reader.
      *
+     * This does not close the reader.
+     *
      * @param reader reader to read from
      * @return Metadata or null if nothing could be read from the reader
      * @throws IOException in case of parse failure or IO failure with Reader
      */
     public static Metadata fromJson(Reader reader) throws IOException {
         Metadata m = null;
-        try (JsonParser jParser = new JsonFactory().createParser(reader)) {
+        try (JsonParser jParser = new JsonFactory()
+                .createParser(new CloseShieldReader(reader))) {
             m = readMetadataObject(jParser);
         }
         return m;
diff --git a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataList.java b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataList.java
index 85f444e..343aca8 100644
--- a/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataList.java
+++ b/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataList.java
@@ -28,6 +28,8 @@ import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import org.apache.commons.io.input.CloseShieldReader;
+import org.apache.commons.io.output.CloseShieldWriter;
 
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
@@ -48,7 +50,8 @@ public class JsonMetadataList {
             writer.write("null");
             return;
         }
-        try (JsonGenerator jsonGenerator = new JsonFactory().createGenerator(writer)) {
+        try (JsonGenerator jsonGenerator = new JsonFactory().createGenerator(
+                new CloseShieldWriter(writer))) {
             if (PRETTY_PRINT) {
                 jsonGenerator.useDefaultPrettyPrinter();
             }
@@ -61,7 +64,7 @@ public class JsonMetadataList {
     }
         
     /**
-     * Read metadata from reader.
+     * Read metadata from reader. This does not close the reader
      *
      * @param reader
      * @return Metadata or null if nothing could be read from the reader
@@ -73,12 +76,13 @@ public class JsonMetadataList {
             return ms;
         }
         ms = new ArrayList<>();
-        try (JsonParser jParser = new JsonFactory().createParser(reader)) {
+        try (JsonParser jParser = new JsonFactory().createParser(
+                new CloseShieldReader(reader))) {
 
             JsonToken token = jParser.nextToken();
             if (token != JsonToken.START_ARRAY) {
                 throw new IOException(
-                        "metadata list must start with an array, but I see: "+token.name());
+                        "metadata list must start with an array, but I see: " + token.name());
             }
             token = jParser.nextToken();
             while (token != JsonToken.END_ARRAY) {