From 77a162d671be3a64b95226dabfdf5ee7ee3f60e8 Mon Sep 17 00:00:00 2001 From: hxy1991 Date: Sun, 30 Sep 2018 11:08:49 +0800 Subject: [PATCH] Fix #92 --- .../server/controller/ConfigController.java | 66 ++++++++----------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java index 922ea7db472..a111b314f6b 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; @@ -29,7 +28,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -65,26 +63,27 @@ */ @Controller @RequestMapping(Constants.CONFIG_CONTROLLER_PATH) -public class ConfigController extends HttpServlet { - /** - * uid - */ - private static final long serialVersionUID = 4339468526746635388L; +public class ConfigController { private static final Logger log = LoggerFactory.getLogger(ConfigController.class); - @Autowired - private transient ConfigServletInner inner; + private final transient ConfigServletInner inner; - @Autowired - private transient PersistService persistService; + private final transient PersistService persistService; - @Autowired - private transient MergeDatumService mergeService; + private final transient MergeDatumService mergeService; + + private final transient ConfigSubService configSubService; @Autowired - private transient ConfigSubService configSubService; - + public ConfigController(ConfigServletInner configServletInner, PersistService persistService, MergeDatumService mergeService, + ConfigSubService configSubService) { + this.inner = configServletInner; + this.persistService = persistService; + this.mergeService = mergeService; + this.configSubService = configSubService; + } + /** * 增加或更新非聚合数据。 * @@ -133,7 +132,7 @@ public Boolean publishConfig(HttpServletRequest request, HttpServletResponse res if (AggrWhitelist.isAggrDataId(dataId)) { log.warn("[aggr-conflict] {} attemp to publish single data, {}, {}", - new Object[] { RequestUtil.getRemoteIp(request), dataId, group }); + RequestUtil.getRemoteIp(request), dataId, group); throw new NacosException(NacosException.NO_RIGHT, "dataId:" + dataId + " is aggr"); } @@ -181,9 +180,7 @@ public void getConfig(HttpServletRequest request, HttpServletResponse response, /** * 取数据 - * - * @throws ServletException - * @throws IOException + * * @throws NacosException */ @RequestMapping(params = "show=all", method = RequestMethod.GET) @@ -191,7 +188,7 @@ public void getConfig(HttpServletRequest request, HttpServletResponse response, public ConfigAllInfo detailConfigInfo(HttpServletRequest request, HttpServletResponse response, @RequestParam("dataId") String dataId, @RequestParam("group") String group, @RequestParam(value = "tenant", required = false, defaultValue = StringUtils.EMPTY) String tenant) - throws IOException, ServletException, NacosException { + throws NacosException { // check params ParamUtils.checkParam(dataId, group, "datumId", "content"); return persistService.findConfigAllInfo(dataId, group, tenant); @@ -224,8 +221,7 @@ public Boolean deleteConfig(HttpServletRequest request, HttpServletResponse resp @ResponseBody public RestResult getConfigAdvanceInfo(HttpServletRequest request, HttpServletResponse response, @RequestParam("dataId") String dataId, @RequestParam("group") String group, - @RequestParam(value = "tenant", required = false, defaultValue = StringUtils.EMPTY) String tenant, - ModelMap modelMap) { + @RequestParam(value = "tenant", required = false, defaultValue = StringUtils.EMPTY) String tenant) { RestResult rr = new RestResult(); ConfigAdvanceInfo configInfo = persistService.findConfigAdvanceInfo(dataId, group, tenant); rr.setCode(200); @@ -237,8 +233,7 @@ public RestResult getConfigAdvanceInfo(HttpServletRequest req * 比较MD5 */ @RequestMapping(value = "/listener", method = RequestMethod.POST) - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) + public void listener(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { request.setAttribute("org.apache.catalina.ASYNC_SUPPORTED", true); String probeModify = request.getParameter("Listening-Configs"); @@ -248,7 +243,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) probeModify = URLDecoder.decode(probeModify, Constants.ENCODE); - Map clientMd5Map = null; + Map clientMd5Map; try { clientMd5Map = MD5Util.getClientMd5Map(probeModify); } catch (Throwable e) { @@ -267,8 +262,8 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) public GroupkeyListenserStatus getListeners(HttpServletRequest request, HttpServletResponse response, @RequestParam("dataId") String dataId, @RequestParam("group") String group, @RequestParam(value = "tenant", required = false) String tenant, - @RequestParam(value = "sampleTime", required = false, defaultValue = "1") int sampleTime, ModelMap modelMap) - throws IOException, ServletException, Exception { + @RequestParam(value = "sampleTime", required = false, defaultValue = "1") int sampleTime) + throws Exception { group = StringUtils.isBlank(group) ? Constants.DEFAULT_GROUP : group; SampleResult collectSampleResult = configSubService.getCollectSampleResult(dataId, group, tenant, sampleTime); GroupkeyListenserStatus gls = new GroupkeyListenserStatus(); @@ -292,7 +287,7 @@ public Page searchConfig(HttpServletRequest request, @RequestParam(value = "tenant", required = false, defaultValue=StringUtils.EMPTY) String tenant, @RequestParam(value = "config_tags", required = false) String configTags, @RequestParam("pageNo") int pageNo, - @RequestParam("pageSize") int pageSize, ModelMap modelMap) { + @RequestParam("pageSize") int pageSize) { Map configAdvanceInfo = new HashMap(100); if (StringUtils.isNotBlank(appName)) { configAdvanceInfo.put("appName", appName); @@ -301,9 +296,8 @@ public Page searchConfig(HttpServletRequest request, configAdvanceInfo.put("config_tags", configTags); } try { - Page page = persistService.findConfigInfo4Page(pageNo, pageSize, dataId, group, tenant, + return persistService.findConfigInfo4Page(pageNo, pageSize, dataId, group, tenant, configAdvanceInfo); - return page; } catch (Exception e) { String errorMsg = "serialize page error, dataId=" + dataId + ", group=" + group; log.error(errorMsg, e); @@ -317,14 +311,13 @@ public Page searchConfig(HttpServletRequest request, @RequestMapping(params = "search=blur", method = RequestMethod.GET) @ResponseBody public Page fuzzySearchConfig(HttpServletRequest request, HttpServletResponse response, - @RequestParam("dataId") String dataId, // - @RequestParam("group") String group, // + @RequestParam("dataId") String dataId, + @RequestParam("group") String group, @RequestParam(value = "appName", required = false) String appName, @RequestParam(value = "tenant", required = false, defaultValue = StringUtils.EMPTY) String tenant, @RequestParam(value = "config_tags", required = false) String configTags, - @RequestParam("pageNo") int pageNo, // - @RequestParam("pageSize") int pageSize, // - ModelMap modelMap) { + @RequestParam("pageNo") int pageNo, + @RequestParam("pageSize") int pageSize) { Map configAdvanceInfo = new HashMap(50); if (StringUtils.isNotBlank(appName)) { configAdvanceInfo.put("appName", appName); @@ -333,9 +326,8 @@ public Page fuzzySearchConfig(HttpServletRequest request, HttpServle configAdvanceInfo.put("config_tags", configTags); } try { - Page page = persistService.findConfigInfoLike4Page(pageNo, pageSize, dataId, group, tenant, + return persistService.findConfigInfoLike4Page(pageNo, pageSize, dataId, group, tenant, configAdvanceInfo); - return page; } catch (Exception e) { String errorMsg = "serialize page error, dataId=" + dataId + ", group=" + group; log.error(errorMsg, e);