From d06649ee7e3dafa4e3948edfcec84c6c2b367cb7 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Wed, 6 Nov 2013 02:27:40 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20limitUtil=EC=9D=98=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD.=20web=EC=9C=BC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=EC=8B=9C=ED=82=B4.?= 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@2795 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../BusinessTransactionController.java | 2 +- .../FilteredApplicationMapController.java | 2 +- .../controller/ScatterChartController.java | 2 +- .../com/nhn/pinpoint/web/util/LimitUtils.java | 18 +++++++++++++ .../nhn/pinpoint/web/util/LimitUtilsTest.java | 25 +++++++++++++++++++ 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/nhn/pinpoint/web/util/LimitUtils.java create mode 100644 src/test/java/com/nhn/pinpoint/web/util/LimitUtilsTest.java diff --git a/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java b/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java index 658933669..298ab4cfa 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java @@ -6,7 +6,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.nhn.pinpoint.common.util.LimitUtils; +import com.nhn.pinpoint.web.util.LimitUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/nhn/pinpoint/web/controller/FilteredApplicationMapController.java b/src/main/java/com/nhn/pinpoint/web/controller/FilteredApplicationMapController.java index f4169d3c6..8234856e7 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/FilteredApplicationMapController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/FilteredApplicationMapController.java @@ -4,7 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.nhn.pinpoint.common.util.LimitUtils; +import com.nhn.pinpoint.web.util.LimitUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java index b5bd9d034..68e4ec30e 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.nhn.pinpoint.common.util.DateUtils; -import com.nhn.pinpoint.common.util.LimitUtils; +import com.nhn.pinpoint.web.util.LimitUtils; import com.nhn.pinpoint.web.filter.Filter; import com.nhn.pinpoint.web.filter.FilterBuilder; import com.nhn.pinpoint.web.vo.scatter.Dot; diff --git a/src/main/java/com/nhn/pinpoint/web/util/LimitUtils.java b/src/main/java/com/nhn/pinpoint/web/util/LimitUtils.java new file mode 100644 index 000000000..903caad7e --- /dev/null +++ b/src/main/java/com/nhn/pinpoint/web/util/LimitUtils.java @@ -0,0 +1,18 @@ +package com.nhn.pinpoint.web.util; + +/** + * @author emeroad + */ +public final class LimitUtils { + public static final int MAX = 10000; + + public static int checkRange(final int limit) { + if (limit < 0) { + return 0; + } + if (limit > MAX) { + return MAX; + } + return limit; + } +} diff --git a/src/test/java/com/nhn/pinpoint/web/util/LimitUtilsTest.java b/src/test/java/com/nhn/pinpoint/web/util/LimitUtilsTest.java new file mode 100644 index 000000000..225ac7983 --- /dev/null +++ b/src/test/java/com/nhn/pinpoint/web/util/LimitUtilsTest.java @@ -0,0 +1,25 @@ +package com.nhn.pinpoint.web.util; + +import junit.framework.Assert; +import org.junit.Test; + +/** + * @author emeroad + */ +public class LimitUtilsTest { + @Test + public void testCheckLimit() throws Exception { + int equals = LimitUtils.checkRange(LimitUtils.MAX); + Assert.assertEquals(equals, LimitUtils.MAX); + + int over = LimitUtils.checkRange(LimitUtils.MAX + 1); + Assert.assertEquals(over, LimitUtils.MAX); + + int low = LimitUtils.checkRange(0); + Assert.assertEquals(low, 0); + + int negative = LimitUtils.checkRange(-1); + Assert.assertEquals(negative, 0); + + } +}