Use consistent wording in precondition error messages

Author: sbrannen

spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -82,7 +82,7 @@ public RuntimeBeanReference(Class<?> beanType) {
 	 * @since 5.2
 	 */
 	public RuntimeBeanReference(Class<?> beanType, boolean toParent) {
-		Assert.notNull(beanType, "'beanType' must not be empty");
+		Assert.notNull(beanType, "'beanType' must not be null");
 		this.beanName = beanType.getName();
 		this.beanType = beanType;
 		this.toParent = toParent;

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -1054,7 +1054,7 @@ public Scope getRegisteredScope(String scopeName) {
 
 	@Override
 	public void setApplicationStartup(ApplicationStartup applicationStartup) {
-		Assert.notNull(applicationStartup, "applicationStartup should not be null");
+		Assert.notNull(applicationStartup, "applicationStartup must not be null");
 		this.applicationStartup = applicationStartup;
 	}
 

spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java

@@ -439,7 +439,7 @@ ApplicationEventMulticaster getApplicationEventMulticaster() throws IllegalState
 
 	@Override
 	public void setApplicationStartup(ApplicationStartup applicationStartup) {
-		Assert.notNull(applicationStartup, "applicationStartup should not be null");
+		Assert.notNull(applicationStartup, "applicationStartup must not be null");
 		this.applicationStartup = applicationStartup;
 	}
 

spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java

@@ -159,7 +159,7 @@ public ScheduledAnnotationBeanPostProcessor() {
 	 * @since 5.1
 	 */
 	public ScheduledAnnotationBeanPostProcessor(ScheduledTaskRegistrar registrar) {
-		Assert.notNull(registrar, "ScheduledTaskRegistrar is required");
+		Assert.notNull(registrar, "ScheduledTaskRegistrar must not be null");
 		this.registrar = registrar;
 	}
 

spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java

@@ -44,8 +44,8 @@ class InvocationsRecorderClassTransformer implements ClassFileTransformer {
 	private final String[] ignoredPackages;
 
 	public InvocationsRecorderClassTransformer(String[] instrumentedPackages, String[] ignoredPackages) {
-		Assert.notNull(instrumentedPackages, "instrumentedPackages should not be null");
-		Assert.notNull(ignoredPackages, "ignoredPackages should not be null");
+		Assert.notNull(instrumentedPackages, "instrumentedPackages must not be null");
+		Assert.notNull(ignoredPackages, "ignoredPackages must not be null");
 		this.instrumentedPackages = rewriteToAsmFormat(instrumentedPackages);
 		this.ignoredPackages = rewriteToAsmFormat(ignoredPackages);
 	}

spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsInvocationsAssert.java

@@ -74,7 +74,7 @@ private void configureRuntimeHints(RuntimeHints hints) {
 	 * @throws AssertionError if any of the recorded invocations has no match in the provided hints
 	 */
 	public void match(RuntimeHints runtimeHints) {
-		Assert.notNull(runtimeHints, "RuntimeHints should not be null");
+		Assert.notNull(runtimeHints, "RuntimeHints must not be null");
 		configureRuntimeHints(runtimeHints);
 		List<RecordedInvocation> noMatchInvocations =
 				this.actual.recordedInvocations().filter(invocation -> !invocation.matches(runtimeHints)).toList();
@@ -84,7 +84,7 @@ public void match(RuntimeHints runtimeHints) {
 	}
 
 	public ListAssert<RecordedInvocation> notMatching(RuntimeHints runtimeHints) {
-		Assert.notNull(runtimeHints, "RuntimeHints should not be null");
+		Assert.notNull(runtimeHints, "RuntimeHints must not be null");
 		configureRuntimeHints(runtimeHints);
 		return ListAssert.assertThatStream(this.actual.recordedInvocations()
 				.filter(invocation -> !invocation.matches(runtimeHints)));

spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java

@@ -48,7 +48,7 @@ private RuntimeHintsRecorder() {
 	 * @return the recorded invocations
 	 */
 	public synchronized static RuntimeHintsInvocations record(Runnable action) {
-		Assert.notNull(action, "Runnable action should not be null");
+		Assert.notNull(action, "Runnable action must not be null");
 		Assert.isTrue(RuntimeHintsAgent.isLoaded(), "RuntimeHintsAgent should be loaded in the current JVM");
 		RuntimeHintsRecorder recorder = new RuntimeHintsRecorder();
 		RecordedInvocationsPublisher.addListener(recorder.listener);

spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java

@@ -51,14 +51,15 @@ public class ReflectionHintsPredicates {
 	ReflectionHintsPredicates() {
 	}
 
+
 	/**
 	 * Return a predicate that checks whether a reflection hint is registered for the given type.
 	 * <p>The returned type exposes additional methods that refine the predicate behavior.
 	 * @param typeReference the type
 	 * @return the {@link RuntimeHints} predicate
 	 */
 	public TypeHintPredicate onType(TypeReference typeReference) {
-		Assert.notNull(typeReference, "'typeReference' should not be null");
+		Assert.notNull(typeReference, "'typeReference' must not be null");
 		return new TypeHintPredicate(typeReference);
 	}
 
@@ -69,7 +70,7 @@ public TypeHintPredicate onType(TypeReference typeReference) {
 	 * @return the {@link RuntimeHints} predicate
 	 */
 	public TypeHintPredicate onType(Class<?> type) {
-		Assert.notNull(type, "'type' should not be null");
+		Assert.notNull(type, "'type' must not be null");
 		return new TypeHintPredicate(TypeReference.of(type));
 	}
 
@@ -81,7 +82,7 @@ public TypeHintPredicate onType(Class<?> type) {
 	 * @return the {@link RuntimeHints} predicate
 	 */
 	public ConstructorHintPredicate onConstructor(Constructor<?> constructor) {
-		Assert.notNull(constructor, "'constructor' should not be null");
+		Assert.notNull(constructor, "'constructor' must not be null");
 		return new ConstructorHintPredicate(constructor);
 	}
 
@@ -93,7 +94,7 @@ public ConstructorHintPredicate onConstructor(Constructor<?> constructor) {
 	 * @return the {@link RuntimeHints} predicate
 	 */
 	public MethodHintPredicate onMethod(Method method) {
-		Assert.notNull(method, "'method' should not be null");
+		Assert.notNull(method, "'method' must not be null");
 		return new MethodHintPredicate(method);
 	}
 
@@ -108,8 +109,8 @@ public MethodHintPredicate onMethod(Method method) {
 	 * @throws IllegalArgumentException if the method cannot be found or if multiple methods are found with the same name.
 	 */
 	public MethodHintPredicate onMethod(Class<?> type, String methodName) {
-		Assert.notNull(type, "'type' should not be null");
-		Assert.hasText(methodName, "'methodName' should not be empty");
+		Assert.notNull(type, "'type' must not be null");
+		Assert.hasText(methodName, "'methodName' must not be empty");
 		return new MethodHintPredicate(getMethod(type, methodName));
 	}
 
@@ -125,8 +126,8 @@ public MethodHintPredicate onMethod(Class<?> type, String methodName) {
 	 * @throws IllegalArgumentException if the method cannot be found or if multiple methods are found with the same name.
 	 */
 	public MethodHintPredicate onMethod(String className, String methodName) throws ClassNotFoundException {
-		Assert.hasText(className, "'className' should not be empty");
-		Assert.hasText(methodName, "'methodName' should not be empty");
+		Assert.hasText(className, "'className' must not be empty");
+		Assert.hasText(methodName, "'methodName' must not be empty");
 		return onMethod(Class.forName(className), methodName);
 	}
 
@@ -155,8 +156,8 @@ else if (methods.size() > 1) {
 	 * @throws IllegalArgumentException if a field cannot be found with the given name.
 	 */
 	public FieldHintPredicate onField(Class<?> type, String fieldName) {
-		Assert.notNull(type, "'type' should not be null");
-		Assert.hasText(fieldName, "'fieldName' should not be empty");
+		Assert.notNull(type, "'type' must not be null");
+		Assert.hasText(fieldName, "'fieldName' must not be empty");
 		Field field = ReflectionUtils.findField(type, fieldName);
 		if (field == null) {
 			throw new IllegalArgumentException("No field named '%s' on class %s".formatted(fieldName, type.getName()));
@@ -176,8 +177,8 @@ public FieldHintPredicate onField(Class<?> type, String fieldName) {
 	 * @throws IllegalArgumentException if a field cannot be found with the given name.
 	 */
 	public FieldHintPredicate onField(String className, String fieldName) throws ClassNotFoundException {
-		Assert.hasText(className, "'className' should not be empty");
-		Assert.hasText(fieldName, "'fieldName' should not be empty");
+		Assert.hasText(className, "'className' must not be empty");
+		Assert.hasText(fieldName, "'fieldName' must not be empty");
 		return onField(Class.forName(className), fieldName);
 	}
 
@@ -189,7 +190,7 @@ public FieldHintPredicate onField(String className, String fieldName) throws Cla
 	 * @return the {@link RuntimeHints} predicate
 	 */
 	public FieldHintPredicate onField(Field field) {
-		Assert.notNull(field, "'field' should not be null");
+		Assert.notNull(field, "'field' must not be null");
 		return new FieldHintPredicate(field);
 	}
 
@@ -218,7 +219,7 @@ public boolean test(RuntimeHints hints) {
 		 * @return the refined {@link RuntimeHints} predicate
 		 */
 		public Predicate<RuntimeHints> withMemberCategory(MemberCategory memberCategory) {
-			Assert.notNull(memberCategory, "'memberCategory' should not be null");
+			Assert.notNull(memberCategory, "'memberCategory' must not be null");
 			return this.and(hints -> getTypeHint(hints).getMemberCategories().contains(memberCategory));
 		}
 
@@ -228,7 +229,7 @@ public Predicate<RuntimeHints> withMemberCategory(MemberCategory memberCategory)
 		 * @return the refined {@link RuntimeHints} predicate
 		 */
 		public Predicate<RuntimeHints> withMemberCategories(MemberCategory... memberCategories) {
-			Assert.notEmpty(memberCategories, "'memberCategories' should not be empty");
+			Assert.notEmpty(memberCategories, "'memberCategories' must not be empty");
 			return this.and(hints -> getTypeHint(hints).getMemberCategories().containsAll(Arrays.asList(memberCategories)));
 		}
 
@@ -238,7 +239,7 @@ public Predicate<RuntimeHints> withMemberCategories(MemberCategory... memberCate
 		 * @return the refined {@link RuntimeHints} predicate
 		 */
 		public Predicate<RuntimeHints> withAnyMemberCategory(MemberCategory... memberCategories) {
-			Assert.notEmpty(memberCategories, "'memberCategories' should not be empty");
+			Assert.notEmpty(memberCategories, "'memberCategories' must not be empty");
 			return this.and(hints -> Arrays.stream(memberCategories)
 					.anyMatch(memberCategory -> getTypeHint(hints).getMemberCategories().contains(memberCategory)));
 		}

spring-core/src/main/java/org/springframework/aot/hint/predicate/SerializationHintsPredicates.java

@@ -35,6 +35,7 @@ public class SerializationHintsPredicates {
 	SerializationHintsPredicates() {
 	}
 
+
 	/**
 	 * Return a predicate that checks whether a {@link SerializationHints
 	 * serialization hint} is registered for the given type.
@@ -43,7 +44,7 @@ public class SerializationHintsPredicates {
 	 * @see java.lang.reflect.Proxy
 	 */
 	public Predicate<RuntimeHints> onType(Class<?> type) {
-		Assert.notNull(type, "'type' should not be null");
+		Assert.notNull(type, "'type' must not be null");
 		return onType(TypeReference.of(type));
 	}
 
@@ -55,7 +56,7 @@ public Predicate<RuntimeHints> onType(Class<?> type) {
 	 * @see java.lang.reflect.Proxy
 	 */
 	public Predicate<RuntimeHints> onType(TypeReference typeReference) {
-		Assert.notNull(typeReference, "'typeReference' should not be null");
+		Assert.notNull(typeReference, "'typeReference' must not be null");
 		return hints -> hints.serialization().javaSerializationHints().anyMatch(
 				hint -> hint.getType().equals(typeReference));
 	}

spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -57,7 +57,7 @@ public interface Converter<S, T> {
 	 * @since 5.3
 	 */
 	default <U> Converter<S, U> andThen(Converter<? super T, ? extends U> after) {
-		Assert.notNull(after, "After Converter must not be null");
+		Assert.notNull(after, "'after' Converter must not be null");
 		return (S s) -> {
 			T initialResult = convert(s);
 			return (initialResult != null ? after.convert(initialResult) : null);