From f647f5689feef16aa09980d62fb186c3abadd5bd Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 15 Nov 2017 11:59:09 -0800 Subject: [PATCH] Polish --- .../condition/ConditionsReportEndpoint.java | 3 +-- .../CouchbaseReactiveDataAutoConfiguration.java | 3 ++- ...seReactiveRepositoriesAutoConfiguration.java | 6 +++--- ...gBootCouchbaseReactiveDataConfiguration.java | 3 ++- .../ReactiveCityCouchbaseRepository.java | 1 + ...hbaseReactiveDataAutoConfigurationTests.java | 17 ++++++++++------- ...ctiveRepositoriesAutoConfigurationTests.java | 7 +++---- .../couchbase/city/ReactiveCityRepository.java | 1 + .../src/main/asciidoc/spring-boot-features.adoc | 2 ++ .../tomcat/TomcatServletWebServerFactory.java | 14 +++++++------- .../ssl/SampleJettySslApplicationTests.java | 2 ++ ...mpleTomcatTwoConnectorsApplicationTests.java | 3 +++ .../sample/undertow/web/SampleController.java | 8 +------- 13 files changed, 38 insertions(+), 32 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java index 6ce9659073f..6d22777325e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java @@ -52,8 +52,7 @@ public class ConditionsReportEndpoint { private final ConditionEvaluationReport conditionEvaluationReport; - public ConditionsReportEndpoint( - ConditionEvaluationReport conditionEvaluationReport) { + public ConditionsReportEndpoint(ConditionEvaluationReport conditionEvaluationReport) { this.conditionEvaluationReport = conditionEvaluationReport; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java index 16a38b7f423..7474ff4a5bb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java @@ -34,8 +34,9 @@ import org.springframework.data.couchbase.repository.ReactiveCouchbaseRepository * @since 2.0.0 */ @Configuration -@ConditionalOnClass({Bucket.class, ReactiveCouchbaseRepository.class, Flux.class}) +@ConditionalOnClass({ Bucket.class, ReactiveCouchbaseRepository.class, Flux.class }) @AutoConfigureAfter(CouchbaseDataAutoConfiguration.class) @Import(SpringBootCouchbaseReactiveDataConfiguration.class) public class CouchbaseReactiveDataAutoConfiguration { + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java index d651a786f36..c5946918850 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java @@ -31,14 +31,14 @@ import org.springframework.data.couchbase.repository.config.ReactiveRepositoryOp import org.springframework.data.couchbase.repository.support.ReactiveCouchbaseRepositoryFactoryBean; /** - * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's Couchbase - * Reactive Repositories. + * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's Couchbase Reactive + * Repositories. * * @author Alex Derkach * @since 2.0.0 */ @Configuration -@ConditionalOnClass({Bucket.class, ReactiveCouchbaseRepository.class}) +@ConditionalOnClass({ Bucket.class, ReactiveCouchbaseRepository.class }) @ConditionalOnProperty(prefix = "spring.data.couchbase.reactive-repositories", name = "enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnBean(ReactiveRepositoryOperationsMapping.class) @ConditionalOnMissingBean(ReactiveCouchbaseRepositoryFactoryBean.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/SpringBootCouchbaseReactiveDataConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/SpringBootCouchbaseReactiveDataConfiguration.java index cd0bbd9e226..681ed1ab6ef 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/SpringBootCouchbaseReactiveDataConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/SpringBootCouchbaseReactiveDataConfiguration.java @@ -69,7 +69,8 @@ class SpringBootCouchbaseReactiveDataConfiguration @Override @ConditionalOnMissingBean(name = BeanNames.REACTIVE_COUCHBASE_OPERATIONS_MAPPING) @Bean(name = BeanNames.REACTIVE_COUCHBASE_OPERATIONS_MAPPING) - public ReactiveRepositoryOperationsMapping reactiveRepositoryOperationsMapping(RxJavaCouchbaseTemplate reactiveCouchbaseTemplate) throws Exception { + public ReactiveRepositoryOperationsMapping reactiveRepositoryOperationsMapping( + RxJavaCouchbaseTemplate reactiveCouchbaseTemplate) throws Exception { return super.reactiveRepositoryOperationsMapping(reactiveCouchbaseTemplate); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/ReactiveCityCouchbaseRepository.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/ReactiveCityCouchbaseRepository.java index 3d0d1751ea0..4ad13834fc1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/ReactiveCityCouchbaseRepository.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/ReactiveCityCouchbaseRepository.java @@ -22,6 +22,7 @@ import org.springframework.boot.autoconfigure.data.couchbase.city.City; import org.springframework.data.repository.Repository; public interface ReactiveCityCouchbaseRepository extends Repository { + Mono save(City city); Mono findById(Long id); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java index 9f6f3542faa..bc425e76ce9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java @@ -73,7 +73,8 @@ public class CouchbaseReactiveDataAutoConfigurationTests { @Test public void customConfiguration() { load(CustomCouchbaseConfiguration.class); - RxJavaCouchbaseTemplate rxJavaCouchbaseTemplate = this.context.getBean(RxJavaCouchbaseTemplate.class); + RxJavaCouchbaseTemplate rxJavaCouchbaseTemplate = this.context + .getBean(RxJavaCouchbaseTemplate.class); assertThat(rxJavaCouchbaseTemplate.getDefaultConsistency()) .isEqualTo(Consistency.STRONGLY_CONSISTENT); } @@ -81,8 +82,8 @@ public class CouchbaseReactiveDataAutoConfigurationTests { @Test public void validatorIsPresent() { load(CouchbaseTestConfigurer.class); - assertThat(this.context.getBeansOfType( - ValidatingCouchbaseEventListener.class)).hasSize(1); + assertThat(this.context.getBeansOfType(ValidatingCouchbaseEventListener.class)) + .hasSize(1); } @Test @@ -99,8 +100,8 @@ public class CouchbaseReactiveDataAutoConfigurationTests { @Test public void customConversions() { load(CustomConversionsConfig.class); - RxJavaCouchbaseTemplate template = this.context.getBean( - RxJavaCouchbaseTemplate.class); + RxJavaCouchbaseTemplate template = this.context + .getBean(RxJavaCouchbaseTemplate.class); assertThat(template.getConverter().getConversionService() .canConvert(CouchbaseProperties.class, Boolean.class)).isTrue(); } @@ -113,13 +114,15 @@ public class CouchbaseReactiveDataAutoConfigurationTests { } context.register(PropertyPlaceholderAutoConfiguration.class, ValidationAutoConfiguration.class, CouchbaseAutoConfiguration.class, - CouchbaseDataAutoConfiguration.class, CouchbaseReactiveDataAutoConfiguration.class); + CouchbaseDataAutoConfiguration.class, + CouchbaseReactiveDataAutoConfiguration.class); context.refresh(); this.context = context; } @Configuration - static class CustomCouchbaseConfiguration extends AbstractReactiveCouchbaseDataConfiguration { + static class CustomCouchbaseConfiguration + extends AbstractReactiveCouchbaseDataConfiguration { @Override protected CouchbaseConfigurer couchbaseConfigurer() { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java index 4f759789618..1e2d4fe769b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java @@ -92,12 +92,10 @@ public class CouchbaseReactiveRepositoriesAutoConfigurationTests { context.register(config); } context.register(PropertyPlaceholderAutoConfiguration.class, - CouchbaseAutoConfiguration.class, - CouchbaseDataAutoConfiguration.class, + CouchbaseAutoConfiguration.class, CouchbaseDataAutoConfiguration.class, CouchbaseRepositoriesAutoConfiguration.class, CouchbaseReactiveDataAutoConfiguration.class, - CouchbaseReactiveRepositoriesAutoConfiguration.class - ); + CouchbaseReactiveRepositoriesAutoConfiguration.class); context.refresh(); this.context = context; } @@ -122,4 +120,5 @@ public class CouchbaseReactiveRepositoriesAutoConfigurationTests { protected static class CustomizedConfiguration { } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/city/ReactiveCityRepository.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/city/ReactiveCityRepository.java index 695fd453f0d..13b380197f3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/city/ReactiveCityRepository.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/city/ReactiveCityRepository.java @@ -21,6 +21,7 @@ import reactor.core.publisher.Mono; import org.springframework.data.repository.Repository; public interface ReactiveCityRepository extends Repository { + Mono save(City city); Mono findById(Long id); diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index d07227080e5..104088c462a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -728,6 +728,8 @@ In the preceding example, when `my.servers` is redefined in several places, the the `PropertySource` with higher precedence will override any other configuration for that list. Both comma-separated lists and yaml lists can be used for completely overriding the contents of the list. + + [[boot-features-external-config-exposing-yaml-to-spring]] ==== Exposing YAML as Properties in the Spring Environment The `YamlPropertySourceLoader` class can be used to expose YAML as a `PropertySource` in diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java index 0b3a3e61bbb..60b90be2962 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java @@ -222,13 +222,6 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto postProcessContext(context); } - private void configureTldSkipPatterns(TomcatEmbeddedContext context) { - StandardJarScanFilter filter = new StandardJarScanFilter(); - filter.setTldSkip( - StringUtils.collectionToCommaDelimitedString(this.tldSkipPatterns)); - context.getJarScanner().setJarScanFilter(filter); - } - /** * Override Tomcat's default locale mappings to align with other servers. See * {@code org.apache.catalina.util.CharsetMapperDefault.properties}. @@ -250,6 +243,13 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto } } + private void configureTldSkipPatterns(TomcatEmbeddedContext context) { + StandardJarScanFilter filter = new StandardJarScanFilter(); + filter.setTldSkip( + StringUtils.collectionToCommaDelimitedString(this.tldSkipPatterns)); + context.getJarScanner().setJarScanFilter(filter); + } + private void addDefaultServlet(Context context) { Wrapper defaultServlet = context.createWrapper(); defaultServlet.setName("default"); diff --git a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java index 909609ce803..0f31c21fadf 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java @@ -41,6 +41,7 @@ public class SampleJettySslApplicationTests { @Autowired private TestRestTemplate restTemplate; + @Autowired private AbstractConfigurableWebServerFactory webServerFactory; @@ -55,4 +56,5 @@ public class SampleJettySslApplicationTests { assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(entity.getBody()).isEqualTo("Hello World"); } + } diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java index 7de88b0e0ac..d516a0aef8b 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java @@ -52,10 +52,13 @@ public class SampleTomcatTwoConnectorsApplicationTests { @LocalServerPort private int port; + @Autowired private Ports ports; + @Autowired private TestRestTemplate restTemplate; + @Autowired private AbstractConfigurableWebServerFactory webServerFactory; diff --git a/spring-boot-samples/spring-boot-sample-undertow/src/main/java/sample/undertow/web/SampleController.java b/spring-boot-samples/spring-boot-sample-undertow/src/main/java/sample/undertow/web/SampleController.java index 5fe30ec030e..9cdd28d77fc 100644 --- a/spring-boot-samples/spring-boot-sample-undertow/src/main/java/sample/undertow/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-undertow/src/main/java/sample/undertow/web/SampleController.java @@ -31,13 +31,7 @@ public class SampleController { @GetMapping("/async") public Callable helloWorldAsync() { - return new Callable() { - - @Override - public String call() throws Exception { - return "async: Hello World"; - } - }; + return () -> "async: Hello World"; } }