Polish

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(
+	public ConditionsReportEndpoint(ConditionEvaluationReport conditionEvaluationReport) {
-			ConditionEvaluationReport conditionEvaluationReport) {
 		this.conditionEvaluationReport = conditionEvaluationReport;
 	}
 

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 {
+
 }

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
+ * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's Couchbase Reactive
- * Reactive Repositories.
+ * 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)

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);
 	}
 

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<City, Long> {
+
 	Mono<City> save(City city);
 
 	Mono<City> findById(Long id);

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(
+		assertThat(this.context.getBeansOfType(ValidatingCouchbaseEventListener.class))
-				ValidatingCouchbaseEventListener.class)).hasSize(1);
+				.hasSize(1);
 	}
 
 	@Test
@@ -99,8 +100,8 @@ public class CouchbaseReactiveDataAutoConfigurationTests {
 	@Test
 	public void customConversions() {
 		load(CustomConversionsConfig.class);
-		RxJavaCouchbaseTemplate template = this.context.getBean(
+		RxJavaCouchbaseTemplate template = this.context
-				RxJavaCouchbaseTemplate.class);
+				.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() {

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,
+				CouchbaseAutoConfiguration.class, CouchbaseDataAutoConfiguration.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 {
 
 	}
+
 }

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<City, Long> {
+
 	Mono<City> save(City city);
 
 	Mono<City> findById(Long id);

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

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");

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");
 	}
+
 }

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;
 

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<String> helloWorldAsync() {
-		return new Callable<String>() {
+		return () -> "async: Hello World";
-
-			@Override
-			public String call() throws Exception {
-				return "async: Hello World";
-			}
-		};
 	}
 
 }