Merge pull request #132 from gevorg/grails-3.x

[#130]: Added rabbitmq prefix, to avoid conflicts with environment variables.
budjb · Jul 9, 2018 · ff934a9 · ff934a9 · gevorg · Jul 9, 2018
2 parents 436c9ed + ab5ae2f
commit ff934a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ gormVersion=6.0.12.RELEASE
 
 org.gradle.daemon=true
 
-version=3.4.4
+version=3.4.5
 group=org.grails.plugins
 
 sourceCompatibility=1.8

diff --git a/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/utils/ConfigPropertyResolver.groovy b/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/utils/ConfigPropertyResolver.groovy
@@ -16,6 +16,7 @@
 package com.budjb.rabbitmq.utils
 
 import grails.config.Config
+import org.grails.config.PrefixedConfig
 import org.grails.config.PropertySourcesConfig
 
 import java.util.regex.Matcher
@@ -43,15 +44,17 @@ trait ConfigPropertyResolver {
      * @return a map with all values remapped where necessary
      */
     Config fixPropertyResolution(Map map) {
-        return new PropertySourcesConfig((Map) map.collectEntries { k, v ->
+        PropertySourcesConfig config =  new PropertySourcesConfig((Map) map.collectEntries { k, v ->
             def val = v
             if (val instanceof String) {
                 Matcher m = Pattern.compile(/\$\{(.+?)}/).matcher(val)
                 if (m.matches()) {
                     val = grailsConfiguration.get(m.group(1))
                 }
             }
-            return [k, val]
+            return ['rabbitmq.' + k, val]
         })
+
+        new PrefixedConfig('rabbitmq', config)
     }
 }