From 5aaa2409196cecda2fd725bd571ed672b5890ca8 Mon Sep 17 00:00:00 2001 From: izeye Date: Thu, 14 Jan 2021 22:48:22 +0900 Subject: [PATCH] Polish --- .../couchbase/CouchbaseAutoConfiguration.java | 2 +- .../ElasticsearchRestClientConfigurations.java | 6 +++--- ...ticsearchRestClientAutoConfigurationTests.java | 15 ++++++--------- .../src/docs/asciidoc/spring-boot-features.adoc | 2 +- .../boot/web/embedded/jetty/JettyWebServer.java | 2 +- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java index a4c55840f627..9f6cc4ebc60b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/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/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientConfigurations.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientConfigurations.java index 78957d586ce8..12056b4867fe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientConfigurations.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/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/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java index 3ed962ad38c0..cd50bff7f0fd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java @@ -258,15 +258,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) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index 3833ae9c1b49..977a6ad34fee 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc @@ -8461,7 +8461,7 @@ The following example shows how to use the `ConditionEvaluationReportLoggingList [source,java,indent=0] ---- @Test - public void autoConfigTest { + void autoConfigTest() { ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener( LogLevel.INFO); ApplicationContextRunner contextRunner = new ApplicationContextRunner() diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java index aebc93149df7..b027e1c2f44e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java @@ -286,7 +286,7 @@ private Integer getLocalPort(Connector connector) { .invokeMethod(ReflectionUtils.findMethod(connector.getClass(), "getLocalPort"), connector); } catch (Exception ex) { - logger.info("could not determine port ( " + ex.getMessage() + ")"); + logger.info("could not determine port (" + ex.getMessage() + ")"); } return 0; }