Polish

Closes gh-27432

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,25 +46,23 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
 @ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class })
+@ConditionalOnBean(MeterRegistry.class)
 @AutoConfigureAfter(CompositeMeterRegistryAutoConfiguration.class)
 public class JettyMetricsAutoConfiguration {
 
 	@Bean
-	@ConditionalOnBean(MeterRegistry.class)
 	@ConditionalOnMissingBean({ JettyServerThreadPoolMetrics.class, JettyServerThreadPoolMetricsBinder.class })
 	public JettyServerThreadPoolMetricsBinder jettyServerThreadPoolMetricsBinder(MeterRegistry meterRegistry) {
 		return new JettyServerThreadPoolMetricsBinder(meterRegistry);
 	}
 
 	@Bean
-	@ConditionalOnBean(MeterRegistry.class)
 	@ConditionalOnMissingBean({ JettyConnectionMetrics.class, JettyConnectionMetricsBinder.class })
 	public JettyConnectionMetricsBinder jettyConnectionMetricsBinder(MeterRegistry meterRegistry) {
 		return new JettyConnectionMetricsBinder(meterRegistry);
 	}
 
 	@Bean
-	@ConditionalOnBean(MeterRegistry.class)
 	@ConditionalOnMissingBean({ JettySslHandshakeMetrics.class, JettySslHandshakeMetricsBinder.class })
 	@ConditionalOnProperty(name = "server.ssl.enabled", havingValue = "true")
 	public JettySslHandshakeMetricsBinder jettySslHandshakeMetricsBinder(MeterRegistry meterRegistry) {

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizerTests.java

@@ -185,7 +185,6 @@ public void apply(Builder builder) {
 		assertThat(restTemplate.getForObject(URI.create("/second/456"), String.class)).isEqualTo("OK");
 		this.registry.get("http.client.requests").tags("uri", "/second/456").timer();
 		this.mockServer.verify();
-
 	}
 
 	private static final class TestInterceptor implements ClientHttpRequestInterceptor {

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilterTests.java

@@ -260,7 +260,7 @@ Mono<String> timedPercentiles() {
 
 	class FaultyWebFluxTagsProvider extends DefaultWebFluxTagsProvider {
 
-		private volatile AtomicBoolean fail = new AtomicBoolean(false);
+		private final AtomicBoolean fail = new AtomicBoolean(false);
 
 		FaultyWebFluxTagsProvider() {
 			super(true);

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/FaultyWebMvcTagsProvider.java

@@ -31,7 +31,7 @@
  */
 class FaultyWebMvcTagsProvider extends DefaultWebMvcTagsProvider {
 
-	private volatile AtomicBoolean fail = new AtomicBoolean(false);
+	private final AtomicBoolean fail = new AtomicBoolean(false);
 
 	FaultyWebMvcTagsProvider() {
 		super(true);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java

@@ -32,7 +32,7 @@
  * @author Stephane Nicoll
  */
 @ClassPathExclusions("commons-pool2-*.jar")
-public class RedisAutoConfigurationLettuceWithoutCommonsPool2Tests {
+class RedisAutoConfigurationLettuceWithoutCommonsPool2Tests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class));

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc

@@ -1024,7 +1024,7 @@ To disable the auto-configured connection pool metrics, set the following proper
 [[actuator.metrics.supported.jetty]]
 ==== Jetty Metrics
 Auto-configuration will bind metrics for Jetty's `ThreadPool` using Micrometer's `JettyServerThreadPoolMetrics`.
-Metrics for Jetty's `Connector`s are bound using Micrometer's `JettyConnectionMetrics` and, in addition when configprop:server.ssl.enabled[] is set to `true`, Micrometer's `JettySslHandshakeMetrics`.
+Metrics for Jetty's ``Connector``s are bound using Micrometer's `JettyConnectionMetrics` and, in addition when configprop:server.ssl.enabled[] is set to `true`, Micrometer's `JettySslHandshakeMetrics`.
 
 
 

spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/cloud.adoc

@@ -359,7 +359,7 @@ See the blog post on https://boxfuse.com/blog/spring-boot-ec2.html[deploying Spr
 
 [[deployment.cloud.azure]]
 === Azure
-This https://spring.io/guides/gs/spring-boot-for-azure/[Getting Started guide] walks you through deploying your Spring Boot application to either https://azure.microsoft.com/en-ca/services/spring-cloud/[Azure Spring Cloud] or https://docs.microsoft.com/en-ca/azure/app-service/overview[Azure App Service].
+This https://spring.io/guides/gs/spring-boot-for-azure/[Getting Started guide] walks you through deploying your Spring Boot application to either https://azure.microsoft.com/en-us/services/spring-cloud/[Azure Spring Cloud] or https://docs.microsoft.com/en-us/azure/app-service/overview[Azure App Service].
 
 
 

spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/rsocket.adoc

@@ -73,7 +73,7 @@ Once the `RSocket` channel is established between server and client, any party c
 
 As a server, you can get injected with an `RSocketRequester` instance on any handler method of an RSocket `@Controller`.
 As a client, you need to configure and establish an RSocket connection first.
-Spring Boot auto-configures an `RSocketRequester.Builder` for such cases with the expected codecs and apply any `RSocketConnectorConfigurer` bean.
+Spring Boot auto-configures an `RSocketRequester.Builder` for such cases with the expected codecs and applies any `RSocketConnectorConfigurer` bean.
 
 The `RSocketRequester.Builder` instance is a prototype bean, meaning each injection point will provide you with a new instance .
 This is done on purpose since this builder is stateful and you shouldn't create requesters with different setups using the same instance.

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleValueProperties.java

@@ -24,7 +24,7 @@
 import org.springframework.boot.configurationsample.ConfigurationProperties;
 
 /**
- * Configuration properties using lombok @Value.
+ * Configuration properties using Lombok {@code @Value}.
  *
  * @author Mark Jeffrey
  */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java

@@ -103,7 +103,7 @@ public SpringApplicationBuilder(ResourceLoader resourceLoader, Class<?>... sourc
 
 	/**
 	 * Creates a new {@link SpringApplication} instance from the given sources. Subclasses
-	 * may override in order to provide a custom subclass of {@link SpringApplication}
+	 * may override in order to provide a custom subclass of {@link SpringApplication}.
 	 * @param sources the sources
 	 * @return the {@link SpringApplication} instance
 	 * @since 1.1.0
@@ -116,9 +116,9 @@ protected SpringApplication createSpringApplication(Class<?>... sources) {
 	}
 
 	/**
-	 * Creates a new {@link SpringApplication} instances from the given sources using the
+	 * Creates a new {@link SpringApplication} instance from the given sources using the
 	 * given {@link ResourceLoader}. Subclasses may override in order to provide a custom
-	 * subclass of {@link SpringApplication}
+	 * subclass of {@link SpringApplication}.
 	 * @param resourceLoader the resource loader (can be null)
 	 * @param sources the sources
 	 * @return the {@link SpringApplication} instance