Browse Source

Merge pull request #31612 from PiotrFLEURY

* pr/31612:
  Polish "Provide invalid class name in exception message"
  Provide invalid class name in exception message

Closes gh-31612
6.0.x
Stéphane Nicoll 1 year ago
parent
commit
51cdff591c
  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 @@
/* /*
* 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

@ -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

Loading…
Cancel
Save