From fd148972e4ca475063fc31af720222bc14cc8a97 Mon Sep 17 00:00:00 2001 From: Andrew Canby Date: Fri, 22 Jul 2022 11:13:26 +1000 Subject: [PATCH] Fix config deprecation warning for Grails 5 --- .../budjb/rabbitmq/queuebuilder/QueueBuilderImpl.groovy | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/queuebuilder/QueueBuilderImpl.groovy b/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/queuebuilder/QueueBuilderImpl.groovy index 0c54495d..4309cd49 100644 --- a/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/queuebuilder/QueueBuilderImpl.groovy +++ b/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/queuebuilder/QueueBuilderImpl.groovy @@ -68,19 +68,16 @@ class QueueBuilderImpl implements QueueBuilder, ConfigPropertyResolver { queues.clear() exchanges.clear() - def topConfig = grailsApplication.config.rabbitmq + Map topConfig = grailsApplication.config.getProperty("rabbitmq", Map, [:]) def queueConfig = topConfig.queues if (queueConfig instanceof Closure) { log.warn("closure-based configuration for queues and exchanges is deprecated") call(queueConfig, new ClosureDelegate()) } - else if (topConfig instanceof Map) { + else { parse(topConfig as Map) } - else { - throw new InvalidConfigurationException("queue/exchanges configuration is invalid") - } queues*.validate() exchanges*.validate()