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

Merge branch '3.3.x' into 3.4.x

This commit is contained in:
Phillip Webb 2025-01-24 19:21:55 -08:00
parent 3f00b08577 4b26a08206
commit 67a585e8a3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,9 +120,9 @@ final class ArchitectureRules {
.stream()
.filter(notAnnotatedWithLazy)
.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 "
+ notAnnotatedWithLazy.getDescription() + " and is " + notOfASafeType.getDescription())));
+ notAnnotatedWithLazy.getDescription() + " and is " + notOfASafeType.getDescription()));
}
private static ArchRule allBeanFactoryPostProcessorBeanMethodsShouldBeStaticAndHaveOnlyInjectEnvironment() {
@ -140,7 +140,7 @@ final class ArchitectureRules {
private static void onlyInjectEnvironment(JavaMethod item, ConditionEvents events) {
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");
}
}
@ -208,8 +208,8 @@ final class ArchitectureRules {
if (!properties.containsKey("type") && !properties.containsKey("name")) {
conditionalAnnotation.get("value").ifPresent((value) -> {
if (containsOnlySingleType((JavaType[]) value, item.getReturnType())) {
events.add(SimpleConditionEvent.violated(item, conditionalAnnotation.getDescription()
+ " should not specify only a value that is the same as the method's return type"));
addViolation(events, item, conditionalAnnotation.getDescription()
+ " should not specify only a value that is the same as the method's return type");
}
});
}
@ -237,8 +237,8 @@ final class ArchitectureRules {
if (properties.size() == 1 && item.getParameterTypes().size() == 1) {
enumSourceAnnotation.get("value").ifPresent((value) -> {
if (value.equals(item.getParameterTypes().get(0))) {
events.add(SimpleConditionEvent.violated(item, enumSourceAnnotation.getDescription()
+ " should not specify only a value that is the same as the method's parameter type"));
addViolation(events, item, enumSourceAnnotation.getDescription()
+ " should not specify only a value that is the same as the method's parameter type");
}
});
}
@ -297,6 +297,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) {
return string + " should be used instead";
}