Commit 829ab597 authored by Madhura Bhave's avatar Madhura Bhave Committed by Phillip Webb

Use new configuration properties in samples

Update `spring-boot-samples` to use the new configuration properties
support.

See gh-9000
parent 7efbedc0
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -18,9 +18,11 @@ package sample.propertyvalidation; ...@@ -18,9 +18,11 @@ package sample.propertyvalidation;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
@Component @Component
@ConfigurationProperties(prefix = "sample") @ConfigurationProperties(prefix = "sample")
@Validated
public class SampleProperties { public class SampleProperties {
/** /**
......
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -63,7 +63,7 @@ public class SamplePropertyValidationApplicationTests { ...@@ -63,7 +63,7 @@ public class SamplePropertyValidationApplicationTests {
EnvironmentTestUtils.addEnvironment(this.context, "sample.host:xxxxxx", EnvironmentTestUtils.addEnvironment(this.context, "sample.host:xxxxxx",
"sample.port:9090"); "sample.port:9090");
this.thrown.expect(BeanCreationException.class); this.thrown.expect(BeanCreationException.class);
this.thrown.expectMessage("xxxxxx"); this.thrown.expectMessage("Failed to bind properties under 'sample'");
this.context.refresh(); this.context.refresh();
} }
...@@ -71,8 +71,7 @@ public class SamplePropertyValidationApplicationTests { ...@@ -71,8 +71,7 @@ public class SamplePropertyValidationApplicationTests {
public void bindNullHost() { public void bindNullHost() {
this.context.register(SamplePropertyValidationApplication.class); this.context.register(SamplePropertyValidationApplication.class);
this.thrown.expect(BeanCreationException.class); this.thrown.expect(BeanCreationException.class);
this.thrown.expectMessage("null"); this.thrown.expectMessage("Failed to bind properties under 'sample'");
this.thrown.expectMessage("host");
this.context.refresh(); this.context.refresh();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment