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/09 15:04:40 UTC
[tika] 03/04: close json writer in tika-server
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
commit 52a8367f2f67bf58934d34dfdd77d2058b3536b0
Author: tallison <ta...@apache.org>
AuthorDate: Fri Apr 9 10:47:00 2021 -0400
close json writer in tika-server
---
.../apache/tika/server/core/writer/JSONMessageBodyWriter.java | 10 +++++-----
.../java/org/apache/tika/server/core/writer/JSONObjWriter.java | 8 ++++----
.../tika/server/core/writer/MetadataListMessageBodyWriter.java | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java
index e975b82..965970f 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java
@@ -52,11 +52,11 @@ public class JSONMessageBodyWriter implements MessageBodyWriter<Metadata> {
@Override
public void writeTo(Metadata metadata, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+ MultivaluedMap<String, Object> httpHeaders,
+ OutputStream entityStream)
throws IOException, WebApplicationException {
- Writer writer = new OutputStreamWriter(entityStream, UTF_8);
- JsonMetadata.toJson(metadata, writer);
- writer.flush();
- entityStream.flush();
+ try (Writer writer = new OutputStreamWriter(entityStream, UTF_8)) {
+ JsonMetadata.toJson(metadata, writer);
+ }
}
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java
index 30354a0..2cc7d17 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java
@@ -57,9 +57,9 @@ public class JSONObjWriter implements MessageBodyWriter<Map<String, Object>> {
Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
throws IOException, WebApplicationException {
- Writer writer = new OutputStreamWriter(entityStream, UTF_8);
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.writerWithDefaultPrettyPrinter().writeValue(writer, map);
- entityStream.flush();
+ try (Writer writer = new OutputStreamWriter(entityStream, UTF_8)) {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.writerWithDefaultPrettyPrinter().writeValue(writer, map);
+ }
}
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java
index cf59299..a558cd1 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java
@@ -57,8 +57,8 @@ public class MetadataListMessageBodyWriter implements MessageBodyWriter<Metadata
Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
throws IOException, WebApplicationException {
- Writer writer = new OutputStreamWriter(entityStream, UTF_8);
- JsonMetadataList.toJson(list.getMetadata(), writer);
- entityStream.flush();
+ try (Writer writer = new OutputStreamWriter(entityStream, UTF_8)) {
+ JsonMetadataList.toJson(list.getMetadata(), writer);
+ }
}
}