Merge branch '6.0.x'

spring-projects · Nov 15, 2023 · c485e9b · c485e9b
2 parents 3a70c71 + 51cdff5
commit c485e9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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.
@@ -161,7 +161,8 @@ default void addFile(Kind kind, String path, ThrowingConsumer<Appendable> conten
 
 	private static String getClassNamePath(String className) {
 		Assert.hasLength(className, "'className' must not be empty");
-		Assert.isTrue(isJavaIdentifier(className), "'className' must be a valid identifier");
+		Assert.isTrue(isJavaIdentifier(className),
+				"'className' must be a valid identifier, got '" + className + "'");
 		return ClassUtils.convertClassNameToResourcePath(className) + ".java";
 	}
 

diff --git a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-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.
@@ -78,7 +78,7 @@ void addSourceFileWithCharSequenceWhenClassNameIsInvalidThrowsException() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.generatedFiles
 						.addSourceFile("com/example/HelloWorld.java", "{}"))
-				.withMessage("'className' must be a valid identifier");
+				.withMessage("'className' must be a valid identifier, got 'com/example/HelloWorld.java'");
 	}
 
 	@Test