[pinpoint-apm#12434] Cleanup

Author: emeroad

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapInLinkDao.java

@@ -28,7 +28,6 @@
 import com.navercorp.pinpoint.web.applicationmap.dao.MapInLinkDao;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.LinkTimeWindowReducer;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.RowMapperFactory;
-import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMapUtils;
 import com.navercorp.pinpoint.web.mapper.RowMapReduceResultExtractor;
@@ -104,7 +103,7 @@ private LinkDataMap selectInLink(Scan scan, HbaseTable table, ResultsExtractor<L
         TableName inLinkTableName = tableNameProvider.getTableName(table);
         LinkDataMap linkDataMap = hbaseTemplate.findParallel(inLinkTableName, scan, rowKeyDistributor, resultExtractor, parallel);
         if (logger.isDebugEnabled()) {
-            logger.debug("{} {} data: {}", LinkDirection.IN_LINK, inLinkTableName.getNameAsString(), linkDataMap);
+            logger.debug("IN_LINK {} data: {}", inLinkTableName.getNameAsString(), linkDataMap);
         }
         if (LinkDataMapUtils.hasLength(linkDataMap)) {
             return linkDataMap;

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapOutLinkDao.java

@@ -28,7 +28,6 @@
 import com.navercorp.pinpoint.web.applicationmap.dao.MapOutLinkDao;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.LinkTimeWindowReducer;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.RowMapperFactory;
-import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMapUtils;
 import com.navercorp.pinpoint.web.mapper.RowMapReduceResultExtractor;
@@ -102,7 +101,7 @@ private LinkDataMap selectOutLink(Scan scan, HbaseTable table, ResultsExtractor<
         TableName outLinkTableName = tableNameProvider.getTableName(table);
         LinkDataMap linkDataMap = this.hbaseTemplate.findParallel(outLinkTableName, scan, rowKeyDistributor, resultExtractor, parallel);
         if (logger.isDebugEnabled()) {
-            logger.debug("{} {} data: {}", LinkDirection.OUT_LINK, outLinkTableName.getNameAsString(), linkDataMap);
+            logger.debug("OUT_LINK {} data: {}", outLinkTableName.getNameAsString(), linkDataMap);
         }
         if (LinkDataMapUtils.hasLength(linkDataMap)) {
             return linkDataMap;

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/InLinkMapper.java

@@ -26,7 +26,6 @@
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.common.util.TimeUtils;
 import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService;
-import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap;
 import com.navercorp.pinpoint.web.component.ApplicationFactory;
 import com.navercorp.pinpoint.web.vo.Application;
@@ -109,14 +108,14 @@ public LinkDataMap mapRow(Result result, int rowNum) throws Exception {
             }
 
             if (logger.isDebugEnabled()) {
-                logger.debug("    Fetched {}. {} outHost:{} -> {} (slot:{}/{}),  ",
-                        LinkDirection.IN_LINK, in, outHost, inApplication, histogramSlot, requestCount);
+                logger.debug("    Fetched IN_LINK {} outHost:{} -> {} (slot:{}/{})",
+                        in, outHost, inApplication, histogramSlot, requestCount);
             }
 
             linkDataMap.addLinkData(in, in.getName(), inApplication, outHost, timestamp, histogramSlot, requestCount);
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("    Fetched {}. statistics:{}", LinkDirection.IN_LINK, linkDataMap);
+            if (logger.isTraceEnabled()) {
+                logger.trace("    Fetched IN_LINK inLink:{}", linkDataMap);
             }
         }
 

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/OutLinkMapper.java

@@ -23,7 +23,6 @@
 import com.navercorp.pinpoint.common.hbase.util.CellUtils;
 import com.navercorp.pinpoint.common.timeseries.window.TimeWindowFunction;
 import com.navercorp.pinpoint.common.util.TimeUtils;
-import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap;
 import com.navercorp.pinpoint.web.component.ApplicationFactory;
 import com.navercorp.pinpoint.web.vo.Application;
@@ -94,8 +93,8 @@ public LinkDataMap mapRow(Result result, int rowNum) throws Exception {
 
             long requestCount = CellUtils.valueToLong(cell);
             if (logger.isDebugEnabled()) {
-                logger.debug("    Fetched {}.(New) {} {} -> {} (slot:{}/{}) inHost:{}",
-                        LinkDirection.OUT_LINK, outApplication, outAgentId, inApplication, histogramSlot, requestCount, inHost);
+                logger.debug("    Fetched OUT_LINK {} {} -> {} (slot:{}/{}) inHost:{}",
+                        outApplication, outAgentId, inApplication, histogramSlot, requestCount, inHost);
             }
 
             if (StringUtils.isEmpty(inHost)) {