Improve regex for classWithInnerClassesToPattern

alextwoods · alextwoods · commit 8eec4a296f93 · 2025-06-12T13:51:12.000-07:00
diff --git a/test/architecture-tests/src/test/java/software/amazon/awssdk/archtests/ArchUtils.java b/test/architecture-tests/src/test/java/software/amazon/awssdk/archtests/ArchUtils.java
@@ -27,7 +27,8 @@ public static Pattern classNameToPattern(Class<?> clazz) {
     }
 
     public static Pattern classWithInnerClassesToPattern(Class<?> clazz) {
-        return Pattern.compile(".*/" + clazz.getCanonicalName().replace('.', '/') + ".*");
+        // inner or inline/anonymous classes have $ followed by a name or number eg "$Inner" or "$1"
+        return Pattern.compile(".*/" + clazz.getCanonicalName().replace('.', '/') + "(\\$.*)?.class");
     }
 
     public static Pattern classNameToPattern(String className) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public static Pattern classNameToPattern(Class<?> clazz) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public static Pattern classWithInnerClassesToPattern(Class<?> clazz) {`
`30`		`- return Pattern.compile("./" + clazz.getCanonicalName().replace('.', '/') + ".");`
	`30`	`+ // inner or inline/anonymous classes have $ followed by a name or number eg "$Inner" or "$1"`
	`31`	`+ return Pattern.compile("./" + clazz.getCanonicalName().replace('.', '/') + "(\\$.)?.class");`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public static Pattern classNameToPattern(String className) {`