Fixing Kotlin annotations architecture rule

See gh-34276
spring-projects · Jan 17, 2025 · 309f5be · 309f5be
1 parent 1bd9848
commit 309f5be
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/build/architecture/ArchitectureRules.java b/buildSrc/src/main/java/org/springframework/build/architecture/ArchitectureRules.java
@@ -16,6 +16,7 @@
 
 package org.springframework.build.architecture;
 
+import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
@@ -66,8 +67,14 @@ static ArchRule classesShouldNotImportForbiddenTypes() {
 
 	static ArchRule javaClassesShouldNotImportKotlinAnnotations() {
 		return ArchRuleDefinition.noClasses()
-				.that().haveSimpleNameNotEndingWith("Kt")
-				.and().haveSimpleNameNotEndingWith("Dsl")
+				.that(new DescribedPredicate<JavaClass>("is not a Kotlin class") {
+						  @Override
+						  public boolean test(JavaClass javaClass) {
+							  return javaClass.getSourceCodeLocation()
+									  .getSourceFileName().endsWith(".java");
+						  }
+					  }
+				)
 				.should().dependOnClassesThat()
 				.resideInAnyPackage("org.jetbrains.annotations..")
 				.allowEmptyShould(true);