Merge branch '2.3.x'

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/payload/BuildInfoResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/bintray/PackageFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/command/CommandProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/command/DistributeCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/command/PromoteCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/command/PublishGradlePlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/command/SyncToCentralCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/SonatypeService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/bintray/BintrayServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/command/DistributeCommandTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/sonatype/SonatypeServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchReactiveHealthIndicator.java

@@ -23,8 +23,11 @@ import reactor.core.publisher.Mono;
 import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.Status;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * {@link HealthIndicator} for an Elasticsearch cluster using a
@@ -50,28 +53,28 @@ public class ElasticsearchReactiveHealthIndicator extends AbstractReactiveHealth
 
 	@Override
 	protected Mono<Health> doHealthCheck(Health.Builder builder) {
-		return this.client.execute((callback) -> callback.get().uri("/_cluster/health/").exchange())
+		return this.client.execute(this::getHealth).flatMap((response) -> doHealthCheck(builder, response));
-				.flatMap((response) -> {
+	}
-					if (response.statusCode().is2xxSuccessful()) {
+
-						return response.bodyToMono(STRING_OBJECT_MAP).map((body) -> {
+	private Mono<ClientResponse> getHealth(WebClient webClient) {
-							String status = (String) body.get("status");
+		return webClient.get().uri("/_cluster/health/").exchange();
-							if (RED_STATUS.equals(status)) {
+	}
-								builder.outOfService();
+
-							}
+	private Mono<Health> doHealthCheck(Health.Builder builder, ClientResponse response) {
-							else {
+		if (response.statusCode().is2xxSuccessful()) {
-								builder.up();
+			return response.bodyToMono(STRING_OBJECT_MAP).map((body) -> getHealth(builder, body));
-							}
+		}
-							builder.withDetails(body);
+		builder.down();
-							return builder.build();
+		builder.withDetail("statusCode", response.rawStatusCode());
-						});
+		builder.withDetail("reasonPhrase", response.statusCode().getReasonPhrase());
-					}
+		return response.releaseBody().thenReturn(builder.build());
-					else {
+	}
-						builder.down();
+
-						builder.withDetail("statusCode", response.rawStatusCode());
+	private Health getHealth(Health.Builder builder, Map<String, Object> body) {
-						builder.withDetail("reasonPhrase", response.statusCode().getReasonPhrase());
+		String status = (String) body.get("status");
-						return response.releaseBody().thenReturn(builder.build());
+		builder.status(RED_STATUS.equals(status) ? Status.OUT_OF_SERVICE : Status.UP);
-					}
+		builder.withDetails(body);
-				});
+		return builder.build();
 	}
 
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.redis;
 
-import java.util.Properties;
-
 import org.springframework.boot.actuate.health.AbstractHealthIndicator;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
