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

Merge branch '3.4.x'

This commit is contained in:
Phillip Webb 2025-01-24 19:22:58 -08:00
parent 680c1682e7 67a585e8a3
commit 6b654f4cb8
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureRules.java
View File

@ -127,9 +127,9 @@ final class ArchitectureRules {
.stream() .stream()
.filter(notAnnotatedWithLazy) .filter(notAnnotatedWithLazy)
.filter((parameter) -> notOfASafeType.test(parameter.getRawType())) .filter((parameter) -> notOfASafeType.test(parameter.getRawType()))
.forEach((parameter) -> events.add(SimpleConditionEvent.violated(parameter, .forEach((parameter) -> addViolation(events, parameter,
parameter.getDescription() + " will cause eager initialization as it is " parameter.getDescription() + " will cause eager initialization as it is "
+ notAnnotatedWithLazy.getDescription() + " and is " + notOfASafeType.getDescription()))); + notAnnotatedWithLazy.getDescription() + " and is " + notOfASafeType.getDescription()));
} }
private static DescribedPredicate<JavaClass> notAnnotatedWithRoleInfrastructure() { private static DescribedPredicate<JavaClass> notAnnotatedWithRoleInfrastructure() {
@ -154,7 +154,7 @@ final class ArchitectureRules {
private static void onlyInjectEnvironment(JavaMethod item, ConditionEvents events) { private static void onlyInjectEnvironment(JavaMethod item, ConditionEvents events) {
if (item.getParameters().stream().anyMatch(ArchitectureRules::isNotEnvironment)) { if (item.getParameters().stream().anyMatch(ArchitectureRules::isNotEnvironment)) {
events.add(SimpleConditionEvent.violated(item, item.getDescription() + " should only inject Environment")); addViolation(events, item, item.getDescription() + " should only inject Environment");
} }
} }
@ -222,8 +222,8 @@ final class ArchitectureRules {
if (!properties.containsKey("type") && !properties.containsKey("name")) { if (!properties.containsKey("type") && !properties.containsKey("name")) {
conditionalAnnotation.get("value").ifPresent((value) -> { conditionalAnnotation.get("value").ifPresent((value) -> {
if (containsOnlySingleType((JavaType[]) value, item.getReturnType())) { if (containsOnlySingleType((JavaType[]) value, item.getReturnType())) {
events.add(SimpleConditionEvent.violated(item, conditionalAnnotation.getDescription() addViolation(events, item, conditionalAnnotation.getDescription()
+ " should not specify only a value that is the same as the method's return type")); + " should not specify only a value that is the same as the method's return type");
} }
}); });
} }
@ -251,8 +251,8 @@ final class ArchitectureRules {
if (properties.size() == 1 && item.getParameterTypes().size() == 1) { if (properties.size() == 1 && item.getParameterTypes().size() == 1) {
enumSourceAnnotation.get("value").ifPresent((value) -> { enumSourceAnnotation.get("value").ifPresent((value) -> {
if (value.equals(item.getParameterTypes().get(0))) { if (value.equals(item.getParameterTypes().get(0))) {
events.add(SimpleConditionEvent.violated(item, enumSourceAnnotation.getDescription() addViolation(events, item, enumSourceAnnotation.getDescription()
+ " should not specify only a value that is the same as the method's parameter type")); + " should not specify only a value that is the same as the method's parameter type");
} }
}); });
} }
@ -285,8 +285,8 @@ final class ArchitectureRules {
.getAnnotationOfType("org.springframework.boot.context.properties.ConfigurationProperties"); .getAnnotationOfType("org.springframework.boot.context.properties.ConfigurationProperties");
Map<String, Object> properties = configurationPropertiesAnnotation.getProperties(); Map<String, Object> properties = configurationPropertiesAnnotation.getProperties();
if (properties.size() == 1 && properties.containsKey("prefix")) { if (properties.size() == 1 && properties.containsKey("prefix")) {
events.add(SimpleConditionEvent.violated(item, configurationPropertiesAnnotation.getDescription() addViolation(events, item, configurationPropertiesAnnotation.getDescription()
+ " should specify implicit 'value' attribute other than explicit 'prefix' attribute")); + " should specify implicit 'value' attribute other than explicit 'prefix' attribute");
} }
} }
@ -354,6 +354,10 @@ final class ArchitectureRules {
}; };
} }
private static void addViolation(ConditionEvents events, Object correspondingObject, String message) {
events.add(SimpleConditionEvent.violated(correspondingObject, message));
}
private static String shouldUse(String string) { private static String shouldUse(String string) {
return string + " should be used instead"; return string + " should be used instead";
} }