From 5ac4c3bd767291fedaae02b7f1f43751b811eb8f Mon Sep 17 00:00:00 2001 From: PiotrFLEURY Date: Wed, 15 Nov 2023 19:01:02 +0100 Subject: [PATCH 1/2] Provide invalid class name in exception message See gh-31612 --- .../java/org/springframework/aot/generate/GeneratedFiles.java | 2 +- .../org/springframework/aot/generate/GeneratedFilesTests.java | 2 +- 2 files changed, 2 insertions(+), 2 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 index 411ec8b46b..f1ae40ddf0 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java @@ -161,7 +161,7 @@ public interface GeneratedFiles { 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' " + className + " must be a valid identifier"); 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 index 9f1f68ef30..4f13505a7b 100644 --- a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java @@ -78,7 +78,7 @@ class GeneratedFilesTests { assertThatIllegalArgumentException() .isThrownBy(() -> this.generatedFiles .addSourceFile("com/example/HelloWorld.java", "{}")) - .withMessage("'className' must be a valid identifier"); + .withMessage("'className' com/example/HelloWorld.java must be a valid identifier"); } @Test From d93114df9ab2daeef1bf9383d00bfa2e0be97669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 15 Nov 2023 20:45:24 +0100 Subject: [PATCH 2/2] Polish "Provide invalid class name in exception message" See gh-31612 --- .../org/springframework/aot/generate/GeneratedFiles.java | 5 +++-- .../springframework/aot/generate/GeneratedFilesTests.java | 4 ++-- 2 files changed, 5 insertions(+), 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 index f1ae40ddf0..bd6ec60ae2 100644 --- 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 @@ 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"; } 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 index 4f13505a7b..0eeb510490 100644 --- 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 @@ 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