Merge pull request #10658 from dreis2211:assert-state-supplier

* pr/10658:
  Polish "Use Assert.state() with Supplier where possible"
  Use Assert.state() with Supplier where possible

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/EndpointRequest.java

@@ -163,7 +163,7 @@ private String getPathId(Object source) {
 		private String getPathId(Class<?> source) {
 			Endpoint annotation = AnnotationUtils.findAnnotation(source, Endpoint.class);
 			Assert.state(annotation != null,
-					"Class " + source + " is not annotated with @Endpoint");
+					() -> "Class " + source + " is not annotated with @Endpoint");
 			return annotation.id();
 		}
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscoverer.java

@@ -140,7 +140,7 @@ private Map<Class<?>, EndpointExtensionInfo<T>> discoverExtensions(
 			AnnotationAttributes endpointAttributes = AnnotatedElementUtils
 					.getMergedAnnotationAttributes(endpointType, Endpoint.class);
 			Assert.state(isExposedOver(endpointAttributes, exposure),
-					"Invalid extension " + beanType.getName() + "': endpoint '"
+					() -> "Invalid extension " + beanType.getName() + "': endpoint '"
 							+ endpointType.getName()
 							+ "' does not support such extension");
 			EndpointInfo<T> info = getEndpointInfo(endpoints, beanType, endpointType);
@@ -163,7 +163,7 @@ private Map<Class<?>, EndpointExtensionInfo<T>> discoverExtensions(
 	private EndpointInfo<T> getEndpointInfo(Map<Class<?>, EndpointInfo<T>> endpoints,
 			Class<?> beanType, Class<?> endpointClass) {
 		EndpointInfo<T> endpoint = endpoints.get(endpointClass);
-		Assert.state(endpoint != null, "Invalid extension '" + beanType.getName()
+		Assert.state(endpoint != null, () -> "Invalid extension '" + beanType.getName()
 				+ "': no endpoint found with type '" + endpointClass.getName() + "'");
 		return endpoint;
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java

@@ -52,7 +52,7 @@ private CacheConfigurations() {
 
 	public static String getConfigurationClass(CacheType cacheType) {
 		Class<?> configurationClass = MAPPINGS.get(cacheType);
-		Assert.state(configurationClass != null, "Unknown cache type " + cacheType);
+		Assert.state(configurationClass != null, () -> "Unknown cache type " + cacheType);
 		return configurationClass.getName();
 	}
 

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

@@ -124,7 +124,7 @@ public void checkLocationExists() {
 						"Migration script locations not configured");
 				boolean exists = hasAtLeastOneLocation();
 				Assert.state(exists,
-						"Cannot find migrations location in: " + this.properties
+						() -> "Cannot find migrations location in: " + this.properties
 								.getLocations()
 						+ " (please add migrations or check your Flyway configuration)");
 			}

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

@@ -232,7 +232,7 @@ public void setDriverClassName(String driverClassName) {
 	public String determineDriverClassName() {
 		if (StringUtils.hasText(this.driverClassName)) {
 			Assert.state(driverClassIsLoadable(),
-					"Cannot load driver class: " + this.driverClassName);
+					() -> "Cannot load driver class: " + this.driverClassName);
 			return this.driverClassName;
 		}
 		String driverClassName = null;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

@@ -103,7 +103,7 @@ public void checkChangelogExists() {
 				Resource resource = this.resourceLoader
 						.getResource(this.properties.getChangeLog());
 				Assert.state(resource.exists(),
-						"Cannot find changelog location: " + resource
+						() -> "Cannot find changelog location: " + resource
 								+ " (please add changelog or check your Liquibase "
 								+ "configuration)");
 			}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java

@@ -48,7 +48,7 @@ private SessionStoreMappings() {
 	public static String getConfigurationClass(StoreType sessionStoreType) {
 		Class<?> configurationClass = MAPPINGS.get(sessionStoreType);
 		Assert.state(configurationClass != null,
-				"Unknown session store type " + sessionStoreType);
+				() -> "Unknown session store type " + sessionStoreType);
 		return configurationClass.getName();
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java

@@ -178,7 +178,7 @@ public String getUserId() {
 			SecurityContext context = SecurityContextHolder.getContext();
 			Authentication authentication = context.getAuthentication();
 			Assert.state(authentication != null,
-					"Unable to get a " + "ConnectionRepository: no user signed in");
+					"Unable to get a ConnectionRepository: no user signed in");
 			return authentication.getName();
 		}
 

spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java

@@ -93,7 +93,7 @@ private File findLaunchScript() throws IOException {
 		}
 		File bin = new File(unpacked.listFiles()[0], "bin");
 		File launchScript = new File(bin, isWindows() ? "spring.bat" : "spring");
-		Assert.state(launchScript.exists() && launchScript.isFile(),
+		Assert.state(launchScript.exists() && launchScript.isFile(), () ->
 				"Could not find CLI launch script " + launchScript.getAbsolutePath());
 		return launchScript;
 	}

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java

@@ -76,7 +76,7 @@ public String getRelativeName() {
 		File file = this.file.getAbsoluteFile();
 		String folderName = StringUtils.cleanPath(folder.getPath());
 		String fileName = StringUtils.cleanPath(file.getPath());
-		Assert.state(fileName.startsWith(folderName), "The file " + fileName
+		Assert.state(fileName.startsWith(folderName), () -> "The file " + fileName
 				+ " is not contained in the source folder " + folderName);
 		return fileName.substring(folderName.length() + 1);
 	}