[pinpoint-apm#12419] Remove unused json field in ServerMap

Author: emeroad

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/view/LinkView.java

@@ -60,14 +60,6 @@ public void serialize(LinkView linkView, JsonGenerator jgen, SerializerProvider
             jgen.writeObjectField("from", link.getFrom().getNodeName());  // necessary for go.js
             jgen.writeObjectField("to", link.getTo().getNodeName()); // necessary for go.js
 
-            // for FilterWizard. from, to agent mapping data
-            writeAgentId("fromAgent", link.getFrom(), jgen);
-            writeAgentId("toAgent", link.getTo(), jgen);
-
-            //for FilterWizard. show agent name as tooltip on instance
-//            writeAgentIdNameMap("fromAgentIdNameMap", link.getFrom(), jgen);
-//            writeAgentIdNameMap("toAgentIdNameMap", link.getTo(), jgen);
-
             // for FilterWizard, to agent mapping data
             writeAgents("fromAgents", link.getFrom(), jgen);
             writeAgents("toAgents", link.getFrom(), jgen);
@@ -116,13 +108,6 @@ public void serialize(LinkView linkView, JsonGenerator jgen, SerializerProvider
 
         private void writerFilterHint(Link link, JsonGenerator jgen) throws IOException {
             Application filterApplication = link.getFilterApplication();
-            jgen.writeStringField("filterApplicationName", filterApplication.getName());
-            jgen.writeNumberField("filterApplicationServiceTypeCode", filterApplication.getServiceTypeCode());
-            jgen.writeStringField("filterApplicationServiceTypeName", filterApplication.getServiceType().getName());
-            if (link.isWasToWasLink()) {
-                writeWasToWasTargetRpcList("filterTargetRpcList", link, jgen);
-            }
-
             jgen.writeFieldName("filter");
             jgen.writeStartObject();
             jgen.writeStringField("applicationName", filterApplication.getName());
@@ -148,21 +133,6 @@ private void writeAgentId(String fieldName, Node node, JsonGenerator jgen) throw
             }
         }
 
-        @Deprecated
-        private void writeAgentIdNameMap(String fieldName, Node node, JsonGenerator jgen) throws IOException {
-            if (node.getServiceType().isWas()) {
-                jgen.writeFieldName(fieldName);
-                jgen.writeStartObject();
-                ServerGroupList serverGroupList = node.getServerGroupList();
-                if (serverGroupList != null) {
-                    for (Map.Entry<String, String> entry : serverGroupList.getAgentIdNameMap().entrySet()) {
-                        jgen.writeStringField(entry.getKey(), entry.getValue());
-                    }
-                }
-                jgen.writeEndObject();
-            }
-        }
-
         private void writeAgents(String fieldName, Node node, JsonGenerator jgen) throws IOException {
             if (node.getServiceType().isWas()) {
                 jgen.writeFieldName(fieldName);

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/view/NodeView.java

@@ -59,14 +59,12 @@ static class NodeViewSerializer extends JsonSerializer<NodeView> {
 
         public static final String AGENT_TIME_SERIES_HISTOGRAM = "agentTimeSeriesHistogram";
 
-        public static final String AGENTID_NAME_MAP_KEY = "agentIdNameMap";
-
         @Override
         public void serialize(NodeView nodeView, JsonGenerator jgen, SerializerProvider provider) throws IOException {
             Node node = nodeView.getNode();
 
             jgen.writeStartObject();
-//        jgen.writeStringField("id", node.getNodeName());serverInstanceList
+//        jgen.writeStringField("id", node.getNodeName()); serverInstanceList
             jgen.writeObjectField("key", node.getNodeName()); // necessary for go.js
 
             jgen.writeStringField("applicationName", node.getApplicationTextName()); // for go.js
@@ -75,13 +73,6 @@ public void serialize(NodeView nodeView, JsonGenerator jgen, SerializerProvider
             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");
-//        }
 
             jgen.writeNumberField("serviceTypeCode", serviceType.getCode());
 //        jgen.writeStringField("terminal", Boolean.toString(serviceType.isTerminal()));
@@ -107,8 +98,6 @@ private void writeServerGroupList(NodeView nodeView, JsonGenerator jgen) throws
             if (serverGroupList == null) {
                 jgen.writeNumberField("instanceCount", 0);
                 jgen.writeNumberField("instanceErrorCount", 0);
-                JacksonWriterUtils.writeEmptyArray(jgen, "agentIds");
-//                JacksonWriterUtils.writeEmptyObject(jgen, AGENTID_NAME_MAP_KEY);
                 JacksonWriterUtils.writeEmptyArray(jgen, "agents");
 
                 if (activeView.isDetailed()) {
@@ -118,8 +107,6 @@ private void writeServerGroupList(NodeView nodeView, JsonGenerator jgen) throws
                 jgen.writeNumberField("instanceCount", serverGroupList.getInstanceCount());
                 long instanceErrorCount = getInstanceErrorCount(node);
                 jgen.writeNumberField("instanceErrorCount", instanceErrorCount);
-                writeAgentIds("agentIds", serverGroupList, jgen);
-//                writeAgentIdMap(AGENTID_NAME_MAP_KEY, serverGroupList, jgen);
                 writeAgentList("agents", serverGroupList, jgen);
 
                 if (activeView.isDetailed()) {
@@ -128,23 +115,6 @@ private void writeServerGroupList(NodeView nodeView, JsonGenerator jgen) throws
             }
         }
 
-        private void writeAgentIds(String fieldName, ServerGroupList serverGroupList, JsonGenerator jgen) throws IOException {
-            jgen.writeArrayFieldStart(fieldName);
-            for (String agentId : serverGroupList.getAgentIdList()) {
-                jgen.writeString(agentId);
-            }
-            jgen.writeEndArray();
-        }
-
-        @Deprecated
-        private void writeAgentIdMap(String fieldName, ServerGroupList serverGroupList, JsonGenerator jgen) throws IOException {
-            jgen.writeObjectFieldStart(fieldName);
-            for (Map.Entry<String, String> entry : serverGroupList.getAgentIdNameMap().entrySet()) {
-                jgen.writeStringField(entry.getKey(), entry.getValue());
-            }
-            jgen.writeEndObject();
-        }
-
         private void writeAgentList(String fieldName, ServerGroupList serverGroupList, JsonGenerator jgen) throws IOException {
             jgen.writeFieldName(fieldName);
             jgen.writeStartArray();