From 24cf9923014e71e301170cb7f9af8e3cc213fe3e Mon Sep 17 00:00:00 2001
From: Vinicius Carvalho <viniciusccarvalho@gmail.com>
Date: Fri, 1 Sep 2017 17:39:03 -0400
Subject: [PATCH] Passing Conversion service to boot Binder

---
 .../config/EnvironmentEntryInitializingTreeMap.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnvironmentEntryInitializingTreeMap.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnvironmentEntryInitializingTreeMap.java
index ecda170d3..0a7c9faa3 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnvironmentEntryInitializingTreeMap.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnvironmentEntryInitializingTreeMap.java
@@ -21,9 +21,11 @@ import java.util.Map;
 import java.util.Set;
 
 import org.springframework.beans.BeanUtils;
-import org.springframework.core.convert.ConversionService;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.context.properties.bind.PropertySourcesPlaceholdersResolver;
+import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
+import org.springframework.core.convert.ConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.Assert;
 
@@ -41,6 +43,7 @@ import org.springframework.util.Assert;
  * @author Marius Bogoevici
  * @author Ilayaperumal Gopinathan
  * @author Janne Valkealahti
+ * @author Vinicius Carvalho
  */
 public class EnvironmentEntryInitializingTreeMap<T> extends AbstractMap<String, T> {
 
@@ -81,7 +84,8 @@ public class EnvironmentEntryInitializingTreeMap<T> extends AbstractMap<String,
 	public T get(Object key) {
 		if (!this.delegate.containsKey(key) && key instanceof String) {
 			T entry = BeanUtils.instantiate(entryClass);
-			Binder.get(environment).bind(defaultsPrefix, Bindable.ofInstance(entry));
+			Binder binder = new Binder(ConfigurationPropertySources.get(environment),new PropertySourcesPlaceholdersResolver(environment),this.conversionService);
+			binder.bind(defaultsPrefix, Bindable.ofInstance(entry));
 			this.delegate.put((String) key, entry);
 		}
 		return this.delegate.get(key);
@@ -90,7 +94,8 @@ public class EnvironmentEntryInitializingTreeMap<T> extends AbstractMap<String,
 	@Override
 	public T put(String key, T value) {
 		// boot 2 call this first
-		Binder.get(environment).bind(defaultsPrefix, Bindable.ofInstance(value));
+		Binder binder = new Binder(ConfigurationPropertySources.get(environment),new PropertySourcesPlaceholdersResolver(environment),this.conversionService);
+		binder.bind(defaultsPrefix, Bindable.ofInstance(value));
 		return this.delegate.put(key, value);
 	}