Remove useless overrides of ConditionalOnProperty#matchIfMissing

Closes gh-26432
pull/26446/head
Stephane Nicoll 4 years ago
parent 0512992791
commit 2e0481ca28

@ -52,8 +52,7 @@ public class AopAutoConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@EnableAspectJAutoProxy(proxyTargetClass = false) @EnableAspectJAutoProxy(proxyTargetClass = false)
@ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false", @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false")
matchIfMissing = false)
static class JdkDynamicAutoProxyConfiguration { static class JdkDynamicAutoProxyConfiguration {
} }

@ -405,7 +405,7 @@ public class FlywayAutoConfiguration {
} }
@ConditionalOnProperty(prefix = "spring.flyway", name = "url", matchIfMissing = false) @ConditionalOnProperty(prefix = "spring.flyway", name = "url")
private static final class FlywayUrlCondition { private static final class FlywayUrlCondition {
} }

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 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.
@ -49,7 +49,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnWebApplication(type = Type.SERVLET)
@ConditionalOnClass(WebServlet.class) @ConditionalOnClass(WebServlet.class)
@ConditionalOnProperty(prefix = "spring.h2.console", name = "enabled", havingValue = "true", matchIfMissing = false) @ConditionalOnProperty(prefix = "spring.h2.console", name = "enabled", havingValue = "true")
@AutoConfigureAfter(DataSourceAutoConfiguration.class) @AutoConfigureAfter(DataSourceAutoConfiguration.class)
@EnableConfigurationProperties(H2ConsoleProperties.class) @EnableConfigurationProperties(H2ConsoleProperties.class)
public class H2ConsoleAutoConfiguration { public class H2ConsoleAutoConfiguration {

@ -158,7 +158,7 @@ public class LiquibaseAutoConfiguration {
} }
@ConditionalOnProperty(prefix = "spring.liquibase", name = "url", matchIfMissing = false) @ConditionalOnProperty(prefix = "spring.liquibase", name = "url")
private static final class LiquibaseUrlCondition { private static final class LiquibaseUrlCondition {
} }

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 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.
@ -88,8 +88,7 @@ public class TransactionAutoConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@EnableTransactionManagement(proxyTargetClass = false) @EnableTransactionManagement(proxyTargetClass = false)
@ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false", @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false")
matchIfMissing = false)
public static class JdkDynamicAutoProxyConfiguration { public static class JdkDynamicAutoProxyConfiguration {
} }

@ -102,7 +102,7 @@ public class WebFluxAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(HiddenHttpMethodFilter.class) @ConditionalOnMissingBean(HiddenHttpMethodFilter.class)
@ConditionalOnProperty(prefix = "spring.webflux.hiddenmethod.filter", name = "enabled", matchIfMissing = false) @ConditionalOnProperty(prefix = "spring.webflux.hiddenmethod.filter", name = "enabled")
public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() { public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() {
return new OrderedHiddenHttpMethodFilter(); return new OrderedHiddenHttpMethodFilter();
} }

@ -162,7 +162,7 @@ public class WebMvcAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(HiddenHttpMethodFilter.class) @ConditionalOnMissingBean(HiddenHttpMethodFilter.class)
@ConditionalOnProperty(prefix = "spring.mvc.hiddenmethod.filter", name = "enabled", matchIfMissing = false) @ConditionalOnProperty(prefix = "spring.mvc.hiddenmethod.filter", name = "enabled")
public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() { public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() {
return new OrderedHiddenHttpMethodFilter(); return new OrderedHiddenHttpMethodFilter();
} }

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 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.
@ -299,7 +299,7 @@ class ConditionalOnPropertyTests {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
// i.e ${simple.myProperty:false} // i.e ${simple.myProperty:false}
@ConditionalOnProperty(prefix = "simple", name = "my-property", havingValue = "true", matchIfMissing = false) @ConditionalOnProperty(prefix = "simple", name = "my-property", havingValue = "true")
static class DisabledIfNotConfiguredOtherwiseConfig { static class DisabledIfNotConfiguredOtherwiseConfig {
@Bean @Bean
@ -399,7 +399,7 @@ class ConditionalOnPropertyTests {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnMyFeature @ConditionalOnMyFeature
@ConditionalOnProperty(prefix = "my.other.feature", name = "enabled", havingValue = "true", matchIfMissing = false) @ConditionalOnProperty(prefix = "my.other.feature", name = "enabled", havingValue = "true")
static class MetaAnnotationAndDirectAnnotation { static class MetaAnnotationAndDirectAnnotation {
@Bean @Bean
@ -411,7 +411,7 @@ class ConditionalOnPropertyTests {
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@ConditionalOnProperty(prefix = "my.feature", name = "enabled", havingValue = "true", matchIfMissing = false) @ConditionalOnProperty(prefix = "my.feature", name = "enabled", havingValue = "true")
@interface ConditionalOnMyFeature { @interface ConditionalOnMyFeature {
} }

Loading…
Cancel
Save