From 0249867e63fea7ba22e9e23d7354837e6d11ab12 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Mon, 8 Oct 2018 17:45:44 -0400
Subject: [PATCH] Address camelCase properties binding issue

Because of a re-bind of properties that is needed to address the way
default properties are handled (See the prvious commit), camelCase
binding is broken. Fixing this issue with camelCase binding.

Resolves #1495
---
 .../EnvironmentEntryInitializingTreeMap.java    |  3 ++-
 .../stream/binding/BindingServiceTests.java     | 17 ++++++++++++++++-
 2 files changed, 18 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 c9d2ea68b..32bb66cd5 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
@@ -113,7 +113,8 @@ public class EnvironmentEntryInitializingTreeMap<T> extends AbstractMap<String,
 			}
 		};
 
-		binder.bind("spring.cloud.stream.bindings." + key, Bindable.ofInstance(defaultProperties), handler);
+		String configElements = "spring.cloud.stream.bindings." + key;
+		binder.bind(configElements.toLowerCase(), Bindable.ofInstance(defaultProperties), handler);
 
 		((MergableProperties)defaultProperties).merge((MergableProperties) value, setProperties.toArray(new String[0]));
 		return this.delegate.put(key, value);
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java
index 9ced11374..a87b584bf 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java
@@ -446,7 +446,9 @@ public class BindingServiceTests {
 				"--spring.cloud.stream.bindings.input2.consumer.concurrency=1",
 				"--spring.cloud.stream.bindings.input1.consumer.partitioned=true",
 				"--spring.cloud.stream.default.producer.partitionCount=10",
-				"--spring.cloud.stream.bindings.output2.producer.partitionCount=1");
+				"--spring.cloud.stream.bindings.output2.producer.partitionCount=1",
+				"--spring.cloud.stream.bindings.inputXyz.contentType=application/json",
+				"--spring.cloud.stream.bindings.inputFooBar.contentType=application/avro");
 
 		BindingServiceProperties bindingServiceProperties = run.getBeanFactory().getBean(BindingServiceProperties.class);
 		Map<String, BindingProperties> bindings = bindingServiceProperties.getBindings();
@@ -461,6 +463,10 @@ public class BindingServiceTests {
 		assertThat(bindings.get("input2").getConsumer().isPartitioned()).isEqualTo(false);
 		assertThat(bindings.get("output1").getProducer().getPartitionCount()).isEqualTo(10);
 		assertThat(bindings.get("output2").getProducer().getPartitionCount()).isEqualTo(1);
+
+		assertThat(bindings.get("inputXyz").getContentType()).isEqualTo("application/json");
+		assertThat(bindings.get("inputFooBar").getContentType()).isEqualTo("application/avro");
+		assertThat(bindings.get("inputFooBarBuzz").getContentType()).isEqualTo("text/plain");
 	}
 
 	@EnableBinding(FooBinding.class)
@@ -485,6 +491,15 @@ public class BindingServiceTests {
 
 		@Output("output2")
 		MessageChannel out2();
+
+		@Input("inputXyz")
+		SubscribableChannel inXyz();
+
+		@Input("inputFooBar")
+		SubscribableChannel inFooBar();
+
+		@Input("inputFooBarBuzz")
+		SubscribableChannel inFooBarBuzz();
 	}
 
 	@Test