From a5722832d238a50bc03ee26dafcfc54ba6e538f7 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Thu, 17 Apr 2025 16:00:53 +0100
Subject: [PATCH] Polish

See gh-45231
---
 .../boot/build/architecture/ArchitectureRules.java           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureRules.java b/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureRules.java
index 6fb0390036..289921ee7c 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureRules.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureRules.java
@@ -136,8 +136,11 @@ final class ArchitectureRules {
 
 	private static DescribedPredicate<JavaClass> notAnnotatedWithRoleInfrastructure() {
 		return is("not annotated with @Role(BeanDefinition.ROLE_INFRASTRUCTURE", (candidate) -> {
+			if (!candidate.isAnnotatedWith(Role.class)) {
+				return true;
+			}
 			Role role = candidate.getAnnotationOfType(Role.class);
-			return (role == null) || (role.value() != BeanDefinition.ROLE_INFRASTRUCTURE);
+			return role.value() != BeanDefinition.ROLE_INFRASTRUCTURE;
 		});
 	}