Browse Source

Polish "Provide invalid class name in exception message"

See gh-31612
6.0.x^2
Stéphane Nicoll 1 year ago
parent
commit
d93114df9a
  1. 5
      spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java
  2. 4
      spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java

5
spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java

@ -1,5 +1,5 @@ @@ -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 @@ public interface GeneratedFiles { @@ -161,7 +161,8 @@ public interface GeneratedFiles {
private static String getClassNamePath(String className) {
Assert.hasLength(className, "'className' must not be empty");
Assert.isTrue(isJavaIdentifier(className), "'className' " + className + " must be a valid identifier");
Assert.isTrue(isJavaIdentifier(className),
"'className' must be a valid identifier, got '" + className + "'");
return ClassUtils.convertClassNameToResourcePath(className) + ".java";
}

4
spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java

@ -1,5 +1,5 @@ @@ -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 @@ class GeneratedFilesTests { @@ -78,7 +78,7 @@ class GeneratedFilesTests {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.generatedFiles
.addSourceFile("com/example/HelloWorld.java", "{}"))
.withMessage("'className' com/example/HelloWorld.java must be a valid identifier");
.withMessage("'className' must be a valid identifier, got 'com/example/HelloWorld.java'");
}
@Test

Loading…
Cancel
Save