Remove value in @ConditionalOnMissingBean if possible
See gh-12604
This commit is contained in:
parent
5c04e7dd7f
commit
c100510222
|
@ -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();
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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());
|
||||||
|
|
|
@ -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 {
|
||||||
@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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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 {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnMissingBean(Gson.class)
|
@ConditionalOnMissingBean
|
||||||
public Gson gson(GsonBuilder gsonBuilder) {
|
public Gson gson(GsonBuilder gsonBuilder) {
|
||||||
return gsonBuilder.create();
|
return gsonBuilder.create();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 {
|
||||||
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 {
|
||||||
}
|
}
|
||||||
|
|
||||||
@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();
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
|
@ -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(
|
||||||
|
|
|
@ -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());
|
||||||
|
|
|
@ -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());
|
||||||
|
|
|
@ -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());
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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(),
|
||||||
|
|
|
@ -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());
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
|
@ -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());
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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 {
|
||||||
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 {
|
||||||
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) {
|
||||||
|
|
Loading…
Reference in New Issue