Polish

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java

@@ -103,13 +103,11 @@ public CloudFoundryReactiveHealthEndpointWebExtension cloudFoundryReactiveHealth
 	public CloudFoundryInfoEndpointWebExtension cloudFoundryInfoEndpointWebExtension(
 			GitProperties properties, ObjectProvider<InfoContributor> infoContributors) {
 		List<InfoContributor> contributors = infoContributors.orderedStream()
-				.map((infoContributor) -> {
-					if (infoContributor instanceof GitInfoContributor) {
-						return new GitInfoContributor(properties,
-								InfoPropertiesInfoContributor.Mode.FULL);
-					}
-					return infoContributor;
-				}).collect(Collectors.toList());
+				.map((infoContributor) -> (infoContributor instanceof GitInfoContributor)
+						? new GitInfoContributor(properties,
+								InfoPropertiesInfoContributor.Mode.FULL)
+						: infoContributor)
+				.collect(Collectors.toList());
 		return new CloudFoundryInfoEndpointWebExtension(new InfoEndpoint(contributors));
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

@@ -104,13 +104,11 @@ public CloudFoundryHealthEndpointWebExtension cloudFoundryHealthEndpointWebExten
 	public CloudFoundryInfoEndpointWebExtension cloudFoundryInfoEndpointWebExtension(
 			GitProperties properties, ObjectProvider<InfoContributor> infoContributors) {
 		List<InfoContributor> contributors = infoContributors.orderedStream()
-				.map((infoContributor) -> {
-					if (infoContributor instanceof GitInfoContributor) {
-						return new GitInfoContributor(properties,
-								InfoPropertiesInfoContributor.Mode.FULL);
-					}
-					return infoContributor;
-				}).collect(Collectors.toList());
+				.map((infoContributor) -> (infoContributor instanceof GitInfoContributor)
+						? new GitInfoContributor(properties,
+								InfoPropertiesInfoContributor.Mode.FULL)
+						: infoContributor)
+				.collect(Collectors.toList());
 		return new CloudFoundryInfoEndpointWebExtension(new InfoEndpoint(contributors));
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java

@@ -48,6 +48,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.core.log.LogMessage;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Prometheus.
@@ -142,7 +143,7 @@ private PushGateway getPushGateway(String url) {
 				return new PushGateway(new URL(url));
 			}
 			catch (MalformedURLException ex) {
-				logger.warn(String.format(
+				logger.warn(LogMessage.format(
 						"Invalid PushGateway base url '%s': update your configuration to a valid URL",
 						url));
 				return new PushGateway(url);

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java

@@ -157,8 +157,8 @@ protected boolean isLazyInitialization() {
 			AbstractApplicationContext context = (AbstractApplicationContext) this.applicationContext;
 			List<BeanFactoryPostProcessor> postProcessors = context
 					.getBeanFactoryPostProcessors();
-			return postProcessors.stream().anyMatch((
-					postProcessor) -> postProcessor instanceof LazyInitializationBeanFactoryPostProcessor);
+			return postProcessors.stream().anyMatch(
+					LazyInitializationBeanFactoryPostProcessor.class::isInstance);
 		}
 
 		private void setClassLoaderIfPossible(ConfigurableApplicationContext child) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfigurationTests.java

@@ -56,7 +56,6 @@ public void childManagementContextShouldStartForEmbeddedServer() {
 		contextRunner.withPropertyValues("server.port=0", "management.server.port=0").run(
 				(context) -> assertThat(tomcatStartedOccurencesIn(this.output.toString()))
 						.isEqualTo(2));
-
 	}
 
 	private int tomcatStartedOccurencesIn(String output) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/HttpTraceWebFilter.java

@@ -91,7 +91,7 @@ private Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain,
 			Principal principal, WebSession session) {
 		ServerWebExchangeTraceableRequest request = new ServerWebExchangeTraceableRequest(
 				exchange);
-		final HttpTrace trace = this.tracer.receivedRequest(request);
+		HttpTrace trace = this.tracer.receivedRequest(request);
 		exchange.getResponse().beforeCommit(() -> {
 			TraceableServerHttpResponse response = new TraceableServerHttpResponse(
 					exchange.getResponse());

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingFailureAnalyzer.java

@@ -38,15 +38,12 @@ protected FailureAnalysis analyze(Throwable rootFailure,
 					.append("no migration scripts location is configured").toString(),
 					"Check your Flyway configuration", cause);
 		}
-		else {
-			description.append(String.format(
-					"none of the following migration scripts locations could be found:%n%n"));
-			cause.getLocations().forEach((location) -> description
-					.append(String.format("\t- %s%n", location)));
-			return new FailureAnalysis(description.toString(),
-					"Review the locations above or check your Flyway configuration",
-					cause);
-		}
+		description.append(String.format(
+				"none of the following migration scripts locations could be found:%n%n"));
+		cause.getLocations().forEach(
+				(location) -> description.append(String.format("\t- %s%n", location)));
+		return new FailureAnalysis(description.toString(),
+				"Review the locations above or check your Flyway configuration", cause);
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java

@@ -74,41 +74,44 @@ public NettyDriverMongoClientSettingsBuilderCustomizer nettyDriverCustomizer(
 			return new NettyDriverMongoClientSettingsBuilderCustomizer(settings);
 		}
 
-		private static final class NettyDriverMongoClientSettingsBuilderCustomizer
-				implements MongoClientSettingsBuilderCustomizer, DisposableBean {
+	}
 
-			private final ObjectProvider<MongoClientSettings> settings;
+	/**
+	 * {@link MongoClientSettingsBuilderCustomizer} to apply Mongo client settings.
+	 */
+	private static final class NettyDriverMongoClientSettingsBuilderCustomizer
+			implements MongoClientSettingsBuilderCustomizer, DisposableBean {
 
-			private volatile EventLoopGroup eventLoopGroup;
+		private final ObjectProvider<MongoClientSettings> settings;
 
-			private NettyDriverMongoClientSettingsBuilderCustomizer(
-					ObjectProvider<MongoClientSettings> settings) {
-				this.settings = settings;
-			}
+		private volatile EventLoopGroup eventLoopGroup;
 
-			@Override
-			public void customize(Builder builder) {
-				if (!isStreamFactoryFactoryDefined(this.settings.getIfAvailable())) {
-					NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup();
-					this.eventLoopGroup = eventLoopGroup;
-					builder.streamFactoryFactory(NettyStreamFactoryFactory.builder()
-							.eventLoopGroup(eventLoopGroup).build());
-				}
-			}
+		private NettyDriverMongoClientSettingsBuilderCustomizer(
+				ObjectProvider<MongoClientSettings> settings) {
+			this.settings = settings;
+		}
 
-			@Override
-			public void destroy() {
-				EventLoopGroup eventLoopGroup = this.eventLoopGroup;
-				if (eventLoopGroup != null) {
-					eventLoopGroup.shutdownGracefully().awaitUninterruptibly();
-					this.eventLoopGroup = null;
-				}
+		@Override
+		public void customize(Builder builder) {
+			if (!isStreamFactoryFactoryDefined(this.settings.getIfAvailable())) {
+				NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup();
+				this.eventLoopGroup = eventLoopGroup;
+				builder.streamFactoryFactory(NettyStreamFactoryFactory.builder()
+						.eventLoopGroup(eventLoopGroup).build());
 			}
+		}
 
-			private boolean isStreamFactoryFactoryDefined(MongoClientSettings settings) {
-				return settings != null && settings.getStreamFactoryFactory() != null;
+		@Override
+		public void destroy() {
+			EventLoopGroup eventLoopGroup = this.eventLoopGroup;
+			if (eventLoopGroup != null) {
+				eventLoopGroup.shutdownGracefully().awaitUninterruptibly();
+				this.eventLoopGroup = null;
 			}
+		}
 
+		private boolean isStreamFactoryFactoryDefined(MongoClientSettings settings) {
+			return settings != null && settings.getStreamFactoryFactory() != null;
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketNettyServerCustomizer.java

@@ -43,7 +43,7 @@ class RSocketNettyServerCustomizer implements NettyServerCustomizer {
 
 	@Override
 	public HttpServer apply(HttpServer httpServer) {
-		final ServerTransport.ConnectionAcceptor acceptor = RSocketFactory.receive()
+		ServerTransport.ConnectionAcceptor acceptor = RSocketFactory.receive()
 				.acceptor(this.messageHandlerAcceptor).toConnectionAcceptor();
 		return httpServer.route((routes) -> routes.ws(this.mappingPath,
 				WebsocketRouteTransport.newHandler(acceptor)));

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java

@@ -29,7 +29,7 @@
 @ConfigurationProperties("spring.rsocket")
 public class RSocketProperties {
 
-	private Server server = new Server();
+	private final Server server = new Server();
 
 	public Server getServer() {
 		return this.server;