From faf88b201fab5062aeebed68f8c831c504b5f8a4 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Tue, 20 Feb 2018 10:30:28 -0500
Subject: [PATCH] GH-1233 adjusted code to recent changes in boot

Resolves #1233
---
 .../stream/config/EnvironmentEntryInitializingTreeMap.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 45e437f89..fe37f25ac 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
@@ -29,6 +29,8 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.Assert;
 
+//import org.springframework.boot.context.properties.bind.convert.BinderConversionService;
+
 /**
  * A {@link Map} implementation that initializes its entries by binding values from the
  * supplied environment. Any call to 'get()' will result in either returning the existing
@@ -84,7 +86,7 @@ public class EnvironmentEntryInitializingTreeMap<T> extends AbstractMap<String,
 	public T get(Object key) {
 		if (!this.delegate.containsKey(key) && key instanceof String) {
 			T entry = BeanUtils.instantiateClass(entryClass);
-			Binder binder = new Binder(ConfigurationPropertySources.get(environment),new PropertySourcesPlaceholdersResolver(environment),this.conversionService);
+			Binder binder = new Binder(ConfigurationPropertySources.get(environment),new PropertySourcesPlaceholdersResolver(environment), this.conversionService, null);
 			binder.bind(defaultsPrefix, Bindable.ofInstance(entry));
 			this.delegate.put((String) key, entry);
 		}
@@ -94,7 +96,7 @@ public class EnvironmentEntryInitializingTreeMap<T> extends AbstractMap<String,
 	@Override
 	public T put(String key, T value) {
 		// boot 2 call this first
-		Binder binder = new Binder(ConfigurationPropertySources.get(environment),new PropertySourcesPlaceholdersResolver(environment),this.conversionService);
+		Binder binder = new Binder(ConfigurationPropertySources.get(environment),new PropertySourcesPlaceholdersResolver(environment),this.conversionService, null);
 		binder.bind(defaultsPrefix, Bindable.ofInstance(value));
 		return this.delegate.put(key, value);
 	}