@@ -39,15 +37,7 @@ import org.springframework.util.Assert;
  */
 public class RedisHealthIndicator extends AbstractHealthIndicator {
 
-	static final String VERSION = "version";
+	private static final String REDIS_VERSION_PROPERTY = "redis_version";
-
-	static final String CLUSTER_SIZE = "cluster_size";
-
-	static final String SLOTS_UP = "slots_up";
-
-	static final String SLOTS_FAIL = "slots_fail";
-
-	static final String REDIS_VERSION = "redis_version";
 
 	private final RedisConnectionFactory redisConnectionFactory;
 
@@ -61,20 +51,24 @@ public class RedisHealthIndicator extends AbstractHealthIndicator {
 	protected void doHealthCheck(Health.Builder builder) throws Exception {
 		RedisConnection connection = RedisConnectionUtils.getConnection(this.redisConnectionFactory);
 		try {
-			if (connection instanceof RedisClusterConnection) {
+			doHealthCheck(builder, connection);
-				ClusterInfo clusterInfo = ((RedisClusterConnection) connection).clusterGetClusterInfo();
-				builder.up().withDetail(CLUSTER_SIZE, clusterInfo.getClusterSize())
-						.withDetail(SLOTS_UP, clusterInfo.getSlotsOk())
-						.withDetail(SLOTS_FAIL, clusterInfo.getSlotsFail());
-			}
-			else {
-				Properties info = connection.info();
-				builder.up().withDetail(VERSION, info.getProperty(REDIS_VERSION));
-			}
 		}
 		finally {
 			RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory, false);
 		}
 	}
 
+	private void doHealthCheck(Health.Builder builder, RedisConnection connection) {
+		if (connection instanceof RedisClusterConnection) {
+			ClusterInfo clusterInfo = ((RedisClusterConnection) connection).clusterGetClusterInfo();
+			builder.up().withDetail("cluster_size", clusterInfo.getClusterSize())
+					.withDetail("slots_up", clusterInfo.getSlotsOk())
+					.withDetail("slots_fail", clusterInfo.getSlotsFail());
+		}
+		else {
+			String version = connection.info().getProperty(REDIS_VERSION_PROPERTY);
+			builder.up().withDetail("version", version);
+		}
+	}
+
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicator.java

@@ -40,6 +40,8 @@ import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
  */
 public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
 
+	private static final String REDIS_VERSION_PROPERTY = "redis_version";
+
 	private final ReactiveRedisConnectionFactory connectionFactory;
 
 	public RedisReactiveHealthIndicator(ReactiveRedisConnectionFactory connectionFactory) {
@@ -59,11 +61,9 @@ public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicato
 					.onErrorResume((ex) -> Mono.just(down(builder, ex)))
 					.flatMap((health) -> clusterConnection.closeLater().thenReturn(health));
 		}
-		else {
+		return connection.serverCommands().info().map((info) -> up(builder, info))
-			return connection.serverCommands().info().map((info) -> up(builder, info))
+				.onErrorResume((ex) -> Mono.just(down(builder, ex)))
-					.onErrorResume((ex) -> Mono.just(down(builder, ex)))
+				.flatMap((health) -> connection.closeLater().thenReturn(health));
-					.flatMap((health) -> connection.closeLater().thenReturn(health));
-		}
 	}
 
 	private Mono<ReactiveRedisConnection> getConnection() {
@@ -72,14 +72,13 @@ public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicato
 	}
 
 	private Health up(Health.Builder builder, Properties info) {
-		return builder.up()
+		return builder.up().withDetail("version", info.getProperty(REDIS_VERSION_PROPERTY)).build();
-				.withDetail(RedisHealthIndicator.VERSION, info.getProperty(RedisHealthIndicator.REDIS_VERSION)).build();
 	}
 
 	private Health up(Health.Builder builder, ClusterInfo clusterInfo) {
-		return builder.up().withDetail(RedisHealthIndicator.CLUSTER_SIZE, clusterInfo.getClusterSize())
+		return builder.up().withDetail("cluster_size", clusterInfo.getClusterSize())
-				.withDetail(RedisHealthIndicator.SLOTS_UP, clusterInfo.getSlotsOk())
+				.withDetail("slots_up", clusterInfo.getSlotsOk()).withDetail("slots_fail", clusterInfo.getSlotsFail())
-				.withDetail(RedisHealthIndicator.SLOTS_FAIL, clusterInfo.getSlotsFail()).build();
+				.build();
 	}
 
 	private Health down(Health.Builder builder, Throwable cause) {

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/LocalHttpClientTransport.java

@@ -69,8 +69,10 @@ final class LocalHttpClientTransport extends HttpClientTransport {
 
 	private static String socketFilePath(Environment environment) {
 		String host = environment.get(DOCKER_HOST);
-		return (host != null && host.startsWith(UNIX_SOCKET_PREFIX)) ? host.substring(UNIX_SOCKET_PREFIX.length())
+		if (host != null && host.startsWith(UNIX_SOCKET_PREFIX)) {
-				: host;
+			return host.substring(UNIX_SOCKET_PREFIX.length());
+		}
+		return host;
 	}
 
 	/**

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/ZipFileTarArchive.java

@@ -76,7 +76,7 @@ public class ZipFileTarArchive implements TarArchive {
 
 	private void assertArchiveHasEntries(File jarFile) {
 		try (ZipFile zipFile = new ZipFile(jarFile)) {
-			Assert.state(zipFile.getEntries().hasMoreElements(), "File '" + jarFile.toString()
+			Assert.state(zipFile.getEntries().hasMoreElements(), () -> "File '" + jarFile
 					+ "' is not compatible with buildpacks; ensure jar file is valid and launch script is not enabled");
 		}
 		catch (IOException ex) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.