Merge pull request #147 from budjb/3.3.x

Updates to work with Grails 3.3.

.travis.yml

@@ -1,7 +1,8 @@
 language: java
+dist: trusty
 
 jdk:
-- openjdk11
+- openjdk8
 
 services:
 - rabbitmq

gradle.properties

@@ -1,10 +1,10 @@
 grailsVersion=3.3.0
-gradleWrapperVersion=3.4.1
-gormVersion=6.0.12.RELEASE
+gradleWrapperVersion=3.5
+gormVersion=6.1.11.RELEASE
 
 org.gradle.daemon=true
 
-version=4.0.0
+version=3.5.0
 group=org.grails.plugins
 
 sourceCompatibility=1.8

rabbitmq-native-documentation/src/docs/changelog.adoc

@@ -1,7 +1,14 @@
 == Changelog
 
+=== 3.5.x
+
+==== Version 3.5.0
+* Update to work with Grails 3.3 (or better).
+* Add `Order` and `Ordered` support to message converters.
+
 === 3.4.x
 
+==== Version
 ==== Version 3.4.6
 * Add some error handling around flushing and destroying the persistence context interceptor. Was unable
   to reproduce the error, but this is an attempt to fix a zombie Hibernate session bug.

rabbitmq-native-test/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.1"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.15.1"
         classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
     }
 }
@@ -39,8 +39,12 @@ dependencies {
     profile "org.grails.profiles:web"
     runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.1"
     runtime "com.h2database:h2"
-    testCompile "org.grails:grails-plugin-testing"
+    testCompile "org.grails:grails-gorm-testing-support"
     testCompile "org.grails.plugins:geb"
+    testCompile "org.grails:grails-web-testing-support"
+//    testCompile "org.spockframework:spock-core"
+//    testCompile "cglib:cglib-nodep:3.3.0"
+//    testCompile "org.objenesis:objenesis:1.4"
     testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
     testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
 }

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/ConfigurationSpec.groovy

@@ -17,7 +17,7 @@ package com.budjb.rabbitmq.test
 
 import grails.config.Config
 import grails.core.GrailsApplication
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import spock.lang.Specification
 
 /**

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/ConnectionBuilderImplSpec.groovy

@@ -18,7 +18,7 @@ package com.budjb.rabbitmq.test
 import com.budjb.rabbitmq.connection.ConnectionBuilder
 import com.budjb.rabbitmq.connection.ConnectionBuilderImpl
 import com.budjb.rabbitmq.connection.ConnectionContext
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import grails.transaction.*
 import org.springframework.beans.factory.annotation.Autowired
 import spock.lang.*

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/MessageContextSpec.groovy

@@ -15,7 +15,7 @@
  */
 package com.budjb.rabbitmq.test
 
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import org.springframework.beans.factory.annotation.Autowired
 import spock.lang.Specification
 

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/MessageConverterIntegrationSpec.groovy

@@ -1,7 +1,7 @@
 package com.budjb.rabbitmq.test
 
 import com.budjb.rabbitmq.publisher.RabbitMessagePublisher
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import grails.util.TypeConvertingMap
 import org.springframework.beans.factory.annotation.Autowired
 

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/MessageMarshallSpec.groovy

@@ -15,7 +15,7 @@
  */
 package com.budjb.rabbitmq.test
 
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import grails.util.TypeConvertingMap
 import org.springframework.beans.factory.annotation.Autowired
 

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/RabbitEventSpec.groovy

@@ -15,7 +15,7 @@
  */
 package com.budjb.rabbitmq.test
 
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import org.springframework.beans.factory.annotation.Autowired
 import spock.lang.Specification
 

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/ReportSpec.groovy

@@ -16,7 +16,7 @@
 package com.budjb.rabbitmq.test
 
 import com.budjb.rabbitmq.RabbitContext
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
 import spock.lang.Specification

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/RpcSpec.groovy

@@ -15,7 +15,7 @@
  */
 package com.budjb.rabbitmq.test
 
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 
 @Integration
 class RpcSpec extends MessageConsumerIntegrationTest {

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/StartStopConsumerSpec.groovy

@@ -18,7 +18,7 @@ package com.budjb.rabbitmq.test
 import com.budjb.rabbitmq.RabbitContext
 import com.budjb.rabbitmq.RunningState
 import com.budjb.rabbitmq.test.support.ShutdownRunnable
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import org.springframework.beans.factory.annotation.Autowired
 
 import java.util.concurrent.TimeoutException

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/TopicExchangeBindingsSpec.groovy

@@ -16,7 +16,7 @@
 package com.budjb.rabbitmq.test
 
 import com.budjb.rabbitmq.test.plugin.ExchangeBindingTopicConsumer
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import org.springframework.beans.factory.annotation.Autowired
 
 import java.util.concurrent.TimeoutException

rabbitmq-native-test/src/integration-test/groovy/com/budjb/rabbitmq/test/TopicExchangeSpec.groovy

@@ -16,7 +16,7 @@
 package com.budjb.rabbitmq.test
 
 import com.budjb.rabbitmq.test.plugin.ExchangeBindingTopicConsumer
-import grails.test.mixin.integration.Integration
+import grails.testing.mixin.integration.Integration
 import org.springframework.beans.factory.annotation.Autowired
 
 import java.util.concurrent.TimeoutException

rabbitmq-native/build.gradle

@@ -22,14 +22,18 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-logging"
     compile "org.springframework.boot:spring-boot-autoconfigure"
     compile "org.grails:grails-core"
+    compile "org.codehaus.gpars:gpars:1.2.1"
     console "org.grails:grails-console"
     profile "org.grails.profiles:plugin"
     provided "org.grails:grails-plugin-services"
     provided "org.grails:grails-plugin-domain-class"
     testCompile "org.grails:grails-plugin-testing"
+    testCompile "org.spockframework:spock-core"
+    testCompile "cglib:cglib-nodep:3.3.0"
+    testCompile "org.objenesis:objenesis:1.4"
 
     compile 'commons-lang:commons-lang:2.6'
-    compile 'org.codehaus.groovy:groovy-json:2.4.11'
+    compile 'org.codehaus.groovy:groovy-json'
     compile 'com.rabbitmq:amqp-client:4.2.0'
     compile 'io.dropwizard.metrics:metrics-core:3.2.3'
 }

rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/consumer/LegacyConsumerContext.groovy

@@ -271,7 +271,7 @@ class LegacyConsumerContext extends AbstractConsumerContext {
             return
         }
 
-        def configuration = grailsConfig.getProperty("rabbitmq.consumers.${getName()}", Map)
+        def configuration = grailsConfig.getProperty("rabbitmq.consumers.${getName()}".toString(), Map)
 
         if (configuration) {
             this.consumerConfiguration = new ConsumerConfigurationImpl((Map) configuration)

rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/converter/MessageConverterManagerImpl.groovy

@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
+import org.springframework.core.annotation.AnnotationAwareOrderComparator
 import org.springframework.util.ClassUtils
 import org.springframework.util.MimeType
 
@@ -241,6 +242,7 @@ class MessageConverterManagerImpl implements MessageConverterManager, Applicatio
     void register(MessageConverter messageConverter) {
         log.debug("Registering message consumer: ${messageConverter.getClass().getSimpleName()}")
         messageConverters << messageConverter
+        Collections.sort(messageConverters, new AnnotationAwareOrderComparator())
     }
 
     /**

rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/converter/TypeConvertingMapMessageConverter.groovy

@@ -19,11 +19,13 @@ import grails.util.TypeConvertingMap
 import groovy.json.JsonException
 import groovy.json.JsonSlurper
 import groovy.transform.CompileStatic
+import org.springframework.core.annotation.Order
 
 /**
  * A converter that supports the conversion of a {@link TypeConvertingMap} to and from JSON.
  */
 @CompileStatic
+@Order(-10)
 class TypeConvertingMapMessageConverter extends JsonMessageConverter {
     /**
      * {@inheritDoc}

rabbitmq-native/src/test/groovy/com/budjb/rabbitmq/test/RabbitLifecycleListenerSpec.groovy

@@ -18,15 +18,9 @@ package com.budjb.rabbitmq.test
 import com.budjb.rabbitmq.RabbitContext
 import com.budjb.rabbitmq.RabbitLifecycleListener
 import grails.config.Config
-import grails.test.mixin.TestMixin
-import grails.test.mixin.support.GrailsUnitTestMixin
 import spock.lang.Specification
 import spock.lang.Unroll
 
-/**
- * See the API for {@link grails.test.mixin.support.GrailsUnitTestMixin} for usage instructions
- */
-@TestMixin(GrailsUnitTestMixin)
 class RabbitLifecycleListenerSpec extends Specification {
     RabbitLifecycleListener rabbitLifecycleListener
     RabbitContext rabbitContext

rabbitmq-native/src/test/groovy/com/budjb/rabbitmq/test/converter/SerializableMessageConverterSpec.groovy

@@ -22,15 +22,9 @@ import com.budjb.rabbitmq.converter.ObjectToByteResult
 import com.budjb.rabbitmq.converter.SerializableMessageConverter
 import com.budjb.rabbitmq.test.converter.support.MyNotSerializable
 import com.budjb.rabbitmq.test.converter.support.MySerializable
-import grails.test.mixin.TestMixin
-import grails.test.mixin.support.GrailsUnitTestMixin
 import org.springframework.util.MimeType
 import spock.lang.*
 
-/**
- * See the API for {@link grails.test.mixin.support.GrailsUnitTestMixin} for usage instructions
- */
-@TestMixin(GrailsUnitTestMixin)
 class SerializableMessageConverterSpec extends Specification {
     SerializableMessageConverter messageConverter
 

rabbitmq-native/src/test/groovy/com/budjb/rabbitmq/test/queuebuilder/ExchangePropertiesSpec.groovy

@@ -18,14 +18,8 @@ package com.budjb.rabbitmq.test.queuebuilder
 import com.budjb.rabbitmq.exception.InvalidConfigurationException
 import com.budjb.rabbitmq.queuebuilder.ExchangeProperties
 import com.budjb.rabbitmq.queuebuilder.ExchangeType
-import grails.test.mixin.TestMixin
-import grails.test.mixin.support.GrailsUnitTestMixin
 import spock.lang.*
 
-/**
- * See the API for {@link grails.test.mixin.support.GrailsUnitTestMixin} for usage instructions
- */
-@TestMixin(GrailsUnitTestMixin)
 class ExchangePropertiesSpec extends Specification {
 
     ExchangeProperties exchangeProperties

rabbitmq-native/src/test/groovy/com/budjb/rabbitmq/test/queuebuilder/QueuePropertiesSpec.groovy

@@ -17,14 +17,8 @@ package com.budjb.rabbitmq.test.queuebuilder
 
 import com.budjb.rabbitmq.exception.InvalidConfigurationException
 import com.budjb.rabbitmq.queuebuilder.QueueProperties
-import grails.test.mixin.TestMixin
-import grails.test.mixin.support.GrailsUnitTestMixin
 import spock.lang.Specification
 
-/**
- * See the API for {@link grails.test.mixin.support.GrailsUnitTestMixin} for usage instructions
- */
-@TestMixin(GrailsUnitTestMixin)
 class QueuePropertiesSpec extends Specification {
 
     QueueProperties properties