diff --git a/api/pom.xml b/api/pom.xml index 6bec845826b..28f6ff2b5ff 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,7 +16,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index dcf7bcc870c..9c9f368c006 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -16,7 +16,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 27684516cd8..2a89ef3d55c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/config/pom.xml b/config/pom.xml index 7085dcb9178..d2b5033c5b6 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -17,7 +17,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java index f1f6651b2a1..2f719737046 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java @@ -32,7 +32,7 @@ import com.alibaba.nacos.config.server.constant.Constants; import com.alibaba.nacos.config.server.model.SampleResult; -import com.alibaba.nacos.config.server.service.LongPullingService; +import com.alibaba.nacos.config.server.service.LongPollingService; import com.alibaba.nacos.config.server.service.dump.DumpService; import com.alibaba.nacos.config.server.service.notify.NotifyService; @@ -51,7 +51,7 @@ public class CommunicationController { private DumpService dumpService; @Autowired - protected LongPullingService longPullingService; + protected LongPollingService longPollingService; private String trueStr = "true"; @@ -92,7 +92,7 @@ public SampleResult getSubClientConfig(HttpServletRequest request, ModelMap modelMap) throws IOException, ServletException, Exception { group = StringUtils.isBlank(group) ? Constants.DEFAULT_GROUP : group; - SampleResult sampleResult = longPullingService.getCollectSubscribleInfo(dataId, group, tenant); + SampleResult sampleResult = longPollingService.getCollectSubscribleInfo(dataId, group, tenant); return sampleResult; } @@ -106,7 +106,7 @@ public SampleResult getSubClientConfigByIp(HttpServletRequest request, @RequestParam("ip") String ip, ModelMap modelMap) throws IOException, ServletException, Exception { - SampleResult sampleResult = longPullingService.getCollectSubscribleInfoByIp(ip); + SampleResult sampleResult = longPollingService.getCollectSubscribleInfoByIp(ip); return sampleResult; } } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java index 35a3e90e60b..cc7cae47796 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java @@ -40,7 +40,7 @@ import com.alibaba.nacos.config.server.model.ConfigInfoBase; import com.alibaba.nacos.config.server.service.ConfigService; import com.alibaba.nacos.config.server.service.DiskUtil; -import com.alibaba.nacos.config.server.service.LongPullingService; +import com.alibaba.nacos.config.server.service.LongPollingService; import com.alibaba.nacos.config.server.service.PersistService; import com.alibaba.nacos.config.server.service.trace.ConfigTraceService; import com.alibaba.nacos.config.server.utils.GroupKey2; @@ -60,7 +60,7 @@ public class ConfigServletInner { @Autowired - private LongPullingService longPullingService; + private LongPollingService longPollingService; @Autowired private PersistService persistService; @@ -74,8 +74,8 @@ public class ConfigServletInner { public String doPollingConfig(HttpServletRequest request, HttpServletResponse response, Map clientMd5Map, int probeRequestSize) throws IOException, ServletException { // 长轮询 - if (LongPullingService.isSupportLongPulling(request)) { - longPullingService.addLongPullingClient(request, response, clientMd5Map, probeRequestSize); + if (LongPollingService.isSupportLongPulling(request)) { + longPollingService.addLongPullingClient(request, response, clientMd5Map, probeRequestSize); return HttpServletResponse.SC_OK + ""; } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/LongPullingService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java similarity index 98% rename from config/src/main/java/com/alibaba/nacos/config/server/service/LongPullingService.java rename to config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java index 1609dce8e12..b848132fd6b 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/LongPullingService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java @@ -18,7 +18,6 @@ import static com.alibaba.nacos.config.server.utils.LogUtil.memoryLog; import static com.alibaba.nacos.config.server.utils.LogUtil.pullLog; -import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -57,7 +56,7 @@ * @author Nacos */ @Service -public class LongPullingService extends AbstractEventListener { +public class LongPollingService extends AbstractEventListener { private static final int FIXED_POLLING_INTERVAL_MS = 10000; @@ -222,8 +221,8 @@ private ClientLongPulling getClientPollingRecord(String clientIp) { public void addLongPullingClient(HttpServletRequest req, HttpServletResponse rsp, Map clientMd5Map, int probeRequestSize) { - String str = req.getHeader(LongPullingService.LONG_PULLING_HEADER); - String noHangUpFlag = req.getHeader(LongPullingService.LONG_PULLING_NO_HANG_UP_HEADER); + String str = req.getHeader(LongPollingService.LONG_PULLING_HEADER); + String noHangUpFlag = req.getHeader(LongPollingService.LONG_PULLING_NO_HANG_UP_HEADER); String appName = req.getHeader(RequestUtil.CLIENT_APPNAME_HEADER); String tag = req.getHeader("Vipserver-Tag"); int delayTime=SwitchService.getSwitchInteger(SwitchService.FIXED_DELAY_TIME, 500); @@ -285,7 +284,7 @@ static public boolean isSupportLongPulling(HttpServletRequest req) { } @SuppressWarnings("PMD.ThreadPoolCreationRule") - public LongPullingService() { + public LongPollingService() { allSubs = new ConcurrentLinkedQueue(); scheduler = Executors.newScheduledThreadPool(1, new ThreadFactory() { diff --git a/console/pom.xml b/console/pom.xml index 3b96e6e77eb..dceefbcf4f0 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT nacos-console diff --git a/core/pom.xml b/core/pom.xml index 07948176547..25ae61ec97d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index b780cae4952..7d42c622d80 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/example/pom.xml b/example/pom.xml index fe588b550f6..84e6b29712d 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/naming/pom.xml b/naming/pom.xml index 88642e0ba73..fb763c2d683 100644 --- a/naming/pom.xml +++ b/naming/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 87cc8c1f37f..2d109efa3fd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 2018 com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT pom Alibaba NACOS ${project.version} @@ -36,7 +36,7 @@ git@github.com:alibaba/nacos.git scm:git@github.com:alibaba/nacos.git scm:git@github.com:alibaba/nacos.git - nacos-all-0.2.1-RC1 + nacos-all-0.2.2-SNAPSHOT diff --git a/test/pom.xml b/test/pom.xml index cd1a7f6b53e..9e255cfce11 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -17,7 +17,7 @@ com.alibaba.nacos nacos-all - 0.2.1 + 0.2.2-SNAPSHOT 4.0.0