Repository: hadoop Updated Branches: refs/heads/branch-2.8 94f4b5b9f -> 23150c29f
HADOOP-15835. Reuse Object Mapper in KMSJSONWriter (jeagles) (cherry picked from commit be06504a125d0f8ca222047ebd2dfd414bad3427) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/23150c29 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/23150c29 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/23150c29 Branch: refs/heads/branch-2.8 Commit: 23150c29ff2d5aa2c2de9720a9ac99046d29c0b8 Parents: 94f4b5b Author: Jonathan Eagles <[email protected]> Authored: Wed Oct 10 10:37:20 2018 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Wed Oct 10 10:37:58 2018 -0500 ---------------------------------------------------------------------- .../apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/23150c29/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java index 31fac9f..2d154b3 100644 --- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java +++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java @@ -19,7 +19,7 @@ package org.apache.hadoop.crypto.key.kms.server; import org.apache.hadoop.classification.InterfaceAudience; import org.codehaus.jackson.map.ObjectMapper; - +import org.codehaus.jackson.map.ObjectWriter; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; @@ -44,6 +44,8 @@ import java.util.Map; @Produces(MediaType.APPLICATION_JSON) @InterfaceAudience.Private public class KMSJSONWriter implements MessageBodyWriter<Object> { + private static final ObjectWriter WRITER = + new ObjectMapper().writerWithDefaultPrettyPrinter(); @Override public boolean isWriteable(Class<?> aClass, Type type, @@ -65,8 +67,7 @@ public class KMSJSONWriter implements MessageBodyWriter<Object> { OutputStream outputStream) throws IOException, WebApplicationException { Writer writer = new OutputStreamWriter(outputStream, Charset .forName("UTF-8")); - ObjectMapper jsonMapper = new ObjectMapper(); - jsonMapper.writerWithDefaultPrettyPrinter().writeValue(writer, obj); + WRITER.writeValue(writer, obj); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
