CURATOR-547 change JAX-RS reader/writer to reuse Jackson ObjectMapper; also Jackson 2.9.8 -> 2.9.10
diff --git a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/entity/JsonServiceInstanceMarshaller.java b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/entity/JsonServiceInstanceMarshaller.java
index 1b3fd96..b67c8b5 100644
--- a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/entity/JsonServiceInstanceMarshaller.java
+++ b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/entity/JsonServiceInstanceMarshaller.java
@@ -48,6 +48,8 @@
@Produces(MediaType.APPLICATION_JSON)
public class JsonServiceInstanceMarshaller<T> implements MessageBodyReader<ServiceInstance<T>>, MessageBodyWriter<ServiceInstance<T>>
{
+ private final static ObjectMapper mapper = new ObjectMapper();
+
private final DiscoveryContext<T> context;
public JsonServiceInstanceMarshaller(DiscoveryContext<T> context)
@@ -140,8 +142,7 @@
{
try
{
- ObjectMapper mapper = new ObjectMapper();
- JsonNode node = mapper.reader().readTree(entityStream);
+ JsonNode node = mapper.readTree(entityStream);
return readInstance(node, context);
}
catch ( Exception e )
@@ -154,8 +155,7 @@
@Override
public void writeTo(ServiceInstance<T> serviceInstance, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException
{
- ObjectMapper mapper = new ObjectMapper();
ObjectNode node = writeInstance(mapper, serviceInstance, context);
- mapper.writer().writeValue(entityStream, node);
+ mapper.writeValue(entityStream, node);
}
}
