Commit 35d7fccb authored by Madhura Bhave's avatar Madhura Bhave

Update samples to use configuration properties scanning

Closes gh-12602
parent 8f693a02
...@@ -18,10 +18,8 @@ package sample.actuator.noweb; ...@@ -18,10 +18,8 @@ package sample.actuator.noweb;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@SpringBootApplication @SpringBootApplication
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleActuatorNoWebApplication { public class SampleActuatorNoWebApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
...@@ -20,11 +20,9 @@ import org.springframework.boot.SpringApplication; ...@@ -20,11 +20,9 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@SpringBootApplication @SpringBootApplication
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleActuatorApplication { public class SampleActuatorApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
...@@ -20,7 +20,6 @@ import java.util.function.Consumer; ...@@ -20,7 +20,6 @@ import java.util.function.Consumer;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlow;
...@@ -31,7 +30,6 @@ import org.springframework.integration.file.FileReadingMessageSource; ...@@ -31,7 +30,6 @@ import org.springframework.integration.file.FileReadingMessageSource;
import org.springframework.integration.file.FileWritingMessageHandler; import org.springframework.integration.file.FileWritingMessageHandler;
@SpringBootApplication @SpringBootApplication
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleIntegrationApplication { public class SampleIntegrationApplication {
private final ServiceProperties serviceProperties; private final ServiceProperties serviceProperties;
......
...@@ -21,7 +21,6 @@ import java.util.function.Consumer; ...@@ -21,7 +21,6 @@ import java.util.function.Consumer;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.DirectChannel;
...@@ -42,7 +41,6 @@ public class SampleParentContextApplication { ...@@ -42,7 +41,6 @@ public class SampleParentContextApplication {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration @EnableAutoConfiguration
@EnableConfigurationProperties(ServiceProperties.class)
protected static class Parent { protected static class Parent {
private final ServiceProperties serviceProperties; private final ServiceProperties serviceProperties;
......
...@@ -17,10 +17,8 @@ ...@@ -17,10 +17,8 @@
package sample.propertyvalidation; 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.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@Component
@ConfigurationProperties(prefix = "sample") @ConfigurationProperties(prefix = "sample")
@Validated @Validated
public class SampleProperties { public class SampleProperties {
......
...@@ -19,11 +19,9 @@ package sample.simple; ...@@ -19,11 +19,9 @@ package sample.simple;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@Validated @Validated
@Component
@ConfigurationProperties(prefix = "sample") @ConfigurationProperties(prefix = "sample")
public class SampleConfigurationProperties { public class SampleConfigurationProperties {
......
...@@ -17,14 +17,12 @@ ...@@ -17,14 +17,12 @@
package sample.test.service; package sample.test.service;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/** /**
* Properties for the service. * Properties for the service.
* *
* @author Phillip Webb * @author Phillip Webb
*/ */
@Component
@ConfigurationProperties @ConfigurationProperties
public class ServiceProperties { public class ServiceProperties {
......
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