diff --git a/src/main/java/com/alibaba/druid/support/DruidStatJSONService.java b/src/main/java/com/alibaba/druid/stat/DruidStatJSONService.java similarity index 98% rename from src/main/java/com/alibaba/druid/support/DruidStatJSONService.java rename to src/main/java/com/alibaba/druid/stat/DruidStatJSONService.java index cdf66d8d9f..969d2fe143 100644 --- a/src/main/java/com/alibaba/druid/support/DruidStatJSONService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatJSONService.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.support; +package com.alibaba.druid.stat; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -11,7 +11,6 @@ import java.util.Map; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.DruidStatManagerFacade; import com.alibaba.druid.support.http.stat.WebAppStatManager; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.support.spring.stat.SpringStatManager; @@ -23,7 +22,7 @@ import com.alibaba.druid.util.StringUtils; * * @author sandzhang */ -public class DruidStatJSONService { +public class DruidStatJSONService implements DruidStatJSONServiceMBean { private final static DruidStatJSONService instance = new DruidStatJSONService(); @@ -229,7 +228,7 @@ public class DruidStatJSONService { if (maxTimespanOccurTime != null) { map.put("MaxTimespanOccurTime", format.format(maxTimespanOccurTime)); } - + return returnJSONResult(map == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, map); } diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatJSONServiceMBean.java b/src/main/java/com/alibaba/druid/stat/DruidStatJSONServiceMBean.java new file mode 100644 index 0000000000..c8882ea0b3 --- /dev/null +++ b/src/main/java/com/alibaba/druid/stat/DruidStatJSONServiceMBean.java @@ -0,0 +1,6 @@ +package com.alibaba.druid.stat; + + +public interface DruidStatJSONServiceMBean { + 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 33a1e36ac3..b60d2f2001 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.DruidStatJSONService; +import com.alibaba.druid.stat.DruidStatJSONService; import com.alibaba.druid.support.http.util.IPAddress; import com.alibaba.druid.support.http.util.IPRange; import com.alibaba.druid.support.logging.Log; 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 98d4fcd356..f03020b144 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,7 +5,7 @@ import junit.framework.TestCase; import org.springframework.mock.web.MockServletConfig; -import com.alibaba.druid.support.DruidStatJSONService; +import com.alibaba.druid.stat.DruidStatJSONService; import com.alibaba.druid.support.http.StatViewServlet; public class StatViewServletTest_resetEnable extends TestCase {