diff --git a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java b/src/main/java/com/alibaba/druid/support/DruidStatJSONService.java similarity index 97% rename from src/main/java/com/alibaba/druid/support/JSONDruidStatService.java rename to src/main/java/com/alibaba/druid/support/DruidStatJSONService.java index fcc5b27db4..6caac11423 100644 --- a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java +++ b/src/main/java/com/alibaba/druid/support/DruidStatJSONService.java @@ -23,9 +23,9 @@ import com.alibaba.fastjson.JSON; * * @author sandzhang */ -public class JSONDruidStatService { +public class DruidStatJSONService { - private final static JSONDruidStatService instance = new JSONDruidStatService(); + private final static DruidStatJSONService instance = new DruidStatJSONService(); private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); @@ -37,10 +37,10 @@ public class JSONDruidStatService { private static final String DEFAULT_ORDER_TYPE = "asc"; private static final String DEFAULT_ORDERBY = "SQL"; - private JSONDruidStatService(){ + private DruidStatJSONService(){ } - public static JSONDruidStatService getInstance() { + public static DruidStatJSONService getInstance() { return instance; } 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 0bca8bf97b..33a1e36ac3 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.support.JSONDruidStatService; +import com.alibaba.druid.support.DruidStatJSONService; 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 JSONDruidStatService statService = JSONDruidStatService.getInstance(); + private DruidStatJSONService statService = DruidStatJSONService.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 adb694bf7a..98d4fcd356 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.support.JSONDruidStatService; +import com.alibaba.druid.support.DruidStatJSONService; import com.alibaba.druid.support.http.StatViewServlet; public class StatViewServletTest_resetEnable extends TestCase { protected void setUp() throws Exception { - JSONDruidStatService.getInstance().setResetEnable(true); + DruidStatJSONService.getInstance().setResetEnable(true); } protected void tearDown() throws Exception { - JSONDruidStatService.getInstance().setResetEnable(true); + DruidStatJSONService.getInstance().setResetEnable(true); } public void test_resetEnable_none() throws Exception { - Assert.assertTrue(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); MockServletConfig servletConfig = new MockServletConfig(); StatViewServlet servlet = new StatViewServlet(); servlet.init(servletConfig); - Assert.assertTrue(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); } public void test_resetEnable_true() throws Exception { - Assert.assertTrue(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.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(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); } public void test_resetEnable_empty() throws Exception { - Assert.assertTrue(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.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(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.getInstance().isResetEnable()); } public void test_resetEnable_false() throws Exception { - Assert.assertTrue(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.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(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertFalse(DruidStatJSONService.getInstance().isResetEnable()); } public void test_resetEnable_error() throws Exception { - Assert.assertTrue(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertTrue(DruidStatJSONService.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(JSONDruidStatService.getInstance().isResetEnable()); + Assert.assertFalse(DruidStatJSONService.getInstance().isResetEnable()); } }