Merge branch 'peh-master' into 1.2.1

Author: puneetbehl

build.gradle

@@ -75,7 +75,7 @@ dependencies {
     provided "org.grails:grails-dependencies"
 
     compile "org.grails:grails-core"
-    compile "org.grails.plugins:hibernate4"
+    compile "org.grails.plugins:hibernate5"
     compile "org.grails.plugins:cache"
     compile "org.hibernate:hibernate-ehcache"
 

gradle.properties

@@ -1,2 +1,2 @@
-grailsVersion=3.1.1
+grailsVersion=3.2.4
 gradleWrapperVersion=2.9

grails-app/conf/application.yml

@@ -122,6 +122,7 @@ endpoints:
         unique-names: true
 
 dataSource:
+    dbCreate: create-drop
     pooled: true
     jmxExport: true
     driverClassName: org.h2.Driver

src/main/groovy/grails/plugins/elasticsearch/ElasticSearchBootStrapHelper.groovy

@@ -34,7 +34,7 @@ class ElasticSearchBootStrapHelper implements ElasticSearchConfigAware {
             elasticSearchService.index(domainsToReindex)
         } else if (bulkIndexOnStartup) { //Index all
             LOG.debug "Performing bulk indexing."
-            elasticSearchService.index()
+            elasticSearchService.index(Collections.emptyMap()) // empty map is needed for static compiling
         }
         //Update index aliases where needed
         MappingMigrationStrategy migrationStrategy = migrationConfig?.strategy ? MappingMigrationStrategy.valueOf(migrationConfig?.strategy as String) : none

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

@@ -237,6 +237,6 @@ class ElasticSearchMappingFactory {
     }
 
     private static Map<String, Object> defaultDescriptor(String type, String index, boolean excludeFromAll) {
-        [type: type, index: index, include_in_all: !excludeFromAll]
+        [type: type, index: index, include_in_all: !excludeFromAll] as Map<String, Object>
     }
 }

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

@@ -279,7 +279,7 @@ class SearchableDomainClassMapper extends GroovyObjectSupport {
             return Collections.emptySet()
         }
         if (arg instanceof String) {
-            return Collections.singleton(arg)
+            return Collections.singleton(arg) as Set<String>
         }
         if (arg instanceof Object[]) {
             return new HashSet<String>(Arrays.asList(arg as String[]))