Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
2e0481ca
Commit
2e0481ca
authored
May 11, 2021
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless overrides of ConditionalOnProperty#matchIfMissing
Closes gh-26432
parent
05129927
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
15 deletions
+13
-15
AopAutoConfiguration.java
...ramework/boot/autoconfigure/aop/AopAutoConfiguration.java
+1
-2
FlywayAutoConfiguration.java
...rk/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+1
-1
H2ConsoleAutoConfiguration.java
...ork/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java
+2
-2
LiquibaseAutoConfiguration.java
...t/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
+1
-1
TransactionAutoConfiguration.java
...toconfigure/transaction/TransactionAutoConfiguration.java
+2
-3
WebFluxAutoConfiguration.java
.../autoconfigure/web/reactive/WebFluxAutoConfiguration.java
+1
-1
WebMvcAutoConfiguration.java
...ot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
+1
-1
ConditionalOnPropertyTests.java
...t/autoconfigure/condition/ConditionalOnPropertyTests.java
+4
-4
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java
View file @
2e0481ca
...
...
@@ -52,8 +52,7 @@ public class AopAutoConfiguration {
@Configuration
(
proxyBeanMethods
=
false
)
@EnableAspectJAutoProxy
(
proxyTargetClass
=
false
)
@ConditionalOnProperty
(
prefix
=
"spring.aop"
,
name
=
"proxy-target-class"
,
havingValue
=
"false"
,
matchIfMissing
=
false
)
@ConditionalOnProperty
(
prefix
=
"spring.aop"
,
name
=
"proxy-target-class"
,
havingValue
=
"false"
)
static
class
JdkDynamicAutoProxyConfiguration
{
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View file @
2e0481ca
...
...
@@ -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
{
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java
View file @
2e0481ca
/*
* Copyright 2012-202
0
the original author or authors.
* Copyright 2012-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (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
)
@ConditionalOnWebApplication
(
type
=
Type
.
SERVLET
)
@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
)
@EnableConfigurationProperties
(
H2ConsoleProperties
.
class
)
public
class
H2ConsoleAutoConfiguration
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
View file @
2e0481ca
...
...
@@ -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
{
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java
View file @
2e0481ca
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
21
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -88,8 +88,7 @@ public class TransactionAutoConfiguration {
@Configuration
(
proxyBeanMethods
=
false
)
@EnableTransactionManagement
(
proxyTargetClass
=
false
)
@ConditionalOnProperty
(
prefix
=
"spring.aop"
,
name
=
"proxy-target-class"
,
havingValue
=
"false"
,
matchIfMissing
=
false
)
@ConditionalOnProperty
(
prefix
=
"spring.aop"
,
name
=
"proxy-target-class"
,
havingValue
=
"false"
)
public
static
class
JdkDynamicAutoProxyConfiguration
{
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java
View file @
2e0481ca
...
...
@@ -102,7 +102,7 @@ public class WebFluxAutoConfiguration {
@Bean
@ConditionalOnMissingBean
(
HiddenHttpMethodFilter
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.webflux.hiddenmethod.filter"
,
name
=
"enabled"
,
matchIfMissing
=
false
)
@ConditionalOnProperty
(
prefix
=
"spring.webflux.hiddenmethod.filter"
,
name
=
"enabled"
)
public
OrderedHiddenHttpMethodFilter
hiddenHttpMethodFilter
()
{
return
new
OrderedHiddenHttpMethodFilter
();
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
View file @
2e0481ca
...
...
@@ -162,7 +162,7 @@ public class WebMvcAutoConfiguration {
@Bean
@ConditionalOnMissingBean
(
HiddenHttpMethodFilter
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.mvc.hiddenmethod.filter"
,
name
=
"enabled"
,
matchIfMissing
=
false
)
@ConditionalOnProperty
(
prefix
=
"spring.mvc.hiddenmethod.filter"
,
name
=
"enabled"
)
public
OrderedHiddenHttpMethodFilter
hiddenHttpMethodFilter
()
{
return
new
OrderedHiddenHttpMethodFilter
();
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java
View file @
2e0481ca
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
21
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -299,7 +299,7 @@ class ConditionalOnPropertyTests {
@Configuration
(
proxyBeanMethods
=
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
{
@Bean
...
...
@@ -399,7 +399,7 @@ class ConditionalOnPropertyTests {
@Configuration
(
proxyBeanMethods
=
false
)
@ConditionalOnMyFeature
@ConditionalOnProperty
(
prefix
=
"my.other.feature"
,
name
=
"enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
false
)
@ConditionalOnProperty
(
prefix
=
"my.other.feature"
,
name
=
"enabled"
,
havingValue
=
"true"
)
static
class
MetaAnnotationAndDirectAnnotation
{
@Bean
...
...
@@ -411,7 +411,7 @@ class ConditionalOnPropertyTests {
@Retention
(
RetentionPolicy
.
RUNTIME
)
@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
{
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment