From 6fbfa60401d9f5426216faf361c0e054a0367029 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 10 Apr 2019 19:26:40 +0200
Subject: [PATCH] Upgraded to 2.1.4.s-c-build

---
 pom.xml                                       |  2 +-
 .../stream/config/BindingHandlerAdvise.java   |  1 -
 .../config/BindingHandlerAdviseTests.java     | 24 ++++++++++++-------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 624e75683..9125a7702 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.3.RELEASE</version>
+		<version>2.1.4.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<scm>
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java
index c80c83799..7bc9e587f 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java
@@ -38,7 +38,6 @@ public class BindingHandlerAdvise implements ConfigurationPropertiesBindHandlerA
 
 	private final Map<ConfigurationPropertyName, ConfigurationPropertyName> mappings;
 
-
 	BindingHandlerAdvise(
 			Map<ConfigurationPropertyName, ConfigurationPropertyName> additionalMappings) {
 		this.mappings = new LinkedHashMap<>();
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java
index 1a8f08f36..2515eafbd 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java
@@ -48,29 +48,31 @@ public class BindingHandlerAdviseTests {
 
 	@Test(expected = BeanCreationException.class)
 	public void testFailureWithWrongValue() {
-		new SpringApplicationBuilder(SampleConfiguration.class).web(WebApplicationType.NONE).run("--props.value=-1",
-				"--spring.jmx.enabled=false");
+		new SpringApplicationBuilder(SampleConfiguration.class)
+				.web(WebApplicationType.NONE)
+				.run("--props.value=-1", "--spring.jmx.enabled=false");
 	}
 
 	@Test
 	public void testValidatedValueValue() {
-		ValidatedProps validatedProps = new SpringApplicationBuilder(SampleConfiguration.class)
-				.web(WebApplicationType.NONE).run("--props.value=2", "--spring.jmx.enabled=false")
-				.getBean(ValidatedProps.class);
+		ValidatedProps validatedProps = new SpringApplicationBuilder(
+				SampleConfiguration.class).web(WebApplicationType.NONE)
+						.run("--props.value=2", "--spring.jmx.enabled=false")
+						.getBean(ValidatedProps.class);
 		assertThat(validatedProps.getValue()).isEqualTo(2);
 	}
 
 	@Test
 	public void nonValidatedConfigProperties() {
-		new SpringApplicationBuilder(NonValidatedConfiguration.class).web(WebApplicationType.NONE)
-				.run("--spring.jmx.enabled=false");
+		new SpringApplicationBuilder(NonValidatedConfiguration.class)
+				.web(WebApplicationType.NONE).run("--spring.jmx.enabled=false");
 		// simply should not fail
 	}
 
 	@Test(expected = ConfigurationPropertiesBindException.class)
 	public void validatedConfigProperties() {
-		new SpringApplicationBuilder(ValidatedConfiguration.class).web(WebApplicationType.NONE)
-				.run("--spring.jmx.enabled=false");
+		new SpringApplicationBuilder(ValidatedConfiguration.class)
+				.web(WebApplicationType.NONE).run("--spring.jmx.enabled=false");
 
 		fail();
 	}
@@ -85,6 +87,7 @@ public class BindingHandlerAdviseTests {
 		public NonValidatedClass nonValidatedClass() {
 			return new NonValidatedClass();
 		}
+
 	}
 
 	public static class NonValidatedClass {
@@ -99,6 +102,7 @@ public class BindingHandlerAdviseTests {
 		public void setId(String id) {
 			this.id = id;
 		}
+
 	}
 
 	@EnableBinding(Processor.class)
@@ -111,6 +115,7 @@ public class BindingHandlerAdviseTests {
 		public ValidatedClass nonValidatedClass() {
 			return new ValidatedClass();
 		}
+
 	}
 
 	@Validated
@@ -126,6 +131,7 @@ public class BindingHandlerAdviseTests {
 		public void setId(String id) {
 			this.id = id;
 		}
+
 	}
 
 }