Merge branch '2.7.x' into 3.0.x

Author: philwebb

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java

@@ -203,7 +203,7 @@ public SELF withSystemProperties(String... pairs) {
 	/**
 	 * Customize the {@link ClassLoader} that the {@link ApplicationContext} should use
 	 * for resource loading and bean class loading.
-	 * @param classLoader the classloader to use (can be null to use the default)
+	 * @param classLoader the classloader to use (or {@code null} to use the default)
 	 * @return a new instance with the updated class loader
 	 * @see FilteredClassLoader
 	 */

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

@@ -106,7 +106,7 @@ public SpringApplicationBuilder(ResourceLoader resourceLoader, Class<?>... sourc
 	 * 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}.
-	 * @param resourceLoader the resource loader (can be null)
+	 * @param resourceLoader the resource loader or {@code null}
 	 * @param sources the sources
 	 * @return the {@link SpringApplication} instance
 	 * @since 2.6.0

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -98,10 +98,12 @@ public enum DatabaseDriver {
 	 * @since 2.1.0
 	 */
 	HANA("HDB", "com.sap.db.jdbc.Driver", "com.sap.db.jdbcext.XADataSourceSAP", "SELECT 1 FROM SYS.DUMMY") {
+
 		@Override
 		protected Collection<String> getUrlPrefixes() {
 			return Collections.singleton("sap");
 		}
+
 	},
 
 	/**
@@ -240,14 +242,18 @@ public String getId() {
 		return name().toLowerCase(Locale.ENGLISH);
 	}
 
-	protected boolean matchProductName(String productName) {
-		return this.productName != null && this.productName.equalsIgnoreCase(productName);
-	}
-
+	/**
+	 * Return the url prefixes of this driver.
+	 * @return the url prefixes
+	 */
 	protected Collection<String> getUrlPrefixes() {
 		return Collections.singleton(name().toLowerCase(Locale.ENGLISH));
 	}
 
+	protected boolean matchProductName(String productName) {
+		return this.productName != null && this.productName.equalsIgnoreCase(productName);
+	}
+
 	/**
 	 * Return the driver class name.
 	 * @return the class name or {@code null}