Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24837 from izeye

Browse Source 
* pr/24837:
  Polish

Closes gh-24837
This commit is contained in:
Stephane Nicoll
2021-01-15 14:38:22 +01:00
parent 1a2a3d6598 e7350503b8
commit ff164ec72f
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
View File

@@ -124,7 +124,7 @@ public class CouchbaseAutoConfiguration {
@Bean @Bean
@ConditionalOnSingleCandidate(ObjectMapper.class) @ConditionalOnSingleCandidate(ObjectMapper.class)
ClusterEnvironmentBuilderCustomizer cluster(ObjectMapper objectMapper) { ClusterEnvironmentBuilderCustomizer jacksonClusterEnvironmentBuilderCustomizer(ObjectMapper objectMapper) {
return new JacksonClusterEnvironmentBuilderCustomizer(objectMapper); return new JacksonClusterEnvironmentBuilderCustomizer(objectMapper);
} }

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientConfigurations.java
View File

@@ -119,10 +119,10 @@ class ElasticsearchRestClientConfigurations {
@ConditionalOnMissingBean @ConditionalOnMissingBean
Sniffer elasticsearchSniffer(RestHighLevelClient client, ElasticsearchRestClientProperties properties) { Sniffer elasticsearchSniffer(RestHighLevelClient client, ElasticsearchRestClientProperties properties) {
SnifferBuilder builder = Sniffer.builder(client.getLowLevelClient()); SnifferBuilder builder = Sniffer.builder(client.getLowLevelClient());
PropertyMapper get = PropertyMapper.get().alwaysApplyingWhenNonNull(); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
get.from(properties.getSniffer().getInterval()).asInt(Duration::toMillis) map.from(properties.getSniffer().getInterval()).asInt(Duration::toMillis)
.to(builder::setSniffIntervalMillis); .to(builder::setSniffIntervalMillis);
get.from(properties.getSniffer().getDelayAfterFailure()).asInt(Duration::toMillis) map.from(properties.getSniffer().getDelayAfterFailure()).asInt(Duration::toMillis)
.to(builder::setSniffAfterFailureDelayMillis); .to(builder::setSniffAfterFailureDelayMillis);
return builder.build(); return builder.build();
} }

15
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java
View File

@@ -248,15 +248,12 @@ class ElasticsearchRestClientAutoConfigurationTests {
@Test @Test
void configureWhenCustomSnifferShouldBackOff() { void configureWhenCustomSnifferShouldBackOff() {
Sniffer customSniffer = mock(Sniffer.class); Sniffer customSniffer = mock(Sniffer.class);
this.contextRunner.withBean(Sniffer.class, () -> customSniffer) this.contextRunner.withBean(Sniffer.class, () -> customSniffer).run((context) -> {
.withPropertyValues("spring.elasticsearch.rest.sniffer.interval=180s", assertThat(context).hasSingleBean(Sniffer.class);
"spring.elasticsearch.rest.sniffer.delay-after-failure=30s") Sniffer sniffer = context.getBean(Sniffer.class);
.run((context) -> { assertThat(sniffer).isSameAs(customSniffer);
assertThat(context).hasSingleBean(Sniffer.class); verifyNoInteractions(customSniffer);
Sniffer sniffer = context.getBean(Sniffer.class); });
assertThat(sniffer).isSameAs(customSniffer);
verifyNoInteractions(customSniffer);
});
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)