Skip to content

Revise usage of @EnableConfigurationProperties #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revise usage of @EnableConfigurationProperties #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions ...d-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,9 @@
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "spring.cloud.util.enabled", matchIfMissing = true)
@AutoConfigureOrder(0)
@EnableConfigurationProperties
@EnableConfigurationProperties(InetUtilsProperties.class)
public class UtilAutoConfiguration {

@Bean
public InetUtilsProperties inetUtilsProperties() {
return new InetUtilsProperties();
}

@Bean
@ConditionalOnMissingBean
public InetUtils inetUtils(InetUtilsProperties properties) {
Expand Down
2 changes: 0 additions & 2 deletions ...ommons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -85,7 +84,6 @@ HasFeatures localFeatures() {
}

@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
public static class Config {

@Autowired(required = false)
Expand Down
2 changes: 0 additions & 2 deletions ...rg/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.junit.jupiter.api.Test;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.health.contributor.CompositeHealthContributor;
import org.springframework.boot.health.contributor.Health;
import org.springframework.boot.health.contributor.HealthContributor;
Expand Down Expand Up @@ -80,7 +79,6 @@ private Status assertHealth(Health health, Status expected) {
}

@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
public static class Config {

@Bean
Expand Down
2 changes: 0 additions & 2 deletions ...context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.List;

import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ConfigurableApplicationContext;
Expand All @@ -37,7 +36,6 @@
*/
@Order(0)
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
public class TestBootstrapConfiguration {

public static List<String> fooSightings = null;
Expand Down
2 changes: 0 additions & 2 deletions ...src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.context.properties.bind.Bindable;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
Expand Down Expand Up @@ -758,7 +757,6 @@ public void bootstrapPropertiesWithActivateOnProfile() {
}

@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
protected static class BareConfiguration {

}
Expand Down
Loading