SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgraded to 2.1.4.s-c-build

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-04-10 19:26:40 +02:00
parent 22172f0a25
commit 6fbfa60401
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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>

1
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java
View File

@@ -38,7 +38,6 @@ public class BindingHandlerAdvise implements ConfigurationPropertiesBindHandlerA
private final Map<ConfigurationPropertyName, ConfigurationPropertyName> mappings;
BindingHandlerAdvise(
Map<ConfigurationPropertyName, ConfigurationPropertyName> additionalMappings) {
this.mappings = new LinkedHashMap<>();

24
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java
View File

@@ -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;
}
}
}