From 1310d86caa138e09088984bb3e1669bd498e2f2c Mon Sep 17 00:00:00 2001
From: Denny Lim <hi.iamdenny@gmail.com>
Date: Sun, 18 May 2014 01:13:08 +0000
Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20#108=20?=
 =?UTF-8?q?=EC=84=9C=EB=B2=84=EB=A7=B5=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@3866 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .../nhn/pinpoint/web/view/LinkSerializer.java | 14 ++++----
 .../nhn/pinpoint/web/view/NodeSerializer.java | 32 +++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/nhn/pinpoint/web/view/LinkSerializer.java b/src/main/java/com/nhn/pinpoint/web/view/LinkSerializer.java
index b28e3400a..c509e2e92 100644
--- a/src/main/java/com/nhn/pinpoint/web/view/LinkSerializer.java
+++ b/src/main/java/com/nhn/pinpoint/web/view/LinkSerializer.java
@@ -24,10 +24,10 @@ public class LinkSerializer extends JsonSerializer<Link> {
     public void serialize(Link link, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
         jgen.writeStartObject();
 
-        jgen.writeStringField("id", link.getLinkName());
+        jgen.writeStringField("key", link.getLinkName());  // for servermap
 
-        jgen.writeStringField("from", link.getFrom().getNodeName());
-        jgen.writeStringField("to", link.getTo().getNodeName());
+        jgen.writeStringField("from", link.getFrom().getNodeName());  // necessary for go.js
+        jgen.writeStringField("to", link.getTo().getNodeName()); // necessary for go.js
 
 
         writeSimpleNode("sourceInfo", link.getFrom(), jgen);
@@ -41,9 +41,9 @@ public class LinkSerializer extends JsonSerializer<Link> {
         }
 
         Histogram histogram = link.getHistogram();
-        jgen.writeNumberField("text", histogram.getTotalCount());
-        jgen.writeNumberField("error", histogram.getErrorCount());
-        jgen.writeNumberField("slow", histogram.getSlowCount());
+        jgen.writeNumberField("totalCount", histogram.getTotalCount()); // for go.js
+        jgen.writeNumberField("errorCount", histogram.getErrorCount());
+        jgen.writeNumberField("slowCount", histogram.getSlowCount());
 
         jgen.writeObjectField("histogram", histogram);
 
@@ -56,7 +56,7 @@ public class LinkSerializer extends JsonSerializer<Link> {
 
 
         String state = link.getLinkState();
-        jgen.writeStringField("category", state);
+        jgen.writeStringField("state", state); // for go.js
 
         jgen.writeEndObject();
     }
diff --git a/src/main/java/com/nhn/pinpoint/web/view/NodeSerializer.java b/src/main/java/com/nhn/pinpoint/web/view/NodeSerializer.java
index eb7d2762f..cbe51a0a6 100644
--- a/src/main/java/com/nhn/pinpoint/web/view/NodeSerializer.java
+++ b/src/main/java/com/nhn/pinpoint/web/view/NodeSerializer.java
@@ -21,25 +21,28 @@ public class NodeSerializer extends JsonSerializer<Node>  {
     @Override
     public void serialize(Node node, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
         jgen.writeStartObject();
-        jgen.writeStringField("id", node.getNodeName());
-        jgen.writeStringField("key", node.getNodeName());
+//        jgen.writeStringField("id", node.getNodeName());
+        jgen.writeStringField("key", node.getNodeName()); // necessary for go.js
 
-        jgen.writeStringField("text", node.getApplicationTextName());
+        jgen.writeStringField("applicationName", node.getApplicationTextName()); // for go.js
 
-        jgen.writeStringField("category", node.getServiceType().toString());
+        jgen.writeStringField("category", node.getServiceType().toString());  // necessary for go.js
+        jgen.writeStringField("serviceType", node.getServiceType().toString());
 
         final ServiceType serviceType = node.getApplication().getServiceType();
-        if (serviceType.isUser()) {
-            jgen.writeStringField("fig", "Ellipse");
-        } else if(serviceType.isWas()) {
-            jgen.writeStringField("fig", "RoundedRectangle");
-        } else {
-            jgen.writeStringField("fig", "Rectangle");
-        }
+//        if (serviceType.isUser()) {
+//            jgen.writeStringField("fig", "Ellipse");
+//        } else if(serviceType.isWas()) {
+//            jgen.writeStringField("fig", "RoundedRectangle");
+//        } else {
+//            jgen.writeStringField("fig", "Rectangle");
+//        }
 
         jgen.writeStringField("serviceTypeCode", Short.toString(serviceType.getCode()));
-        jgen.writeStringField("terminal", Boolean.toString(serviceType.isTerminal()));
-        jgen.writeBooleanField("isWas", serviceType.isWas());
+//        jgen.writeStringField("terminal", Boolean.toString(serviceType.isTerminal()));
+        jgen.writeBooleanField("isWas", serviceType.isWas());  // for go.js
+        jgen.writeBooleanField("isFiltered", true);  // for go.js
+        jgen.writeBooleanField("hasAlert", true);  // for go.js
 
         writeHistogram(jgen, node);
         if (node.getServiceType().isUnknown()) {
@@ -65,6 +68,9 @@ public class NodeSerializer extends JsonSerializer<Node>  {
                 writeEmptyObject(jgen, "histogram");
             } else {
                 jgen.writeObjectField("histogram", applicationHistogram);
+                jgen.writeNumberField("totalCount", applicationHistogram.getTotalCount()); // for go.js
+                jgen.writeNumberField("errorCount", applicationHistogram.getErrorCount());
+                jgen.writeNumberField("slowCount", applicationHistogram.getSlowCount());
             }
 
             Map<String, Histogram> agentHistogramMap = nodeHistogram.getAgentHistogramMap();