From c00295cb91ee1f7302b8519920a7ee68476f5839 Mon Sep 17 00:00:00 2001 From: Simon Hunt Date: Thu, 30 Apr 2015 10:52:57 -0700 Subject: [PATCH] Removed unnecessary mapper declaration -- use the one exposed in the superclass. Change-Id: I90154dddb6dd69a064097a93a9c3cabec251c599 --- .../onosproject/ui/impl/DeviceViewMessageHandler.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java index 7937c6b968..9820f6dd73 100644 --- a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java +++ b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java @@ -15,7 +15,6 @@ */ package org.onosproject.ui.impl; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.ImmutableSet; @@ -60,8 +59,6 @@ public class DeviceViewMessageHandler extends AbstractTabularViewMessageHandler private static final String SPEED = "speed"; private static final String NAME = "name"; - private static final ObjectMapper MAPPER = new ObjectMapper(); - /** * Creates a new message handler for the device messages. @@ -107,7 +104,7 @@ public class DeviceViewMessageHandler extends AbstractTabularViewMessageHandler DeviceService service = get(DeviceService.class); MastershipService ms = get(MastershipService.class); Device device = service.getDevice(deviceId); - ObjectNode data = MAPPER.createObjectNode(); + ObjectNode data = mapper.createObjectNode(); data.put(ID, deviceId.toString()); data.put(TYPE, device.type().toString()); @@ -120,7 +117,7 @@ public class DeviceViewMessageHandler extends AbstractTabularViewMessageHandler data.put(MASTER_ID, ms.getMasterFor(deviceId).toString()); data.put(PROTOCOL, device.annotations().value(PROTOCOL)); - ArrayNode ports = MAPPER.createArrayNode(); + ArrayNode ports = mapper.createArrayNode(); List portList = new ArrayList<>(service.getPorts(deviceId)); Collections.sort(portList, (p1, p2) -> { @@ -150,7 +147,7 @@ public class DeviceViewMessageHandler extends AbstractTabularViewMessageHandler } private ObjectNode portData(Port p, DeviceId id) { - ObjectNode port = MAPPER.createObjectNode(); + ObjectNode port = mapper.createObjectNode(); LinkService ls = get(LinkService.class); String name = p.annotations().value(AnnotationKeys.PORT_NAME);