diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatJSONService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java similarity index 96% rename from src/main/java/com/alibaba/druid/stat/DruidStatJSONService.java rename to src/main/java/com/alibaba/druid/stat/DruidStatService.java index 969d2fe143..2b16513b18 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatJSONService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -22,9 +22,9 @@ import com.alibaba.druid.util.StringUtils; * * @author sandzhang */ -public class DruidStatJSONService implements DruidStatJSONServiceMBean { +public class DruidStatService implements DruidStatServiceMBean { - private final static DruidStatJSONService instance = new DruidStatJSONService(); + private final static DruidStatService instance = new DruidStatService(); private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); @@ -36,10 +36,10 @@ public class DruidStatJSONService implements DruidStatJSONServiceMBean { private static final String DEFAULT_ORDER_TYPE = "asc"; private static final String DEFAULT_ORDERBY = "SQL"; - private DruidStatJSONService(){ + private DruidStatService(){ } - public static DruidStatJSONService getInstance() { + public static DruidStatService getInstance() { return instance; } @@ -93,7 +93,7 @@ public class DruidStatJSONService implements DruidStatJSONServiceMBean { if (url.startsWith("/sql-") && url.indexOf(".json") > 0) { Integer id = StringUtils.subStringToInteger(url, "sql-", ".json"); - return returnJSONSqlInfo(id); + return getSqlStat(id); } if (url.startsWith("/weburi.json")) { @@ -199,7 +199,7 @@ public class DruidStatJSONService implements DruidStatJSONServiceMBean { return comparatorOrderBy(array, parameters); } - private String returnJSONSqlInfo(Integer id) { + private String getSqlStat(Integer id) { Map map = statManagerFacade.getSqlStatData(id); if (map == null) { diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatJSONServiceMBean.java b/src/main/java/com/alibaba/druid/stat/DruidStatServiceMBean.java similarity index 60% rename from src/main/java/com/alibaba/druid/stat/DruidStatJSONServiceMBean.java rename to src/main/java/com/alibaba/druid/stat/DruidStatServiceMBean.java index c8882ea0b3..06a804ac80 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatJSONServiceMBean.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatServiceMBean.java @@ -1,6 +1,6 @@ package com.alibaba.druid.stat; -public interface DruidStatJSONServiceMBean { +public interface DruidStatServiceMBean { String service(String url); } diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index b60d2f2001..164982c310 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.druid.stat.DruidStatJSONService; +import com.alibaba.druid.stat.DruidStatService; import com.alibaba.druid.support.http.util.IPAddress; import com.alibaba.druid.support.http.util.IPRange; import com.alibaba.druid.support.logging.Log; @@ -34,7 +34,7 @@ public class StatViewServlet extends HttpServlet { private final static String RESOURCE_PATH = "support/http/resources"; private final static String TEMPLATE_PAGE_RESOURCE_PATH = RESOURCE_PATH + "/template.html"; - private DruidStatJSONService statService = DruidStatJSONService.getInstance(); + private DruidStatService statService = DruidStatService.getInstance(); public String templatePage; diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java index f03020b144..33612aaefb 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java @@ -5,32 +5,32 @@ import junit.framework.TestCase; import org.springframework.mock.web.MockServletConfig; -import com.alibaba.druid.stat.DruidStatJSONService; +import com.alibaba.druid.stat.DruidStatService; import com.alibaba.druid.support.http.StatViewServlet; public class StatViewServletTest_resetEnable extends TestCase { protected void setUp() throws Exception { - DruidStatJSONService.getInstance().setResetEnable(true); + DruidStatService.getInstance().setResetEnable(true); } protected void tearDown() throws Exception { - DruidStatJSONService.getInstance().setResetEnable(true); + DruidStatService.getInstance().setResetEnable(true); } public void test_resetEnable_none() throws Exception { - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); MockServletConfig servletConfig = new MockServletConfig(); StatViewServlet servlet = new StatViewServlet(); servlet.init(servletConfig); - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); } public void test_resetEnable_true() throws Exception { - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); MockServletConfig servletConfig = new MockServletConfig(); servletConfig.addInitParameter(StatViewServlet.PARAM_NAME_RESET_ENABLE, "true"); @@ -38,11 +38,11 @@ public class StatViewServletTest_resetEnable extends TestCase { StatViewServlet servlet = new StatViewServlet(); servlet.init(servletConfig); - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); } public void test_resetEnable_empty() throws Exception { - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); MockServletConfig servletConfig = new MockServletConfig(); servletConfig.addInitParameter(StatViewServlet.PARAM_NAME_RESET_ENABLE, ""); @@ -50,11 +50,11 @@ public class StatViewServletTest_resetEnable extends TestCase { StatViewServlet servlet = new StatViewServlet(); servlet.init(servletConfig); - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); } public void test_resetEnable_false() throws Exception { - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); MockServletConfig servletConfig = new MockServletConfig(); servletConfig.addInitParameter(StatViewServlet.PARAM_NAME_RESET_ENABLE, "false"); @@ -62,11 +62,11 @@ public class StatViewServletTest_resetEnable extends TestCase { StatViewServlet servlet = new StatViewServlet(); servlet.init(servletConfig); - Assert.assertFalse(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertFalse(DruidStatService.getInstance().isResetEnable()); } public void test_resetEnable_error() throws Exception { - Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatService.getInstance().isResetEnable()); MockServletConfig servletConfig = new MockServletConfig(); servletConfig.addInitParameter(StatViewServlet.PARAM_NAME_RESET_ENABLE, "xxx"); @@ -74,6 +74,6 @@ public class StatViewServletTest_resetEnable extends TestCase { StatViewServlet servlet = new StatViewServlet(); servlet.init(servletConfig); - Assert.assertFalse(DruidStatJSONService.getInstance().isResetEnable()); + Assert.assertFalse(DruidStatService.getInstance().isResetEnable()); } }