From 2ea2ac4e9baa5f63ba98105da2bb1169da8318ea Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Fri, 4 Apr 2014 05:19:41 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[WEB-102]=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC.?= 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@3601 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../java/com/nhn/pinpoint/web/controller/MainController.java | 4 ++-- .../com/nhn/pinpoint/web/service/FilteredMapServiceImpl.java | 1 + src/main/java/com/nhn/pinpoint/web/view/ServerTime.java | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nhn/pinpoint/web/controller/MainController.java b/src/main/java/com/nhn/pinpoint/web/controller/MainController.java index 80fd9bd3f..d12c14537 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/MainController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/MainController.java @@ -33,9 +33,9 @@ public class MainController { @ResponseBody public ApplicationGroup getApplicationGroup() { List applicationList = commonService.selectAllApplicationNames(); - logger.debug("/applications, {}", applicationList); + logger.debug("/applications {}", applicationList); - return new ApplicationGroup(applicationList); + return new ApplicationGroup(applicationList); } @RequestMapping(value = "/serverTime", method = RequestMethod.GET) diff --git a/src/main/java/com/nhn/pinpoint/web/service/FilteredMapServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/FilteredMapServiceImpl.java index 0de8724f6..30223b9f4 100755 --- a/src/main/java/com/nhn/pinpoint/web/service/FilteredMapServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/FilteredMapServiceImpl.java @@ -82,6 +82,7 @@ public class FilteredMapServiceImpl implements FilteredMapService { } @Override + @Deprecated public LoadFactor linkStatistics(Range range, List traceIdSet, Application sourceApplication, Application destinationApplication, Filter filter) { if (sourceApplication == null) { throw new NullPointerException("sourceApplication must not be null"); diff --git a/src/main/java/com/nhn/pinpoint/web/view/ServerTime.java b/src/main/java/com/nhn/pinpoint/web/view/ServerTime.java index e08185509..9890d87ac 100644 --- a/src/main/java/com/nhn/pinpoint/web/view/ServerTime.java +++ b/src/main/java/com/nhn/pinpoint/web/view/ServerTime.java @@ -1,5 +1,7 @@ package com.nhn.pinpoint.web.view; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author emeroad */ @@ -11,6 +13,7 @@ public class ServerTime { this.currentServerTime = System.currentTimeMillis(); } + @JsonProperty("currentServerTime") public long getCurrentServerTime() { return currentServerTime; }