Merge pull request #24837 from izeye

* pr/24837: Polish Closes gh-24837
spring-projects · Jan 15, 2021 · ff164ec · ff164ec
2 parents 1a2a3d6 + e735050
commit ff164ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
@@ -124,7 +124,7 @@ static class JacksonConfiguration {
 
 		@Bean
 		@ConditionalOnSingleCandidate(ObjectMapper.class)
-		ClusterEnvironmentBuilderCustomizer cluster(ObjectMapper objectMapper) {
+		ClusterEnvironmentBuilderCustomizer jacksonClusterEnvironmentBuilderCustomizer(ObjectMapper objectMapper) {
 			return new JacksonClusterEnvironmentBuilderCustomizer(objectMapper);
 		}
 

diff --git a/...ringframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientConfigurations.java b/...ringframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientConfigurations.java
@@ -119,10 +119,10 @@ static class RestClientSnifferConfiguration {
 		@ConditionalOnMissingBean
 		Sniffer elasticsearchSniffer(RestHighLevelClient client, ElasticsearchRestClientProperties properties) {
 			SnifferBuilder builder = Sniffer.builder(client.getLowLevelClient());
-			PropertyMapper get = PropertyMapper.get().alwaysApplyingWhenNonNull();
-			get.from(properties.getSniffer().getInterval()).asInt(Duration::toMillis)
+			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
+			map.from(properties.getSniffer().getInterval()).asInt(Duration::toMillis)
 					.to(builder::setSniffIntervalMillis);
-			get.from(properties.getSniffer().getDelayAfterFailure()).asInt(Duration::toMillis)
+			map.from(properties.getSniffer().getDelayAfterFailure()).asInt(Duration::toMillis)
 					.to(builder::setSniffAfterFailureDelayMillis);
 			return builder.build();
 		}

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