Browse Source

Update samples to use configuration properties scanning

Closes gh-12602
pull/16294/head
Madhura Bhave 7 years ago
parent
commit
35d7fccb33
  1. 2
      spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/SampleActuatorNoWebApplication.java
  2. 2
      spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java
  3. 2
      spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleIntegrationApplication.java
  4. 2
      spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java
  5. 2
      spring-boot-samples/spring-boot-sample-property-validation/src/main/java/sample/propertyvalidation/SampleProperties.java
  6. 2
      spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleConfigurationProperties.java
  7. 2
      spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/service/ServiceProperties.java

2
spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/SampleActuatorNoWebApplication.java

@ -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.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@SpringBootApplication
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleActuatorNoWebApplication {
public static void main(String[] args) {

2
spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java

@ -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.HealthIndicator;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@SpringBootApplication
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleActuatorApplication {
public static void main(String[] args) {

2
spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleIntegrationApplication.java

@ -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.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.integration.channel.DirectChannel;
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;
@SpringBootApplication
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleIntegrationApplication {
private final ServiceProperties serviceProperties;

2
spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java

@ -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.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.channel.DirectChannel;
@ -42,7 +41,6 @@ public class SampleParentContextApplication { @@ -42,7 +41,6 @@ public class SampleParentContextApplication {
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableConfigurationProperties(ServiceProperties.class)
protected static class Parent {
private final ServiceProperties serviceProperties;

2
spring-boot-samples/spring-boot-sample-property-validation/src/main/java/sample/propertyvalidation/SampleProperties.java

@ -17,10 +17,8 @@ @@ -17,10 +17,8 @@
package sample.propertyvalidation;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
@Component
@ConfigurationProperties(prefix = "sample")
@Validated
public class SampleProperties {

2
spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleConfigurationProperties.java

@ -19,11 +19,9 @@ package sample.simple; @@ -19,11 +19,9 @@ package sample.simple;
import javax.validation.constraints.NotNull;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
@Validated
@Component
@ConfigurationProperties(prefix = "sample")
public class SampleConfigurationProperties {

2
spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/service/ServiceProperties.java

@ -17,14 +17,12 @@ @@ -17,14 +17,12 @@
package sample.test.service;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
* Properties for the service.
*
* @author Phillip Webb
*/
@Component
@ConfigurationProperties
public class ServiceProperties {

Loading…
Cancel
Save