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
c1005102
Commit
c1005102
authored
Mar 23, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
Mar 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove value in @ConditionalOnMissingBean if possible
See gh-12604
parent
5c04e7dd
Changes
27
Show whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
33 additions
and
33 deletions
+33
-33
MetricsAutoConfiguration.java
...tuate/autoconfigure/metrics/MetricsAutoConfiguration.java
+1
-1
AtlasMetricsExportAutoConfiguration.java
...ics/export/atlas/AtlasMetricsExportAutoConfiguration.java
+1
-1
InfluxMetricsExportAutoConfiguration.java
...s/export/influx/InfluxMetricsExportAutoConfiguration.java
+1
-1
SimpleMetricsExportAutoConfiguration.java
...s/export/simple/SimpleMetricsExportAutoConfiguration.java
+1
-1
StatsdMetricsExportAutoConfiguration.java
...s/export/statsd/StatsdMetricsExportAutoConfiguration.java
+1
-1
WavefrontMetricsExportAutoConfiguration.java
...rt/wavefront/WavefrontMetricsExportAutoConfiguration.java
+1
-1
TomcatMetricsAutoConfiguration.java
...re/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java
+1
-1
RabbitAutoConfiguration.java
...work/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
+2
-2
PersistenceExceptionTranslationAutoConfiguration.java
...dao/PersistenceExceptionTranslationAutoConfiguration.java
+1
-1
CassandraReactiveDataAutoConfiguration.java
...ata/cassandra/CassandraReactiveDataAutoConfiguration.java
+1
-1
RedisAutoConfiguration.java
...boot/autoconfigure/data/redis/RedisAutoConfiguration.java
+1
-1
GsonAutoConfiguration.java
...mework/boot/autoconfigure/gson/GsonAutoConfiguration.java
+2
-2
JacksonAutoConfiguration.java
.../boot/autoconfigure/jackson/JacksonAutoConfiguration.java
+3
-3
JmxAutoConfiguration.java
...ramework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
+1
-1
JooqAutoConfiguration.java
...mework/boot/autoconfigure/jooq/JooqAutoConfiguration.java
+1
-1
KafkaAutoConfiguration.java
...work/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
+1
-1
MustacheAutoConfiguration.java
...oot/autoconfigure/mustache/MustacheAutoConfiguration.java
+1
-1
MustacheReactiveWebConfiguration.java
...oconfigure/mustache/MustacheReactiveWebConfiguration.java
+1
-1
MustacheServletWebConfiguration.java
...toconfigure/mustache/MustacheServletWebConfiguration.java
+1
-1
JpaBaseConfiguration.java
...work/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
+1
-1
SecurityDataConfiguration.java
...oot/autoconfigure/security/SecurityDataConfiguration.java
+1
-1
SendGridAutoConfiguration.java
...oot/autoconfigure/sendgrid/SendGridAutoConfiguration.java
+1
-1
ThymeleafAutoConfiguration.java
...t/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+1
-1
NarayanaJtaConfiguration.java
...toconfigure/transaction/jta/NarayanaJtaConfiguration.java
+1
-1
HttpEncodingAutoConfiguration.java
...oconfigure/web/servlet/HttpEncodingAutoConfiguration.java
+1
-1
ErrorMvcAutoConfiguration.java
...onfigure/web/servlet/error/ErrorMvcAutoConfiguration.java
+1
-1
RestDocsAutoConfiguration.java
...est/autoconfigure/restdocs/RestDocsAutoConfiguration.java
+3
-3
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java
View file @
c1005102
...
@@ -115,7 +115,7 @@ public class MetricsAutoConfiguration {
...
@@ -115,7 +115,7 @@ public class MetricsAutoConfiguration {
@ConditionalOnClass
(
name
=
{
"ch.qos.logback.classic.LoggerContext"
,
@ConditionalOnClass
(
name
=
{
"ch.qos.logback.classic.LoggerContext"
,
"org.slf4j.LoggerFactory"
})
"org.slf4j.LoggerFactory"
})
@Conditional
(
LogbackLoggingCondition
.
class
)
@Conditional
(
LogbackLoggingCondition
.
class
)
@ConditionalOnMissingBean
(
LogbackMetrics
.
class
)
@ConditionalOnMissingBean
@ConditionalOnProperty
(
value
=
"management.metrics.binders.logback.enabled"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
value
=
"management.metrics.binders.logback.enabled"
,
matchIfMissing
=
true
)
public
LogbackMetrics
logbackMetrics
()
{
public
LogbackMetrics
logbackMetrics
()
{
return
new
LogbackMetrics
();
return
new
LogbackMetrics
();
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java
View file @
c1005102
...
@@ -52,7 +52,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -52,7 +52,7 @@ import org.springframework.context.annotation.Configuration;
public
class
AtlasMetricsExportAutoConfiguration
{
public
class
AtlasMetricsExportAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
AtlasConfig
.
class
)
@ConditionalOnMissingBean
public
AtlasConfig
atlasConfig
(
AtlasProperties
atlasProperties
)
{
public
AtlasConfig
atlasConfig
(
AtlasProperties
atlasProperties
)
{
return
new
AtlasPropertiesConfigAdapter
(
atlasProperties
);
return
new
AtlasPropertiesConfigAdapter
(
atlasProperties
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java
View file @
c1005102
...
@@ -51,7 +51,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -51,7 +51,7 @@ import org.springframework.context.annotation.Configuration;
public
class
InfluxMetricsExportAutoConfiguration
{
public
class
InfluxMetricsExportAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
InfluxConfig
.
class
)
@ConditionalOnMissingBean
public
InfluxConfig
influxConfig
(
InfluxProperties
influxProperties
)
{
public
InfluxConfig
influxConfig
(
InfluxProperties
influxProperties
)
{
return
new
InfluxPropertiesConfigAdapter
(
influxProperties
);
return
new
InfluxPropertiesConfigAdapter
(
influxProperties
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfiguration.java
View file @
c1005102
...
@@ -56,7 +56,7 @@ public class SimpleMetricsExportAutoConfiguration {
...
@@ -56,7 +56,7 @@ public class SimpleMetricsExportAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
SimpleConfig
.
class
)
@ConditionalOnMissingBean
public
SimpleConfig
simpleConfig
(
SimpleProperties
simpleProperties
)
{
public
SimpleConfig
simpleConfig
(
SimpleProperties
simpleProperties
)
{
return
new
SimplePropertiesConfigAdapter
(
simpleProperties
);
return
new
SimplePropertiesConfigAdapter
(
simpleProperties
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java
View file @
c1005102
...
@@ -53,7 +53,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -53,7 +53,7 @@ import org.springframework.context.annotation.Configuration;
public
class
StatsdMetricsExportAutoConfiguration
{
public
class
StatsdMetricsExportAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
StatsdConfig
.
class
)
@ConditionalOnMissingBean
public
StatsdConfig
statsdConfig
(
StatsdProperties
statsdProperties
)
{
public
StatsdConfig
statsdConfig
(
StatsdProperties
statsdProperties
)
{
return
new
StatsdPropertiesConfigAdapter
(
statsdProperties
);
return
new
StatsdPropertiesConfigAdapter
(
statsdProperties
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java
View file @
c1005102
...
@@ -51,7 +51,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -51,7 +51,7 @@ import org.springframework.context.annotation.Configuration;
public
class
WavefrontMetricsExportAutoConfiguration
{
public
class
WavefrontMetricsExportAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
WavefrontConfig
.
class
)
@ConditionalOnMissingBean
public
WavefrontConfig
wavefrontConfig
(
WavefrontProperties
props
)
{
public
WavefrontConfig
wavefrontConfig
(
WavefrontProperties
props
)
{
return
new
WavefrontPropertiesConfigAdapter
(
props
);
return
new
WavefrontPropertiesConfigAdapter
(
props
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java
View file @
c1005102
...
@@ -45,7 +45,7 @@ public class TomcatMetricsAutoConfiguration {
...
@@ -45,7 +45,7 @@ public class TomcatMetricsAutoConfiguration {
private
volatile
Context
context
;
private
volatile
Context
context
;
@Bean
@Bean
@ConditionalOnMissingBean
(
TomcatMetrics
.
class
)
@ConditionalOnMissingBean
public
TomcatMetrics
tomcatMetrics
()
{
public
TomcatMetrics
tomcatMetrics
()
{
return
new
TomcatMetrics
(
this
.
context
==
null
?
null
:
this
.
context
.
getManager
(),
return
new
TomcatMetrics
(
this
.
context
==
null
?
null
:
this
.
context
.
getManager
(),
Collections
.
emptyList
());
Collections
.
emptyList
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
View file @
c1005102
...
@@ -167,7 +167,7 @@ public class RabbitAutoConfiguration {
...
@@ -167,7 +167,7 @@ public class RabbitAutoConfiguration {
@Bean
@Bean
@ConditionalOnSingleCandidate
(
ConnectionFactory
.
class
)
@ConditionalOnSingleCandidate
(
ConnectionFactory
.
class
)
@ConditionalOnMissingBean
(
RabbitTemplate
.
class
)
@ConditionalOnMissingBean
public
RabbitTemplate
rabbitTemplate
(
ConnectionFactory
connectionFactory
)
{
public
RabbitTemplate
rabbitTemplate
(
ConnectionFactory
connectionFactory
)
{
PropertyMapper
map
=
PropertyMapper
.
get
();
PropertyMapper
map
=
PropertyMapper
.
get
();
RabbitTemplate
template
=
new
RabbitTemplate
(
connectionFactory
);
RabbitTemplate
template
=
new
RabbitTemplate
(
connectionFactory
);
...
@@ -213,7 +213,7 @@ public class RabbitAutoConfiguration {
...
@@ -213,7 +213,7 @@ public class RabbitAutoConfiguration {
@Bean
@Bean
@ConditionalOnSingleCandidate
(
ConnectionFactory
.
class
)
@ConditionalOnSingleCandidate
(
ConnectionFactory
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.rabbitmq"
,
name
=
"dynamic"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
prefix
=
"spring.rabbitmq"
,
name
=
"dynamic"
,
matchIfMissing
=
true
)
@ConditionalOnMissingBean
(
AmqpAdmin
.
class
)
@ConditionalOnMissingBean
public
AmqpAdmin
amqpAdmin
(
ConnectionFactory
connectionFactory
)
{
public
AmqpAdmin
amqpAdmin
(
ConnectionFactory
connectionFactory
)
{
return
new
RabbitAdmin
(
connectionFactory
);
return
new
RabbitAdmin
(
connectionFactory
);
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java
View file @
c1005102
...
@@ -37,7 +37,7 @@ import org.springframework.dao.annotation.PersistenceExceptionTranslationPostPro
...
@@ -37,7 +37,7 @@ import org.springframework.dao.annotation.PersistenceExceptionTranslationPostPro
public
class
PersistenceExceptionTranslationAutoConfiguration
{
public
class
PersistenceExceptionTranslationAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
PersistenceExceptionTranslationPostProcessor
.
class
)
@ConditionalOnMissingBean
@ConditionalOnProperty
(
prefix
=
"spring.dao.exceptiontranslation"
,
name
=
"enabled"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
prefix
=
"spring.dao.exceptiontranslation"
,
name
=
"enabled"
,
matchIfMissing
=
true
)
public
static
PersistenceExceptionTranslationPostProcessor
persistenceExceptionTranslationPostProcessor
(
public
static
PersistenceExceptionTranslationPostProcessor
persistenceExceptionTranslationPostProcessor
(
Environment
environment
)
{
Environment
environment
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java
View file @
c1005102
...
@@ -49,7 +49,7 @@ import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessio
...
@@ -49,7 +49,7 @@ import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessio
public
class
CassandraReactiveDataAutoConfiguration
{
public
class
CassandraReactiveDataAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
ReactiveSession
.
class
)
@ConditionalOnMissingBean
public
ReactiveSession
reactiveCassandraSession
(
Session
session
)
{
public
ReactiveSession
reactiveCassandraSession
(
Session
session
)
{
return
new
DefaultBridgedReactiveSession
(
session
);
return
new
DefaultBridgedReactiveSession
(
session
);
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java
View file @
c1005102
...
@@ -59,7 +59,7 @@ public class RedisAutoConfiguration {
...
@@ -59,7 +59,7 @@ public class RedisAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
StringRedisTemplate
.
class
)
@ConditionalOnMissingBean
public
StringRedisTemplate
stringRedisTemplate
(
public
StringRedisTemplate
stringRedisTemplate
(
RedisConnectionFactory
redisConnectionFactory
)
throws
UnknownHostException
{
RedisConnectionFactory
redisConnectionFactory
)
throws
UnknownHostException
{
StringRedisTemplate
template
=
new
StringRedisTemplate
();
StringRedisTemplate
template
=
new
StringRedisTemplate
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java
View file @
c1005102
...
@@ -43,7 +43,7 @@ import org.springframework.core.Ordered;
...
@@ -43,7 +43,7 @@ import org.springframework.core.Ordered;
public
class
GsonAutoConfiguration
{
public
class
GsonAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
GsonBuilder
.
class
)
@ConditionalOnMissingBean
public
GsonBuilder
gsonBuilder
(
List
<
GsonBuilderCustomizer
>
customizers
)
{
public
GsonBuilder
gsonBuilder
(
List
<
GsonBuilderCustomizer
>
customizers
)
{
GsonBuilder
builder
=
new
GsonBuilder
();
GsonBuilder
builder
=
new
GsonBuilder
();
customizers
.
forEach
((
c
)
->
c
.
customize
(
builder
));
customizers
.
forEach
((
c
)
->
c
.
customize
(
builder
));
...
@@ -51,7 +51,7 @@ public class GsonAutoConfiguration {
...
@@ -51,7 +51,7 @@ public class GsonAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
Gson
.
class
)
@ConditionalOnMissingBean
public
Gson
gson
(
GsonBuilder
gsonBuilder
)
{
public
Gson
gson
(
GsonBuilder
gsonBuilder
)
{
return
gsonBuilder
.
create
();
return
gsonBuilder
.
create
();
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
View file @
c1005102
...
@@ -98,7 +98,7 @@ public class JacksonAutoConfiguration {
...
@@ -98,7 +98,7 @@ public class JacksonAutoConfiguration {
@Bean
@Bean
@Primary
@Primary
@ConditionalOnMissingBean
(
ObjectMapper
.
class
)
@ConditionalOnMissingBean
public
ObjectMapper
jacksonObjectMapper
(
Jackson2ObjectMapperBuilder
builder
)
{
public
ObjectMapper
jacksonObjectMapper
(
Jackson2ObjectMapperBuilder
builder
)
{
return
builder
.
createXmlMapper
(
false
).
build
();
return
builder
.
createXmlMapper
(
false
).
build
();
}
}
...
@@ -161,7 +161,7 @@ public class JacksonAutoConfiguration {
...
@@ -161,7 +161,7 @@ public class JacksonAutoConfiguration {
static
class
ParameterNamesModuleConfiguration
{
static
class
ParameterNamesModuleConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
ParameterNamesModule
.
class
)
@ConditionalOnMissingBean
public
ParameterNamesModule
parameterNamesModule
()
{
public
ParameterNamesModule
parameterNamesModule
()
{
return
new
ParameterNamesModule
(
JsonCreator
.
Mode
.
DEFAULT
);
return
new
ParameterNamesModule
(
JsonCreator
.
Mode
.
DEFAULT
);
}
}
...
@@ -179,7 +179,7 @@ public class JacksonAutoConfiguration {
...
@@ -179,7 +179,7 @@ public class JacksonAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
Jackson2ObjectMapperBuilder
.
class
)
@ConditionalOnMissingBean
public
Jackson2ObjectMapperBuilder
jacksonObjectMapperBuilder
(
public
Jackson2ObjectMapperBuilder
jacksonObjectMapperBuilder
(
List
<
Jackson2ObjectMapperBuilderCustomizer
>
customizers
)
{
List
<
Jackson2ObjectMapperBuilderCustomizer
>
customizers
)
{
Jackson2ObjectMapperBuilder
builder
=
new
Jackson2ObjectMapperBuilder
();
Jackson2ObjectMapperBuilder
builder
=
new
Jackson2ObjectMapperBuilder
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
View file @
c1005102
...
@@ -97,7 +97,7 @@ public class JmxAutoConfiguration implements EnvironmentAware, BeanFactoryAware
...
@@ -97,7 +97,7 @@ public class JmxAutoConfiguration implements EnvironmentAware, BeanFactoryAware
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
MBeanServer
.
class
)
@ConditionalOnMissingBean
public
MBeanServer
mbeanServer
()
{
public
MBeanServer
mbeanServer
()
{
SpecificPlatform
platform
=
SpecificPlatform
.
get
();
SpecificPlatform
platform
=
SpecificPlatform
.
get
();
if
(
platform
!=
null
)
{
if
(
platform
!=
null
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java
View file @
c1005102
...
@@ -60,7 +60,7 @@ import org.springframework.transaction.PlatformTransactionManager;
...
@@ -60,7 +60,7 @@ import org.springframework.transaction.PlatformTransactionManager;
public
class
JooqAutoConfiguration
{
public
class
JooqAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
DataSourceConnectionProvider
.
class
)
@ConditionalOnMissingBean
public
DataSourceConnectionProvider
dataSourceConnectionProvider
(
public
DataSourceConnectionProvider
dataSourceConnectionProvider
(
DataSource
dataSource
)
{
DataSource
dataSource
)
{
return
new
DataSourceConnectionProvider
(
return
new
DataSourceConnectionProvider
(
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
View file @
c1005102
...
@@ -131,7 +131,7 @@ public class KafkaAutoConfiguration {
...
@@ -131,7 +131,7 @@ public class KafkaAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
KafkaAdmin
.
class
)
@ConditionalOnMissingBean
public
KafkaAdmin
kafkaAdmin
()
{
public
KafkaAdmin
kafkaAdmin
()
{
KafkaAdmin
kafkaAdmin
=
new
KafkaAdmin
(
this
.
properties
.
buildAdminProperties
());
KafkaAdmin
kafkaAdmin
=
new
KafkaAdmin
(
this
.
properties
.
buildAdminProperties
());
kafkaAdmin
.
setFatalIfBrokerNotAvailable
(
this
.
properties
.
getAdmin
().
isFailFast
());
kafkaAdmin
.
setFatalIfBrokerNotAvailable
(
this
.
properties
.
getAdmin
().
isFailFast
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java
View file @
c1005102
...
@@ -77,7 +77,7 @@ public class MustacheAutoConfiguration {
...
@@ -77,7 +77,7 @@ public class MustacheAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
Mustache
.
Compiler
.
class
)
@ConditionalOnMissingBean
public
Mustache
.
Compiler
mustacheCompiler
(
TemplateLoader
mustacheTemplateLoader
)
{
public
Mustache
.
Compiler
mustacheCompiler
(
TemplateLoader
mustacheTemplateLoader
)
{
return
Mustache
.
compiler
().
withLoader
(
mustacheTemplateLoader
)
return
Mustache
.
compiler
().
withLoader
(
mustacheTemplateLoader
)
.
withCollector
(
collector
());
.
withCollector
(
collector
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java
View file @
c1005102
...
@@ -37,7 +37,7 @@ class MustacheReactiveWebConfiguration {
...
@@ -37,7 +37,7 @@ class MustacheReactiveWebConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
MustacheViewResolver
.
class
)
@ConditionalOnMissingBean
public
MustacheViewResolver
mustacheViewResolver
(
Compiler
mustacheCompiler
)
{
public
MustacheViewResolver
mustacheViewResolver
(
Compiler
mustacheCompiler
)
{
MustacheViewResolver
resolver
=
new
MustacheViewResolver
(
mustacheCompiler
);
MustacheViewResolver
resolver
=
new
MustacheViewResolver
(
mustacheCompiler
);
resolver
.
setPrefix
(
this
.
mustache
.
getPrefix
());
resolver
.
setPrefix
(
this
.
mustache
.
getPrefix
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java
View file @
c1005102
...
@@ -37,7 +37,7 @@ class MustacheServletWebConfiguration {
...
@@ -37,7 +37,7 @@ class MustacheServletWebConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
MustacheViewResolver
.
class
)
@ConditionalOnMissingBean
public
MustacheViewResolver
mustacheViewResolver
(
Compiler
mustacheCompiler
)
{
public
MustacheViewResolver
mustacheViewResolver
(
Compiler
mustacheCompiler
)
{
MustacheViewResolver
resolver
=
new
MustacheViewResolver
(
mustacheCompiler
);
MustacheViewResolver
resolver
=
new
MustacheViewResolver
(
mustacheCompiler
);
this
.
mustache
.
applyToMvcViewResolver
(
resolver
);
this
.
mustache
.
applyToMvcViewResolver
(
resolver
);
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
View file @
c1005102
...
@@ -94,7 +94,7 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware {
...
@@ -94,7 +94,7 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
PlatformTransactionManager
.
class
)
@ConditionalOnMissingBean
public
PlatformTransactionManager
transactionManager
()
{
public
PlatformTransactionManager
transactionManager
()
{
JpaTransactionManager
transactionManager
=
new
JpaTransactionManager
();
JpaTransactionManager
transactionManager
=
new
JpaTransactionManager
();
if
(
this
.
transactionManagerCustomizers
!=
null
)
{
if
(
this
.
transactionManagerCustomizers
!=
null
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java
View file @
c1005102
...
@@ -34,7 +34,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont
...
@@ -34,7 +34,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont
EvaluationContextExtensionSupport
.
class
})
EvaluationContextExtensionSupport
.
class
})
public
class
SecurityDataConfiguration
{
public
class
SecurityDataConfiguration
{
@ConditionalOnMissingBean
(
SecurityEvaluationContextExtension
.
class
)
@ConditionalOnMissingBean
@Bean
@Bean
public
SecurityEvaluationContextExtension
securityEvaluationContextExtension
()
{
public
SecurityEvaluationContextExtension
securityEvaluationContextExtension
()
{
return
new
SecurityEvaluationContextExtension
();
return
new
SecurityEvaluationContextExtension
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java
View file @
c1005102
...
@@ -50,7 +50,7 @@ public class SendGridAutoConfiguration {
...
@@ -50,7 +50,7 @@ public class SendGridAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
SendGrid
.
class
)
@ConditionalOnMissingBean
public
SendGrid
sendGrid
()
{
public
SendGrid
sendGrid
()
{
if
(
this
.
properties
.
isProxyConfigured
())
{
if
(
this
.
properties
.
isProxyConfigured
())
{
HttpHost
proxy
=
new
HttpHost
(
this
.
properties
.
getProxy
().
getHost
(),
HttpHost
proxy
=
new
HttpHost
(
this
.
properties
.
getProxy
().
getHost
(),
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View file @
c1005102
...
@@ -147,7 +147,7 @@ public class ThymeleafAutoConfiguration {
...
@@ -147,7 +147,7 @@ public class ThymeleafAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
SpringTemplateEngine
.
class
)
@ConditionalOnMissingBean
public
SpringTemplateEngine
templateEngine
()
{
public
SpringTemplateEngine
templateEngine
()
{
SpringTemplateEngine
engine
=
new
SpringTemplateEngine
();
SpringTemplateEngine
engine
=
new
SpringTemplateEngine
();
engine
.
setEnableSpringELCompiler
(
this
.
properties
.
isEnableSpringElCompiler
());
engine
.
setEnableSpringELCompiler
(
this
.
properties
.
isEnableSpringElCompiler
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java
View file @
c1005102
...
@@ -139,7 +139,7 @@ public class NarayanaJtaConfiguration {
...
@@ -139,7 +139,7 @@ public class NarayanaJtaConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
XADataSourceWrapper
.
class
)
@ConditionalOnMissingBean
public
XADataSourceWrapper
xaDataSourceWrapper
(
public
XADataSourceWrapper
xaDataSourceWrapper
(
NarayanaRecoveryManagerBean
narayanaRecoveryManagerBean
,
NarayanaRecoveryManagerBean
narayanaRecoveryManagerBean
,
NarayanaProperties
narayanaProperties
)
{
NarayanaProperties
narayanaProperties
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java
View file @
c1005102
...
@@ -54,7 +54,7 @@ public class HttpEncodingAutoConfiguration {
...
@@ -54,7 +54,7 @@ public class HttpEncodingAutoConfiguration {
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
CharacterEncodingFilter
.
class
)
@ConditionalOnMissingBean
public
CharacterEncodingFilter
characterEncodingFilter
()
{
public
CharacterEncodingFilter
characterEncodingFilter
()
{
CharacterEncodingFilter
filter
=
new
OrderedCharacterEncodingFilter
();
CharacterEncodingFilter
filter
=
new
OrderedCharacterEncodingFilter
();
filter
.
setEncoding
(
this
.
properties
.
getCharset
().
name
());
filter
.
setEncoding
(
this
.
properties
.
getCharset
().
name
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java
View file @
c1005102
...
@@ -170,7 +170,7 @@ public class ErrorMvcAutoConfiguration {
...
@@ -170,7 +170,7 @@ public class ErrorMvcAutoConfiguration {
// If the user adds @EnableWebMvc then the bean name view resolver from
// If the user adds @EnableWebMvc then the bean name view resolver from
// WebMvcAutoConfiguration disappears, so add it back in to avoid disappointment.
// WebMvcAutoConfiguration disappears, so add it back in to avoid disappointment.
@Bean
@Bean
@ConditionalOnMissingBean
(
BeanNameViewResolver
.
class
)
@ConditionalOnMissingBean
public
BeanNameViewResolver
beanNameViewResolver
()
{
public
BeanNameViewResolver
beanNameViewResolver
()
{
BeanNameViewResolver
resolver
=
new
BeanNameViewResolver
();
BeanNameViewResolver
resolver
=
new
BeanNameViewResolver
();
resolver
.
setOrder
(
Ordered
.
LOWEST_PRECEDENCE
-
10
);
resolver
.
setOrder
(
Ordered
.
LOWEST_PRECEDENCE
-
10
);
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java
View file @
c1005102
...
@@ -56,7 +56,7 @@ public class RestDocsAutoConfiguration {
...
@@ -56,7 +56,7 @@ public class RestDocsAutoConfiguration {
static
class
RestDocsMockMvcAutoConfiguration
{
static
class
RestDocsMockMvcAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
MockMvcRestDocumentationConfigurer
.
class
)
@ConditionalOnMissingBean
public
MockMvcRestDocumentationConfigurer
restDocsMockMvcConfigurer
(
public
MockMvcRestDocumentationConfigurer
restDocsMockMvcConfigurer
(
ObjectProvider
<
RestDocsMockMvcConfigurationCustomizer
>
configurationCustomizerProvider
,
ObjectProvider
<
RestDocsMockMvcConfigurationCustomizer
>
configurationCustomizerProvider
,
RestDocumentationContextProvider
contextProvider
)
{
RestDocumentationContextProvider
contextProvider
)
{
...
@@ -88,7 +88,7 @@ public class RestDocsAutoConfiguration {
...
@@ -88,7 +88,7 @@ public class RestDocsAutoConfiguration {
static
class
RestDocsRestAssuredAutoConfiguration
{
static
class
RestDocsRestAssuredAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
RequestSpecification
.
class
)
@ConditionalOnMissingBean
public
RequestSpecification
restDocsRestAssuredConfigurer
(
public
RequestSpecification
restDocsRestAssuredConfigurer
(
ObjectProvider
<
RestDocsRestAssuredConfigurationCustomizer
>
configurationCustomizerProvider
,
ObjectProvider
<
RestDocsRestAssuredConfigurationCustomizer
>
configurationCustomizerProvider
,
RestDocumentationContextProvider
contextProvider
)
{
RestDocumentationContextProvider
contextProvider
)
{
...
@@ -117,7 +117,7 @@ public class RestDocsAutoConfiguration {
...
@@ -117,7 +117,7 @@ public class RestDocsAutoConfiguration {
static
class
RestDocsWebTestClientAutoConfiguration
{
static
class
RestDocsWebTestClientAutoConfiguration
{
@Bean
@Bean
@ConditionalOnMissingBean
(
WebTestClientRestDocumentationConfigurer
.
class
)
@ConditionalOnMissingBean
public
WebTestClientRestDocumentationConfigurer
restDocsWebTestClientConfigurer
(
public
WebTestClientRestDocumentationConfigurer
restDocsWebTestClientConfigurer
(
ObjectProvider
<
RestDocsWebTestClientConfigurationCustomizer
>
configurationCustomizerProvider
,
ObjectProvider
<
RestDocsWebTestClientConfigurationCustomizer
>
configurationCustomizerProvider
,
RestDocumentationContextProvider
contextProvider
)
{
RestDocumentationContextProvider
contextProvider
)
{
...
...
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