Merge branch 'master' into plugin_name_api

2 files changed, 17 insertions, 11 deletions

diff --git a/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java b/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java
index 56b50322c9..ce122353f5 100644
--- a/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java
+++ b/plugins/repository-azure/src/main/java/org/elasticsearch/plugin/repository/azure/AzureRepositoryPlugin.java
@@ -24,6 +24,7 @@ import org.elasticsearch.cloud.azure.storage.AzureStorageService;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsModule;
 import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardRepository;
@@ -31,8 +32,10 @@ import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.repositories.RepositoriesModule;
 import org.elasticsearch.repositories.azure.AzureRepository;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 /**
  *
@@ -57,16 +60,20 @@ public class AzureRepositoryPlugin extends Plugin {
         module.registerRepository(AzureRepository.TYPE, AzureRepository.class, BlobStoreIndexShardRepository.class);
     }
 
-    public void onModule(SettingsModule module) {
-        module.registerSetting(AzureStorageService.Storage.ACCOUNT_SETTING);
-        module.registerSetting(AzureStorageService.Storage.COMPRESS_SETTING);
-        module.registerSetting(AzureStorageService.Storage.CONTAINER_SETTING);
-        module.registerSetting(AzureStorageService.Storage.BASE_PATH_SETTING);
-        module.registerSetting(AzureStorageService.Storage.CHUNK_SIZE_SETTING);
-        module.registerSetting(AzureStorageService.Storage.LOCATION_MODE_SETTING);
+    @Override
+    public List<Setting<?>> getSettings() {
+        return Arrays.asList(AzureStorageService.Storage.ACCOUNT_SETTING,
+        AzureStorageService.Storage.COMPRESS_SETTING,
+        AzureStorageService.Storage.CONTAINER_SETTING,
+        AzureStorageService.Storage.BASE_PATH_SETTING,
+        AzureStorageService.Storage.CHUNK_SIZE_SETTING,
+        AzureStorageService.Storage.LOCATION_MODE_SETTING);
+
+    }
 
+    @Override
+    public List<String> getSettingsFilter() {
         // Cloud storage API settings using a pattern needed to be hidden
-        module.registerSettingsFilter(AzureStorageService.Storage.PREFIX + "*.account");
-        module.registerSettingsFilter(AzureStorageService.Storage.PREFIX + "*.key");
+        return Arrays.asList(AzureStorageService.Storage.PREFIX + "*.account", AzureStorageService.Storage.PREFIX + "*.key");
     }
 }
diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilterTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilterTests.java
index 6f21506956..db3bd617da 100644
--- a/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilterTests.java
+++ b/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilterTests.java
@@ -47,8 +47,7 @@ public class AzureStorageSettingsFilterTests extends ESTestCase {
 
     public void testSettingsFiltering() throws IOException {
         AzureRepositoryPlugin p = new AzureRepositoryPlugin(Settings.EMPTY);
-        SettingsModule module = new SettingsModule(Settings.EMPTY);
-        p.onModule(module);
+        SettingsModule module = new SettingsModule(Settings.EMPTY, p.getSettings(), p.getSettingsFilter());
         SettingsFilter settingsFilter = ModuleTestCase.bindAndGetInstance(module, SettingsFilter.class);
 
         // Test using direct filtering