rename to reload

Author: hub-cap

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java

@@ -649,7 +649,7 @@ protected List<NotificationService> getReloadableServices() {
     @Override
     public void reload(Settings settings) throws Exception {
         for (NotificationService service : getReloadableServices()) {
-            service.loadSettings(settings);
+            service.reload(settings);
         }
     }
 }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/NotificationService.java

@@ -30,7 +30,7 @@ public NotificationService(Settings settings, String type) {
         this.type = type;
     }
 
-    public synchronized void loadSettings(Settings settings) {
+    public synchronized void reload(Settings settings) {
         Tuple<Map<String, Account>, Account> accounts = buildAccounts(settings, this::createAccount);
         this.accounts = Collections.unmodifiableMap(accounts.v1());
         this.defaultAccount = accounts.v2();

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/EmailService.java

@@ -96,7 +96,7 @@ public class EmailService extends NotificationService<Account> {
     public EmailService(Settings settings, @Nullable CryptoService cryptoService, ClusterSettings clusterSettings) {
         super(settings, "email");
         this.cryptoService = cryptoService;
-        clusterSettings.addSettingsUpdateConsumer(this::loadSettings, getSettings());
+        clusterSettings.addSettingsUpdateConsumer(this::reload, getSettings());
         // ensure logging of setting changes
         clusterSettings.addSettingsUpdateConsumer(SETTING_DEFAULT_ACCOUNT, (s) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_PROFILE, (s, o) -> {}, (s, o) -> {});
@@ -116,7 +116,7 @@ public EmailService(Settings settings, @Nullable CryptoService cryptoService, Cl
         clusterSettings.addAffixUpdateConsumer(SETTING_SMTP_SEND_PARTIAL, (s, o) -> {}, (s, o) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_SMTP_WAIT_ON_QUIT, (s, o) -> {}, (s, o) -> {});
         // do an initial load
-        loadSettings(settings);
+        reload(settings);
     }
 
     @Override

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/hipchat/HipChatService.java

@@ -67,7 +67,7 @@ public class HipChatService extends NotificationService<HipChatAccount> {
     public HipChatService(Settings settings, HttpClient httpClient, ClusterSettings clusterSettings) {
         super(settings, "hipchat");
         this.httpClient = httpClient;
-        clusterSettings.addSettingsUpdateConsumer(this::loadSettings, getSettings());
+        clusterSettings.addSettingsUpdateConsumer(this::reload, getSettings());
         // ensure logging of setting changes
         clusterSettings.addSettingsUpdateConsumer(SETTING_DEFAULT_ACCOUNT, (s) -> {});
         clusterSettings.addSettingsUpdateConsumer(SETTING_DEFAULT_HOST, (s) -> {});
@@ -80,13 +80,13 @@ public HipChatService(Settings settings, HttpClient httpClient, ClusterSettings
         clusterSettings.addAffixUpdateConsumer(SETTING_PORT, (s, o) -> {}, (s, o) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_MESSAGE_DEFAULTS, (s, o) -> {}, (s, o) -> {});
 
-        loadSettings(settings);
+        reload(settings);
     }
 
     @Override
-    public synchronized void loadSettings(Settings settings) {
+    public synchronized void reload(Settings settings) {
         defaultServer = new HipChatServer(settings.getByPrefix("xpack.notification.hipchat."));
-        super.loadSettings(settings);
+        super.reload(settings);
     }
 
     @Override

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/jira/JiraService.java

@@ -62,7 +62,7 @@ public class JiraService extends NotificationService<JiraAccount> {
     public JiraService(Settings settings, HttpClient httpClient, ClusterSettings clusterSettings) {
         super(settings, "jira");
         this.httpClient = httpClient;
-        clusterSettings.addSettingsUpdateConsumer(this::loadSettings, getSettings());
+        clusterSettings.addSettingsUpdateConsumer(this::reload, getSettings());
         // ensure logging of setting changes
         clusterSettings.addSettingsUpdateConsumer(SETTING_DEFAULT_ACCOUNT, (s) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_ALLOW_HTTP, (s, o) -> {}, (s, o) -> {});
@@ -74,7 +74,7 @@ public JiraService(Settings settings, HttpClient httpClient, ClusterSettings clu
         clusterSettings.addAffixUpdateConsumer(SETTING_SECURE_PASSWORD, (s, o) -> {}, (s, o) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_DEFAULTS, (s, o) -> {}, (s, o) -> {});
         // do an initial load
-        loadSettings(settings);
+        reload(settings);
     }
 
     @Override

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/pagerduty/PagerDutyService.java

@@ -45,7 +45,7 @@ public PagerDutyService(Settings settings, HttpClient httpClient, ClusterSetting
         clusterSettings.addAffixUpdateConsumer(SETTING_SERVICE_API_KEY, (s, o) -> {}, (s, o) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_SECURE_SERVICE_API_KEY, (s, o) -> {}, (s, o) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_DEFAULTS, (s, o) -> {}, (s, o) -> {});
-        loadSettings(settings);
+        reload(settings);
     }
 
     @Override

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/slack/SlackService.java

@@ -41,12 +41,12 @@ public class SlackService extends NotificationService<SlackAccount> {
     public SlackService(Settings settings, HttpClient httpClient, ClusterSettings clusterSettings) {
         super(settings, "slack");
         this.httpClient = httpClient;
-        clusterSettings.addSettingsUpdateConsumer(this::loadSettings, getSettings());
+        clusterSettings.addSettingsUpdateConsumer(this::reload, getSettings());
         clusterSettings.addSettingsUpdateConsumer(SETTING_DEFAULT_ACCOUNT, (s) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_URL, (s, o) -> {}, (s, o) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_URL_SECURE, (s, o) -> {}, (s, o) -> {});
         clusterSettings.addAffixUpdateConsumer(SETTING_DEFAULTS, (s, o) -> {}, (s, o) -> {});
-        loadSettings(settings);
+        reload(settings);
     }
 
     @Override

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/notification/NotificationServiceTests.java

@@ -82,7 +82,7 @@ private static class TestNotificationService extends NotificationService<String>
 
         TestNotificationService(Settings settings) {
             super(settings, "test");
-            loadSettings(settings);
+            reload(settings);
         }
 
         @Override

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java

@@ -115,9 +115,9 @@ protected Account createAccount(String name, Settings accountSettings) {
         }
 
         @Override
-        public synchronized void loadSettings(Settings settings) {
+        public synchronized void reload(Settings settings) {
             calledCreateAccount = true;
-            super.loadSettings(settings);
+            super.reload(settings);
         }
     }