From 7093179cc8912666ce3a4e3dbfa1a55f18563038 Mon Sep 17 00:00:00 2001
From: agapple <jianghang115@gmail.com>
Date: Tue, 27 Aug 2019 16:25:42 +0800
Subject: [PATCH] fixed issue #2099 , rename poll to polling

---
 ...ConfigController.java => PollingConfigController.java} | 8 ++++----
 .../instance/manager/plain/PlainCanalConfigClient.java    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/{PollConfigController.java => PollingConfigController.java} (96%)

diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollConfigController.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
similarity index 96%
rename from canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollConfigController.java
rename to canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
index 0ac74ef1..0c83cbc7 100644
--- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollConfigController.java
+++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
@@ -30,7 +30,7 @@ import com.google.common.base.Joiner;
  */
 @RestController
 @RequestMapping("/api/{env}/config")
-public class PollConfigController {
+public class PollingConfigController {
 
     private static final byte[] seeds = "canal is best!".getBytes();
 
@@ -49,7 +49,7 @@ public class PollConfigController {
     /**
      * 获取server全局配置
      */
-    @GetMapping(value = "/server_poll")
+    @GetMapping(value = "/server_polling")
     public BaseModel<CanalConfig> canalConfigPoll(@RequestHeader String user, @RequestHeader String passwd,
                                                   @PathVariable String env, @RequestParam String md5) {
         if (!auth(user, passwd)) {
@@ -76,7 +76,7 @@ public class PollConfigController {
     /**
      * 获取单个instance的配置
      */
-    @GetMapping(value = "/instance_poll/{destination}")
+    @GetMapping(value = "/instance_polling/{destination}")
     public BaseModel<CanalInstanceConfig> instanceConfigPoll(@RequestHeader String user, @RequestHeader String passwd,
                                                              @PathVariable String env,
                                                              @PathVariable String destination, @RequestParam String md5) {
@@ -103,7 +103,7 @@ public class PollConfigController {
     /**
      * 获取对应server(ip+port)所需要运行的instance列表
      */
-    @GetMapping(value = "/instances_poll")
+    @GetMapping(value = "/instances_polling")
     public BaseModel<CanalInstanceConfig> instancesPoll(@RequestHeader String user, @RequestHeader String passwd,
                                                         @PathVariable String env, @RequestParam String ip,
                                                         @RequestParam String port, @RequestParam String md5) {
diff --git a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/plain/PlainCanalConfigClient.java b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/plain/PlainCanalConfigClient.java
index bdf2264b..9a19750a 100644
--- a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/plain/PlainCanalConfigClient.java
+++ b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/plain/PlainCanalConfigClient.java
@@ -53,7 +53,7 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
         if (StringUtils.isEmpty(md5)) {
             md5 = "";
         }
-        String url = configURL + "/api/v1/config/server_poll?md5=" + md5;
+        String url = configURL + "/api/v1/config/server_polling?md5=" + md5;
         return queryConfig(url);
     }
 
@@ -64,7 +64,7 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
         if (StringUtils.isEmpty(md5)) {
             md5 = "";
         }
-        String url = configURL + "/api/v1/config/instance_poll/" + destination + "?md5=" + md5;
+        String url = configURL + "/api/v1/config/instance_polling/" + destination + "?md5=" + md5;
         return queryConfig(url);
     }
 
@@ -75,7 +75,7 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
         if (StringUtils.isEmpty(md5)) {
             md5 = "";
         }
-        String url = configURL + "/api/v1/config/instances_poll?md5=" + md5 + "&ip=" + ip + "&port=" + port;
+        String url = configURL + "/api/v1/config/instances_polling?md5=" + md5 + "&ip=" + ip + "&port=" + port;
         ResponseModel<CanalConfig> config = doQuery(url);
         if (config.data != null) {
             return config.data.content;