From ab5ae2f46fe5c21ea11c8f44b074f64d23edf9ee Mon Sep 17 00:00:00 2001
From: Gevorg Harutyunyan <gevorg.ha@gmail.com>
Date: Sun, 8 Jul 2018 14:34:55 +0400
Subject: [PATCH] [#130]: Added rabbitmq prefix, to avoid conflicts with
 environment variables.

---
 gradle.properties                                          | 2 +-
 .../com/budjb/rabbitmq/utils/ConfigPropertyResolver.groovy | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 660dcb19..7c2d6add 100644
--- 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
index 19fbdc57..de2aa196 100644
--- 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,7 +44,7 @@ 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)
@@ -51,7 +52,9 @@ trait ConfigPropertyResolver {
                     val = grailsConfiguration.get(m.group(1))
                 }
             }
-            return [k, val]
+            return ['rabbitmq.' + k, val]
         })
+
+        new PrefixedConfig('rabbitmq', config)
     }
 }