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); + + } +}