Skip to content

Commit a294559

Browse files
onobcCorneil du Plessis
authored and
Corneil du Plessis
committed
Use AutoConfiguration.imports for all auto-configs
Fix from PR review * Add back missing nested @configuration annotations
1 parent 2171559 commit a294559

File tree

33 files changed

+69
-64
lines changed

33 files changed

+69
-64
lines changed

spring-cloud-dataflow-autoconfigure/src/main/java/org/springframework/cloud/dataflow/autoconfigure/StreamDefinitionServiceAutoConfiguration.java

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.cloud.dataflow.autoconfigure;
1818

19+
import org.springframework.boot.autoconfigure.AutoConfiguration;
1920
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2021
import org.springframework.cloud.dataflow.core.DefaultStreamDefinitionService;
2122
import org.springframework.cloud.dataflow.core.StreamDefinitionService;
@@ -26,6 +27,7 @@
2627
*
2728
* @author Ilayaperumal Gopinathan
2829
*/
30+
@AutoConfiguration
2931
public class StreamDefinitionServiceAutoConfiguration {
3032

3133

spring-cloud-dataflow-autoconfigure/src/main/java/org/springframework/cloud/dataflow/autoconfigure/local/LocalDataFlowServerAutoConfiguration.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,22 @@
1919
import java.util.HashMap;
2020
import java.util.Map;
2121

22+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2223
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2324
import org.springframework.cloud.dataflow.server.config.DataFlowControllerAutoConfiguration;
2425
import org.springframework.cloud.deployer.resource.docker.DockerResourceLoader;
2526
import org.springframework.cloud.deployer.resource.maven.MavenProperties;
2627
import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader;
2728
import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
2829
import org.springframework.context.annotation.Bean;
29-
import org.springframework.context.annotation.Configuration;
3030
import org.springframework.core.io.ResourceLoader;
31+
3132
/**
3233
* Auto-configuration for local dataflow server.
3334
*
3435
* @author Janne Valkealahti
3536
*/
36-
@Configuration
37+
@AutoConfiguration
3738
@AutoConfigureBefore(DataFlowControllerAutoConfiguration.class)
3839
public class LocalDataFlowServerAutoConfiguration {
3940

spring-cloud-dataflow-autoconfigure/src/main/java/org/springframework/cloud/dataflow/autoconfigure/local/LocalSchedulerAutoConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.Collections;
1919
import java.util.List;
2020

21+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2122
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2223
import org.springframework.cloud.dataflow.server.config.OnLocalPlatform;
2324
import org.springframework.cloud.dataflow.server.config.features.SchedulerConfiguration;
@@ -26,13 +27,12 @@
2627
import org.springframework.cloud.deployer.spi.scheduler.Scheduler;
2728
import org.springframework.context.annotation.Bean;
2829
import org.springframework.context.annotation.Conditional;
29-
import org.springframework.context.annotation.Configuration;
3030

3131
/**
3232
* @author Mark Pollack
3333
*/
34-
@Configuration
35-
@Conditional({ OnLocalPlatform.class, SchedulerConfiguration.SchedulerConfigurationPropertyChecker.class })
34+
@AutoConfiguration
35+
@Conditional({OnLocalPlatform.class, SchedulerConfiguration.SchedulerConfigurationPropertyChecker.class})
3636
public class LocalSchedulerAutoConfiguration {
3737

3838
@Bean
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2-
org.springframework.cloud.dataflow.autoconfigure.local.LocalDataFlowServerAutoConfiguration, \
3-
org.springframework.cloud.dataflow.autoconfigure.local.LocalSchedulerAutoConfiguration, \
4-
org.springframework.cloud.dataflow.autoconfigure.StreamDefinitionServiceAutoConfiguration
51

62
org.springframework.context.ApplicationListener=\
73
org.springframework.cloud.dataflow.autoconfigure.local.ProfileApplicationListener
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
org.springframework.cloud.dataflow.autoconfigure.StreamDefinitionServiceAutoConfiguration
2+
org.springframework.cloud.dataflow.autoconfigure.local.LocalDataFlowServerAutoConfiguration
3+
org.springframework.cloud.dataflow.autoconfigure.local.LocalSchedulerAutoConfiguration

spring-cloud-dataflow-configuration-metadata/src/main/java/org/springframework/cloud/dataflow/configuration/metadata/ApplicationConfigurationMetadataResolverAutoConfiguration.java

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.cloud.dataflow.configuration.metadata;
1818

19+
import org.springframework.boot.autoconfigure.AutoConfiguration;
1920
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2021
import org.springframework.cloud.dataflow.configuration.metadata.container.ContainerImageMetadataResolver;
2122
import org.springframework.cloud.dataflow.configuration.metadata.container.DefaultContainerImageMetadataResolver;
@@ -29,6 +30,7 @@
2930
* @author Eric Bottard
3031
* @author Christian Tzolov
3132
*/
33+
@AutoConfiguration
3234
@Configuration
3335
public class ApplicationConfigurationMetadataResolverAutoConfiguration {
3436

spring-cloud-dataflow-configuration-metadata/src/main/resources/META-INF/spring.factories

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.springframework.cloud.dataflow.configuration.metadata.ApplicationConfigurationMetadataResolverAutoConfiguration

spring-cloud-dataflow-container-registry/src/main/java/org/springframework/cloud/dataflow/container/registry/ContainerRegistryAutoConfiguration.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.slf4j.LoggerFactory;
2525

2626
import org.springframework.beans.factory.annotation.Value;
27+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2829
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2930
import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -44,8 +45,9 @@
4445
* @author Christian Tzolov
4546
* @author Ilayaperumal Gopinathan
4647
*/
48+
@AutoConfiguration
4749
@Configuration
48-
@EnableConfigurationProperties({ ContainerRegistryProperties.class })
50+
@EnableConfigurationProperties({ContainerRegistryProperties.class})
4951
public class ContainerRegistryAutoConfiguration {
5052

5153
private static final Logger logger = LoggerFactory.getLogger(ContainerRegistryAutoConfiguration.class);

spring-cloud-dataflow-container-registry/src/main/resources/META-INF/spring.factories

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.springframework.cloud.dataflow.container.registry.ContainerRegistryAutoConfiguration

spring-cloud-dataflow-platform-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/CloudFoundryDataFlowServerConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
import reactor.core.publisher.Hooks;
2020

21+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2122
import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
2223
import org.springframework.boot.cloud.CloudPlatform;
2324
import org.springframework.boot.context.properties.ConfigurationProperties;
2425
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
2526
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeploymentProperties;
2627
import org.springframework.context.annotation.Bean;
27-
import org.springframework.context.annotation.Configuration;
2828
import org.springframework.context.event.ContextRefreshedEvent;
2929
import org.springframework.context.event.EventListener;
3030

@@ -34,8 +34,8 @@
3434
* @author Eric Bottard
3535
* @author Corneil du Plessis
3636
*/
37+
@AutoConfiguration
3738
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
38-
@Configuration(proxyBeanMethods = false)
3939
public class CloudFoundryDataFlowServerConfiguration {
4040
private CloudFoundryServerConfigurationProperties cloudFoundryServerConfigurationProperties = new CloudFoundryServerConfigurationProperties();
4141
@Bean

spring-cloud-dataflow-platform-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/CloudFoundryTaskPlatformAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717

1818
import java.util.Optional;
1919

20+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2021
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2122
import org.springframework.cloud.dataflow.core.TaskPlatform;
2223
import org.springframework.cloud.dataflow.server.config.CloudProfileProvider;
2324
import org.springframework.cloud.dataflow.server.config.features.ConditionalOnTasksEnabled;
2425
import org.springframework.context.annotation.Bean;
25-
import org.springframework.context.annotation.Configuration;
2626
import org.springframework.core.env.Environment;
2727

2828
/**
2929
* Creates TaskPlatform implementations to launch/schedule tasks on Cloud Foundry.
3030
* @author Mark Pollack
3131
* @author David Turanski
3232
*/
33-
@Configuration
33+
@AutoConfiguration
3434
@ConditionalOnTasksEnabled
3535
@EnableConfigurationProperties(CloudFoundryPlatformProperties.class)
3636
public class CloudFoundryTaskPlatformAutoConfiguration {

spring-cloud-dataflow-platform-cloudfoundry/src/main/resources/META-INF/spring.factories

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
org.springframework.cloud.dataflow.server.config.cloudfoundry.CloudFoundryDataFlowServerConfiguration
2+
org.springframework.cloud.dataflow.server.config.cloudfoundry.CloudFoundryTaskPlatformAutoConfiguration
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
org.springframework.cloud.dataflow.server.config.kubernetes.KubernetesSchedulerAutoConfiguration
2+
org.springframework.cloud.dataflow.server.config.kubernetes.KubernetesTaskPlatformAutoConfiguration

spring-cloud-dataflow-rest-client/src/main/java/org/springframework/cloud/dataflow/rest/client/config/DataFlowClientAutoConfiguration.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.commons.logging.LogFactory;
2727

2828
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2930
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3031
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3132
import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
@@ -60,6 +61,7 @@
6061
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
6162
import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
6263
import org.springframework.security.oauth2.core.AuthorizationGrantType;
64+
import org.springframework.util.ObjectUtils;
6365
import org.springframework.util.StringUtils;
6466
import org.springframework.web.client.RestTemplate;
6567

@@ -68,7 +70,7 @@
6870
* @author Vinicius Carvalho
6971
* @author Gunnar Hillert
7072
*/
71-
@Configuration
73+
@AutoConfiguration
7274
@EnableConfigurationProperties(DataFlowClientProperties.class)
7375
public class DataFlowClientAutoConfiguration {
7476

@@ -111,8 +113,8 @@ else if (StringUtils.hasText(this.properties.getAuthentication().getClientId()))
111113
clientRegistrations, this.properties.getAuthentication().getClientId()));
112114
logger.debug("Configured OAuth2 Client Credentials for accessing the Data Flow Server");
113115
}
114-
else if(!StringUtils.isEmpty(properties.getAuthentication().getBasic().getUsername()) &&
115-
!StringUtils.isEmpty(properties.getAuthentication().getBasic().getPassword())){
116+
else if(!ObjectUtils.isEmpty(properties.getAuthentication().getBasic().getUsername()) &&
117+
!ObjectUtils.isEmpty(properties.getAuthentication().getBasic().getPassword())){
116118
httpClientConfigurer.basicAuthCredentials(properties.getAuthentication().getBasic().getUsername(),
117119
properties.getAuthentication().getBasic().getPassword());
118120
template.setRequestFactory(httpClientConfigurer.buildClientHttpRequestFactory());
@@ -141,7 +143,7 @@ public StreamBuilder streamBuilder(DataFlowOperations dataFlowOperations){
141143
}
142144

143145
@ConditionalOnProperty(prefix = DataFlowPropertyKeys.PREFIX + "client.authentication", name = "client-id")
144-
@Configuration
146+
@Configuration(proxyBeanMethods = false)
145147
static class ClientCredentialsConfiguration {
146148

147149
@Bean

spring-cloud-dataflow-rest-client/src/main/resources/META-INF/spring.factories

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.springframework.cloud.dataflow.rest.client.config.DataFlowClientAutoConfiguration

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowControllerAutoConfiguration.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.beans.factory.ObjectProvider;
3030
import org.springframework.boot.actuate.info.BuildInfoContributor;
3131
import org.springframework.boot.actuate.info.GitInfoContributor;
32+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3233
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3334
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3435
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -160,8 +161,8 @@
160161
* @author Christian Tzolov
161162
* @author Corneil du Plessis
162163
*/
164+
@AutoConfiguration
163165
@SuppressWarnings("all")
164-
@Configuration
165166
@Import(CompletionConfiguration.class)
166167
@ConditionalOnBean({EnableDataFlowServerConfiguration.Marker.class})
167168
@EnableConfigurationProperties({FeaturesProperties.class, VersionInfoProperties.class,
@@ -222,8 +223,7 @@ public RestControllerAdvice restControllerAdvice() {
222223
}
223224

224225

225-
226-
@Configuration
226+
@Configuration(proxyBeanMethods = false)
227227
public static class AppRegistryConfiguration {
228228

229229
@Bean
@@ -267,7 +267,7 @@ public AppRegistrationAssemblerProvider appRegistryAssemblerProvider() {
267267
}
268268
}
269269

270-
@Configuration
270+
@Configuration(proxyBeanMethods = false)
271271
@ConditionalOnTasksEnabled
272272
public static class TaskEnabledConfiguration {
273273

@@ -392,7 +392,7 @@ public TaskCtrController tasksCtrController(ApplicationConfigurationMetadataReso
392392

393393
}
394394

395-
@Configuration
395+
@Configuration(proxyBeanMethods = false)
396396
@ConditionalOnStreamsEnabled
397397
@EnableConfigurationProperties(SkipperClientProperties.class)
398398
public static class StreamEnabledConfiguration {
@@ -534,8 +534,9 @@ public TaskSchedulerController taskSchedulerController(SchedulerService schedule
534534
return new TaskSchedulerController(schedulerService);
535535
}
536536

537-
@Configuration
537+
@Configuration(proxyBeanMethods = false)
538538
public static class AuditingConfiguration {
539+
539540
@Bean
540541
public AuditRecordService auditRecordService(AuditRecordRepository auditRecordRepository,
541542
ObjectMapper objectMapper) {
@@ -549,7 +550,7 @@ public AuditRecordController auditController(AuditRecordService auditRecordServi
549550
}
550551
}
551552

552-
@Configuration
553+
@Configuration(proxyBeanMethods = false)
553554
public static class SecurityConfiguration {
554555

555556
@Bean

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
package org.springframework.cloud.dataflow.server.config;
1818

19+
import org.springframework.boot.autoconfigure.AutoConfiguration;
1920
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2021
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2122
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2223
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
23-
import org.springframework.context.annotation.Configuration;
2424
import org.springframework.context.annotation.Import;
2525

2626
/**
2727
* Auto-configuration for dataflow server.
2828
*
2929
* @author Janne Valkealahti
3030
*/
31-
@Configuration
31+
@AutoConfiguration
3232
@AutoConfigureBefore({JacksonAutoConfiguration.class})
3333
@ConditionalOnBean(EnableDataFlowServerConfiguration.Marker.class)
3434
@Import(DataFlowServerConfiguration.class)

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataflowAsyncAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
24+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2425
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2526
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2627
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2728
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
2829
import org.springframework.boot.task.TaskExecutorBuilder;
2930
import org.springframework.cloud.dataflow.core.DataFlowPropertyKeys;
3031
import org.springframework.context.annotation.Bean;
31-
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.scheduling.annotation.AsyncConfigurer;
3333
import org.springframework.scheduling.annotation.EnableAsync;
3434

@@ -41,7 +41,7 @@
4141
*
4242
* @author Tobias Soloschenko
4343
*/
44-
@Configuration(proxyBeanMethods = false)
44+
@AutoConfiguration
4545
@ConditionalOnBean({EnableDataFlowServerConfiguration.Marker.class})
4646
@ConditionalOnProperty(prefix = ASYNC_PROPS_PREFIX, name = "enabled", havingValue = "true")
4747
@AutoConfigureAfter(TaskExecutionAutoConfiguration.class)

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/SpringDocAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import org.springdoc.core.SwaggerUiConfigProperties;
2626
import org.springdoc.webmvc.ui.SwaggerConfig;
2727

28+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2829
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2930
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3031
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3132
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3233
import org.springframework.boot.web.servlet.FilterRegistrationBean;
3334
import org.springframework.cloud.dataflow.server.support.SpringDocJsonDecodeFilter;
3435
import org.springframework.context.annotation.Bean;
35-
import org.springframework.context.annotation.Configuration;
3636
import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
3737

3838
/**
@@ -42,7 +42,7 @@
4242
*
4343
* @author Tobias Soloschenko
4444
*/
45-
@Configuration(proxyBeanMethods = false)
45+
@AutoConfiguration
4646
@ConditionalOnClass({ SpringDocConfigProperties.class, SwaggerUiConfigProperties.class })
4747
@ConditionalOnBean({ SpringDocConfigProperties.class, SwaggerUiConfigProperties.class })
4848
@AutoConfigureAfter({ SpringDocConfiguration.class, SwaggerConfig.class })

spring-cloud-dataflow-server-core/src/main/resources/META-INF/spring.factories

-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ org.springframework.boot.env.EnvironmentPostProcessor=\
22
org.springframework.cloud.dataflow.server.config.DefaultEnvironmentPostProcessor,\
33
org.springframework.cloud.dataflow.server.config.MetricsReplicationEnvironmentPostProcessor
44

5-
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
6-
org.springframework.cloud.dataflow.server.config.DataFlowServerAutoConfiguration,\
7-
org.springframework.cloud.dataflow.server.config.DataFlowControllerAutoConfiguration, \
8-
org.springframework.cloud.dataflow.server.config.SpringDocAutoConfiguration, \
9-
org.springframework.cloud.dataflow.server.config.DataflowAsyncAutoConfiguration
105

116
org.springframework.context.ApplicationContextInitializer=\
127
org.springframework.cloud.dataflow.common.flyway.FlywayVendorReplacingApplicationContextInitializer
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
org.springframework.cloud.dataflow.server.config.DataFlowControllerAutoConfiguration
2+
org.springframework.cloud.dataflow.server.config.DataFlowServerAutoConfiguration
3+
org.springframework.cloud.dataflow.server.config.DataflowAsyncAutoConfiguration
4+
org.springframework.cloud.dataflow.server.config.SpringDocAutoConfiguration

0 commit comments

Comments
 (0)