Merge branch 'Issue#212' into 2.4.0.RC2

Author: puneetbehl

grails-app/conf/application.yml

@@ -93,18 +93,19 @@ environments:
             datastoreImpl: hibernateDatastore
             index:
                 store.type: simplefs
-                analysis:
-                    filter:
-                        replace_synonyms:
-                            type: synonym
-                            synonyms: ['abc => xyz']
-                    analyzer:
-                        test_analyzer:
-                            tokenizer: standard
-                            filter: ['lowercase']
-                        repl_analyzer:
-                            tokenizer: standard
-                            filter: ['lowercase', 'replace_synonyms']
+                settings:
+                    analysis:
+                        filter:
+                            replace_synonyms:
+                                type: synonym
+                                synonyms: ['abc => xyz']
+                        analyzer:
+                            test_analyzer:
+                                tokenizer: standard
+                                filter: ['lowercase']
+                            repl_analyzer:
+                                tokenizer: standard
+                                filter: ['lowercase', 'replace_synonyms']
     production:
         elasticSearch:
             client:

grails-app/conf/plugin.groovy

@@ -68,7 +68,7 @@ elasticSearch {
      */
     migration.disableAliasChange = false
 
-    index.numberOfReplicas = 0
+    index.settings.numberOfReplicas = 0
 
     /**
      * Whether to index and search all non excluded transient properties. All explicitly included transients in @only@ will be indexed regardless.

src/main/groovy/grails/plugins/elasticsearch/mapping/SearchableClassMappingConfigurator.groovy

@@ -187,21 +187,21 @@ class SearchableClassMappingConfigurator implements ElasticSearchConfigAware {
     }
 
     private Map<String, Object> buildIndexSettings() {
-        Map<String, Object> indexSettings = new HashMap<String, Object>()
-        indexSettings.put("number_of_replicas", numberOfReplicas())
+        Map<String, Object> settings = new HashMap<String, Object>()
+        settings.put("number_of_replicas", numberOfReplicas())
         // Look for default index settings.
         if (esConfig != null) {
-            Map<String, Object> indexDefaults = esConfig.get("index") as Map<String, Object>
+            Map<String, Object> indexDefaults = indexSettings as Map<String, Object>
             LOG.debug("Retrieved index settings")
             if (indexDefaults != null) {
                 for (Map.Entry<String, Object> entry : indexDefaults.entrySet()) {
                     String key = entry.getKey();
                     if(key == 'numberOfReplicas') key = 'number_of_replicas'
-                    indexSettings.put("index." + key, entry.getValue())
+                    settings.put("index." + key, entry.getValue())
                 }
             }
         }
-        indexSettings
+        settings
     }
 
     private Map<SearchableClassMapping, Map> buildElasticMappings(Collection<SearchableClassMapping> mappings) {
@@ -215,7 +215,7 @@ class SearchableClassMappingConfigurator implements ElasticSearchConfigAware {
     }
 
     private int numberOfReplicas() {
-        def defaultNumber = (esConfig.index as ConfigObject).numberOfReplicas
+        def defaultNumber = indexSettings.numberOfReplicas
         if (!defaultNumber) {
             return 0
         }

src/main/groovy/grails/plugins/elasticsearch/util/ElasticSearchConfigAware.groovy

@@ -11,6 +11,10 @@ trait ElasticSearchConfigAware {
 
     abstract GrailsApplication getGrailsApplication()
 
+    ConfigObject getIndexSettings() {
+        (esConfig?.index as ConfigObject)?.settings as ConfigObject
+    }
+
     ConfigObject getEsConfig() {
         grailsApplication?.config?.elasticSearch as ConfigObject
     }