Merge pull request #44044 from izeye

* pr/44044:
  Use consistent exception messages in Assert calls

Closes gh-44044

Author: mhalbritter

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/data/mongo/MongoHealthIndicator.java

@@ -37,7 +37,7 @@ public class MongoHealthIndicator extends AbstractHealthIndicator {
 
 	public MongoHealthIndicator(MongoTemplate mongoTemplate) {
 		super("MongoDB health check failed");
-		Assert.notNull(mongoTemplate, "MongoTemplate must not be null");
+		Assert.notNull(mongoTemplate, "'mongoTemplate' must not be null");
 		this.mongoTemplate = mongoTemplate;
 	}
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointExporter.java

@@ -95,7 +95,7 @@ private boolean hasOperations(ExposableJmxEndpoint endpoint) {
 	}
 
 	private ObjectName register(ExposableJmxEndpoint endpoint) {
-		Assert.notNull(endpoint, "Endpoint must not be null");
+		Assert.notNull(endpoint, "'endpoint' must not be null");
 		try {
 			ObjectName name = this.objectNameFactory.getObjectName(endpoint);
 			EndpointMBean mbean = new EndpointMBean(this.responseMapper, this.classLoader, endpoint);

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java

@@ -81,8 +81,8 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
 	 * @since 2.4.0
 	 */
 	public DefaultErrorViewResolver(ApplicationContext applicationContext, Resources resources) {
-		Assert.notNull(applicationContext, "ApplicationContext must not be null");
-		Assert.notNull(resources, "Resources must not be null");
+		Assert.notNull(applicationContext, "'applicationContext' must not be null");
+		Assert.notNull(resources, "'resources' must not be null");
 		this.applicationContext = applicationContext;
 		this.resources = resources;
 		this.templateAvailabilityProviders = new TemplateAvailabilityProviders(applicationContext);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java

@@ -574,7 +574,7 @@ DataSourceScriptDatabaseInitializer customInitializer(DataSource dataSource) {
 	static class ComponentThatUsesScheduler {
 
 		ComponentThatUsesScheduler(Scheduler scheduler) {
-			Assert.notNull(scheduler, "Scheduler must not be null");
+			Assert.notNull(scheduler, "'scheduler' must not be null");
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationEarlyInitializationIntegrationTests.java

@@ -57,7 +57,7 @@ static class TestConfiguration {
 
 		@Bean
 		MapSessionRepository mapSessionRepository(ConfigurableApplicationContext context) {
-			Assert.isTrue(context.getBeanFactory().isConfigurationFrozen(), "Context should be frozen");
+			Assert.isTrue(context.getBeanFactory().isConfigurationFrozen(), "'context' should be frozen");
 			return new MapSessionRepository(new LinkedHashMap<>());
 		}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolverTests.java

@@ -83,14 +83,14 @@ void setup() {
 	@Test
 	void createWhenApplicationContextIsNullShouldThrowException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new DefaultErrorViewResolver(null, new Resources()))
-			.withMessageContaining("ApplicationContext must not be null");
+			.withMessageContaining("'applicationContext' must not be null");
 	}
 
 	@Test
 	void createWhenResourcePropertiesIsNullShouldThrowException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> new DefaultErrorViewResolver(mock(ApplicationContext.class), (Resources) null))
-			.withMessageContaining("Resources must not be null");
+			.withMessageContaining("'resources' must not be null");
 	}
 
 	@Test

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java

@@ -47,7 +47,7 @@ public HttpStatusHandler() {
 	 * @param status the status
 	 */
 	public HttpStatusHandler(HttpStatus status) {
-		Assert.notNull(status, "Status must not be null");
+		Assert.notNull(status, "'status' must not be null");
 		this.status = status;
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpStatusHandlerTests.java

@@ -56,7 +56,7 @@ void setup() {
 	@Test
 	void statusMustNotBeNull() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new HttpStatusHandler(null))
-			.withMessageContaining("Status must not be null");
+			.withMessageContaining("'status' must not be null");
 	}
 
 	@Test

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

@@ -44,7 +44,7 @@ public Object resolve(Object instance) {
 
 	@SuppressWarnings("unchecked")
 	private static <T> T getUltimateTargetObject(Object candidate) {
-		Assert.notNull(candidate, "Candidate must not be null");
+		Assert.notNull(candidate, "'candidate' must not be null");
 		try {
 			if (AopUtils.isAopProxy(candidate) && candidate instanceof Advised advised) {
 				TargetSource targetSource = advised.getTargetSource();

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackCoordinates.java

@@ -42,7 +42,7 @@ final class BuildpackCoordinates {
 	private final String version;
 
 	private BuildpackCoordinates(String id, String version) {
-		Assert.hasText(id, "ID must not be empty");
+		Assert.hasText(id, "'id' must not be empty");
 		this.id = id;
 		this.version = version;
 	}
@@ -123,7 +123,7 @@ private static BuildpackCoordinates fromToml(TomlParseResult toml, Path path) {
 	 * @return a new {@link BuildpackCoordinates} instance
 	 */
 	static BuildpackCoordinates fromBuildpackMetadata(BuildpackMetadata buildpackMetadata) {
-		Assert.notNull(buildpackMetadata, "BuildpackMetadata must not be null");
+		Assert.notNull(buildpackMetadata, "'buildpackMetadata' must not be null");
 		return new BuildpackCoordinates(buildpackMetadata.getId(), buildpackMetadata.getVersion());
 	}