pull/17199/head
Stephane Nicoll 6 years ago
parent 985c8f7598
commit 54c72cf39f

@ -207,7 +207,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
}; };
} }
@Configuration @Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ JaxbAnnotationIntrospector.class, XmlElement.class }) @ConditionalOnClass({ JaxbAnnotationIntrospector.class, XmlElement.class })
static class JaxbObjectMapperCustomizer { static class JaxbObjectMapperCustomizer {

@ -109,31 +109,31 @@ class ElasticsearchDataAutoConfigurationTests {
.contains("reactiveElasticsearchTemplate")); .contains("reactiveElasticsearchTemplate"));
} }
@Configuration @Configuration(proxyBeanMethods = false)
static class CustomTransportTemplate { static class CustomTransportTemplate {
@Bean @Bean
ElasticsearchTemplate elasticsearchTemplate() { public ElasticsearchTemplate elasticsearchTemplate() {
return mock(ElasticsearchTemplate.class); return mock(ElasticsearchTemplate.class);
} }
} }
@Configuration @Configuration(proxyBeanMethods = false)
static class CustomRestTemplate { static class CustomRestTemplate {
@Bean @Bean
ElasticsearchRestTemplate elasticsearchTemplate() { public ElasticsearchRestTemplate elasticsearchTemplate() {
return mock(ElasticsearchRestTemplate.class); return mock(ElasticsearchRestTemplate.class);
} }
} }
@Configuration @Configuration(proxyBeanMethods = false)
static class CustomReactiveRestTemplate { static class CustomReactiveRestTemplate {
@Bean @Bean
ReactiveElasticsearchTemplate reactiveElasticsearchTemplate() { public ReactiveElasticsearchTemplate reactiveElasticsearchTemplate() {
return mock(ReactiveElasticsearchTemplate.class); return mock(ReactiveElasticsearchTemplate.class);
} }

Loading…
Cancel
Save