Merge branch '3.1.x' into 3.2.x

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/service/connection/ConnectionDetailsFactories.java

@@ -122,28 +122,11 @@ public class ConnectionDetailsFactories {
 		@SuppressWarnings("unchecked")
 		private static <S, D extends ConnectionDetails> Registration<S, D> get(ConnectionDetailsFactory<S, D> factory) {
 			ResolvableType type = ResolvableType.forClass(ConnectionDetailsFactory.class, factory.getClass());
-			Class<?>[] generics = resolveGenerics(type);
+			Class<?>[] generics = type.resolveGenerics();
-			if (generics != null) {
+			Class<S> sourceType = (Class<S>) generics[0];
-				return new Registration<>((Class<S>) generics[0], (Class<D>) generics[1], factory);
+			Class<D> connectionDetailsType = (Class<D>) generics[1];
-			}
+			return (sourceType != null && connectionDetailsType != null)
-			return null;
+					? new Registration<>(sourceType, connectionDetailsType, factory) : null;
-		}
-
-		/**
-		 * Resolve the generics of the given {@link ResolvableType} or {@code null} if any
-		 * of them cannot be resolved.
-		 * @param type the type to inspect
-		 * @return the resolved generics if they can be loaded from the classpath,
-		 * {@code null} otherwise
-		 */
-		private static Class<?>[] resolveGenerics(ResolvableType type) {
-			Class<?>[] resolvedGenerics = type.resolveGenerics();
-			for (Class<?> genericRawType : resolvedGenerics) {
-				if (genericRawType == null) {
-					return null;
-				}
-			}
-			return resolvedGenerics;
 		}
 
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java

@@ -97,11 +97,11 @@ class SpringApplicationBannerPrinter {
 	private String createStringFromBanner(Banner banner, Environment environment, Class<?> mainApplicationClass)
 			throws UnsupportedEncodingException {
 		String charset = environment.getProperty("spring.banner.charset", StandardCharsets.UTF_8.name());
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-		try (PrintStream printStream = new PrintStream(baos, false, charset)) {
+		try (PrintStream out = new PrintStream(byteArrayOutputStream, false, charset)) {
-			banner.printBanner(environment, mainApplicationClass, printStream);
+			banner.printBanner(environment, mainApplicationClass, out);
 		}
-		return baos.toString(charset);
+		return byteArrayOutputStream.toString(charset);
 	}
 
 	/**

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java

@@ -62,8 +62,7 @@ class MapBinder extends AggregateBinder<Map<Object, Object>> {
 				ConfigurationProperty property = source.getConfigurationProperty(name);
 				if (property != null && !hasDescendants) {
 					getContext().setConfigurationProperty(property);
-					Object result = property.getValue();
+					Object result = getContext().getPlaceholdersResolver().resolvePlaceholders(property.getValue());
-					result = getContext().getPlaceholdersResolver().resolvePlaceholders(result);
 					return getContext().getConverter().convert(result, target);
 				}
 				source = source.filter(name::isAncestorOf);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/GracefulShutdown.java

@@ -104,7 +104,6 @@ final class GracefulShutdown {
 					}
 				}
 			}
-
 		}
 		catch (InterruptedException ex) {
 			Thread.currentThread().interrupt();