root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Stéphane Nicoll 2023-11-15 20:50:02 +01:00
parent 3a70c71c5e 51cdff591c
commit c485e9b74f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -161,7 +161,8 @@ public interface GeneratedFiles {
private static String getClassNamePath(String className) { private static String getClassNamePath(String className) {
Assert.hasLength(className, "'className' must not be empty"); 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"; return ClassUtils.convertClassNameToResourcePath(className) + ".java";
} }

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -78,7 +78,7 @@ class GeneratedFilesTests {
assertThatIllegalArgumentException() assertThatIllegalArgumentException()
.isThrownBy(() -> this.generatedFiles .isThrownBy(() -> this.generatedFiles
.addSourceFile("com/example/HelloWorld.java", "{}")) .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 @Test