Updated to Grails 3.3.2

Author: puneetbehl

build.gradle

@@ -4,6 +4,8 @@ buildscript {
     ext {
         grailsVersion = project.grailsVersion
         gormVersion = project.gormVersion
+        elasticsearchVersion = project.elasticsearchVersion
+        elasticsearchAttachmentsVersion = project.elasticsearchAttachmentsVersion
     }
     repositories {
         mavenLocal()
@@ -35,7 +37,8 @@ apply plugin: 'maven-publish'
 
 ext {
     gradleWrapperVersion = project.gradleWrapperVersion
-    elasticsearchVersion = '5.4.1'
+    elasticsearchVersion = project.elasticsearchVersion
+    elasticsearchAttachmentsVersion = project.elasticsearchAttachmentsVersion
 }
 
 sourceCompatibility = 1.7
@@ -100,7 +103,7 @@ dependencies {
 
     testCompile "org.grails:grails-gorm-testing-support"
     testCompile "org.grails:grails-plugin-testing"
-    testCompile "org.grails:grails-test-mixins:3.3.0"
+    testCompile "org.grails:grails-web-testing-support"
 
     testCompile 'com.vividsolutions:jts:1.13'
     testCompile 'com.googlecode.json-simple:json-simple:1.1.1'
@@ -151,6 +154,13 @@ task cleanDataDir(type: Delete) {
     delete fileTree(dir: 'data')
 }
 
+bootRun {
+    jvmArgs('-Dspring.output.ansi.enabled=always')
+    addResources = true
+}
+// enable if you wish to package this plugin as a standalone application
+bootRepackage.enabled = false
+
 apply from: "gradle/documentation.gradle"
 
 apply from: "gradle/publish.gradle"

gradle.properties

@@ -1,3 +1,5 @@
-grailsVersion=3.3.1
-gormVersion=6.1.7.RELEASE
-gradleWrapperVersion=3.0
+grailsVersion=3.3.2
+gormVersion=6.1.8.RELEASE
+gradleWrapperVersion=3.5
+elasticsearchVersion=5.4.1
+elasticsearchAttachmentsVersion=5.4.1

gradle/documentation.gradle

@@ -51,32 +51,34 @@ task asciidoc(type: AsciidoctorTask, description: 'Generates single-page HTML an
     backends 'html5', 'pdf'
 }
 
-task docs(dependsOn: [asciidoc]) << {
-    File dir = new File(buildDir, 'docs/docs')
-    ['pdf'].each { String ext ->
-        File f = new File(dir, 'index.' + ext)
-        if (f.exists()) {
-            f.renameTo new File(dir, project.name + '-' + project.version + '.' + ext)
+task docs(dependsOn: [asciidoc]) {
+    doLast {
+        File dir = new File(buildDir, 'docs/docs')
+        ['pdf'].each { String ext ->
+            File f = new File(dir, 'index.' + ext)
+            if (f.exists()) {
+                f.renameTo new File(dir, project.name + '-' + project.version + '.' + ext)
+            }
         }
-    }
 
-    File quickRefDir = new File(buildDir, 'docs/docs/ref')
-    ['pdf'].each { String ext ->
-        File f = new File(quickRefDir, 'index.' + ext)
-        if (f.exists()) {
-            f.renameTo new File(quickRefDir, project.name + '-' + project.version + '-' + 'quickReference' + '.' + ext)
+        File quickRefDir = new File(buildDir, 'docs/docs/ref')
+        ['pdf'].each { String ext ->
+            File f = new File(quickRefDir, 'index.' + ext)
+            if (f.exists()) {
+                f.renameTo new File(quickRefDir, project.name + '-' + project.version + '-' + 'quickReference' + '.' + ext)
+            }
         }
-    }
 
-    File ghpages = new File(buildDir, 'docs/index.html')
-    if (ghpages.exists()) {
-        ghpages.delete()
-    }
-    ghpages << file('src/docs/index.tmpl').text.replaceAll('@VERSION@', project.version)
+        File ghpages = new File(buildDir, 'docs/index.html')
+        if (ghpages.exists()) {
+            ghpages.delete()
+        }
+        ghpages << file('src/docs/index.tmpl').text.replaceAll('@VERSION@', project.version)
 
-    copy {
-        from 'src/docs'
-        into new File(buildDir, 'docs').path
-        include '**/*.png'
+        copy {
+            from 'src/docs'
+            into new File(buildDir, 'docs').path
+            include '**/*.png'
+        }
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Fri May 13 09:39:16 CEST 2016
+#Fri Nov 27 23:09:32 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

gradlew.bat

@@ -3,16 +3,34 @@ grails:
     profile: web-plugin
     codegen:
         defaultPackage: grails.plugins.elasticsearch
-    databinding.dateFormats: ["yyyy-MM-dd'T'HH:mm:ss.SSSZ"]
+    spring:
+        transactionManagement:
+            proxies: false
+    gorm:
+        reactor:
+            # Whether to translate GORM events into Reactor events
+            # Disabled by default for performance reasons
+            events: false
+    databinding:
+        dateFormats: ["yyyy-MM-dd'T'HH:mm:ss.SSSZ"]
 info:
     app:
         name: '@info.app.name@'
         version: '@info.app.version@'
         grailsVersion: '@info.app.grailsVersion@'
 spring:
+    main:
+        banner-mode: "off"
     groovy:
         template:
             check-template-location: false
+
+# Spring Actuator Endpoints are Disabled by Default
+endpoints:
+    enabled: false
+    jmx:
+        enabled: true
+
 ---
 grails:
     mime:

grails-app/conf/application.yml

@@ -2,7 +2,9 @@ package grails.plugins.elasticsearch
 
 import grails.boot.GrailsApp
 import grails.boot.config.GrailsAutoConfiguration
+import grails.plugins.metadata.PluginSource
 
+@PluginSource
 class Application extends GrailsAutoConfiguration {
     static void main(String[] args) {
         GrailsApp.run(Application, args)

grails-app/init/grails/plugins/elasticsearch/Application.groovy

@@ -1,14 +1,13 @@
 package grails.plugins.elasticsearch
 
-import grails.test.mixin.TestFor
+import grails.testing.services.ServiceUnitTest
 import spock.lang.Specification
 import spock.lang.Unroll
 
 /**
  * Created by @marcos-carceles on 15/01/15.
  */
-@TestFor(ElasticSearchAdminService)
-class ElasticSearchAdminServiceSpec extends Specification {
+class ElasticSearchAdminServiceSpec extends Specification implements ServiceUnitTest<ElasticSearchAdminService> {
 
     @Unroll
     void "identifies the next index version correctly"() {

src/test/groovy/grails/plugins/elasticsearch/ElasticSearchAdminServiceSpec.groovy

@@ -1,27 +1,37 @@
 package grails.plugins.elasticsearch.mapping
 
-import grails.core.GrailsApplication
 import grails.core.GrailsDomainClass
 import grails.plugins.elasticsearch.util.IndexNamingUtils
-import grails.test.mixin.Mock
-import org.grails.core.DefaultGrailsDomainClass
+import grails.testing.gorm.DataTest
+import grails.testing.spring.AutowiredTest
+import org.grails.datastore.gorm.config.GrailsDomainClassMappingContext
 import spock.lang.Specification
 import test.Photo
 import test.upperCase.UpperCase
 
-@Mock([Photo, UpperCase])
-class SearchableClassMappingSpec extends Specification {
+class SearchableClassMappingSpec extends Specification implements DataTest, AutowiredTest {
+
+    Closure doWithSpring() {{ ->
+        mappingContext GrailsDomainClassMappingContext
+        domainReflectionService DomainReflectionService
+    }}
+
+    DomainReflectionService domainReflectionService
+
+    void setupSpec() {
+        mockDomains(Photo, UpperCase)
+    }
 
     def "indexing and querying index are calculated based on the index name"() {
         given:
-        def domainClass = Mock(DomainEntity)
+        def domainClass = Mock(GrailsDomainClass)
         domainClass.getPackageName() >> packageName
 
         when:
-        SearchableClassMapping scm = new SearchableClassMapping(null, domainClass, [])
+        SearchableClassMapping scm = new SearchableClassMapping(grailsApplication, new DomainEntity(domainReflectionService, domainClass, null), [])
 
         then:
-        scm.indexName == packageName
+        scm.indexName == domainClass.packageName
         scm.queryingIndex == IndexNamingUtils.queryingIndexFor(packageName)
         scm.indexingIndex == IndexNamingUtils.indexingIndexFor(packageName)
         scm.queryingIndex != scm.indexingIndex
@@ -33,29 +43,38 @@ class SearchableClassMappingSpec extends Specification {
     }
 
     void testGetIndexName() throws Exception {
-        GrailsDomainClass dc = new DefaultGrailsDomainClass(Photo.class)
-        dc.grailsApplication = [:] as GrailsApplication
-        SearchableClassMapping mapping = new SearchableClassMapping(dc, null)
-        assert 'test' == mapping.getIndexName()
+        when:
+        def domainClass = Mock(GrailsDomainClass)
+        domainClass.getPackageName() >> "test"
+        SearchableClassMapping mapping = new SearchableClassMapping(grailsApplication, new DomainEntity(domainReflectionService, domainClass, null), null)
+
+        then:
+        'test' == mapping.getIndexName()
     }
 
     void testManuallyConfiguredIndexName() throws Exception {
-        GrailsDomainClass dc = new DefaultGrailsDomainClass(Photo.class)
-        dc.grailsApplication = [:] as GrailsApplication
-        config.elasticSearch.index.name = 'index-name'
-        SearchableClassMapping mapping = new SearchableClassMapping(dc, null)
-        assert 'index-name' == mapping.getIndexName()
+
+        when:
+        DomainEntity dc = domainReflectionService.getAbstractDomainEntity(Photo.class)
+        grailsApplication.config.elasticSearch.index.name = 'index-name'
+        SearchableClassMapping mapping = new SearchableClassMapping(grailsApplication, dc, null)
+
+        then:
+        'index-name' == mapping.getIndexName()
     }
 
     void testIndexNameIsLowercaseWhenPackageNameIsLowercase() throws Exception {
-        GrailsDomainClass dc = new DefaultGrailsDomainClass(UpperCase.class)
-        dc.grailsApplication = [:] as GrailsApplication
-        SearchableClassMapping mapping = new SearchableClassMapping(dc, null)
+        when:
+        def domainClass = Mock(GrailsDomainClass)
+        domainClass.getPackageName() >> "test.upperCase"
+        SearchableClassMapping mapping = new SearchableClassMapping(grailsApplication, new DomainEntity(domainReflectionService, domainClass, null), null)
         String indexName = mapping.getIndexName()
-        assert 'test.uppercase' == indexName
+
+        then:
+        'test.uppercase' == indexName
     }
 
     void cleanup() {
-        config.elasticSearch.index.name = null
+        grailsApplication.config.elasticSearch.index.name = null
     }
 }