chore: improve class scanning filter (#20978)

Ignores additional well known packages when scanning classes to find frontend resources.
vaadin · Feb 12, 2025 · 6fe93c4 · 6fe93c4
1 parent c8811e5
commit 6fe93c4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/FrontendDependencies.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/FrontendDependencies.java
@@ -77,12 +77,14 @@
 public class FrontendDependencies extends AbstractDependenciesScanner {
 
     //@formatter:off
-    private static final Pattern VISITABLE_CLASS_PATTERN = Pattern.compile("(^$|"
+    private static final Pattern NOT_VISITABLE_CLASS_PATTERN = Pattern.compile("(^$|"
             + ".*(slf4j).*|"
             // #5803
-            + "^(java|sun|oracle|elemental|javax|jakarta|oshi|"
-            + "org\\.(apache|atmosphere|jsoup|jboss|w3c|spring|joda|hibernate|glassfish|hsqldb|osgi|jooq)\\b|"
-            + "com\\.(helger|spring|gwt|lowagie|fasterxml|sun|nimbusds|googlecode)\\b|"
+            + "^(java|sun|oracle|elemental|javax|javafx|jakarta|oshi|cglib|"
+            + "org\\.(apache|antlr|atmosphere|aspectj|jsoup|jboss|w3c|spring|joda|hibernate|glassfish|hsqldb|osgi|jooq|springframework|bouncycastle|snakeyaml|keycloak|flywaydb)\\b|"
+            + "com\\.(helger|spring|gwt|lowagie|fasterxml|sun|nimbusds|googlecode|ibm)\\b|"
+            + "ch\\.quos\\.logback\\b|"
+            + "io\\.(fabric8\\.kubernetes)\\b|"
             + "net\\.(sf|bytebuddy)\\b"
             + ").*|"
             + ".*(Exception)$"
@@ -903,7 +905,7 @@ protected boolean shouldVisit(String className) {
         // common name-spaces that would not have components.
         // We also exclude Feature-Flag classes
         return className != null && !isExperimental(className)
-                && !VISITABLE_CLASS_PATTERN.matcher(className).matches();
+                && !NOT_VISITABLE_CLASS_PATTERN.matcher(className).matches();
     }
 
     private URL getUrl(String className) {

diff --git a/...erver/src/test/java/com/vaadin/flow/server/frontend/scanner/FrontendDependenciesTest.java b/...erver/src/test/java/com/vaadin/flow/server/frontend/scanner/FrontendDependenciesTest.java
@@ -327,11 +327,11 @@ public void shouldVisit_shouldNotMatchOnPartOfPackage() {
                 classFinder, true);
 
         Assert.assertTrue(
-                "second package should match fully not as starts with 'spring != springframework'",
-                dependencies.shouldVisit("org.springframework.samples"));
+                "second package should match fully not as starts with 'spring != springseason'",
+                dependencies.shouldVisit("org.springseason.samples"));
         Assert.assertTrue(
-                "second package should match fully not as starts with 'spring != springframework'",
-                dependencies.shouldVisit("org.springframework"));
+                "second package should match fully not as starts with 'spring != springseason'",
+                dependencies.shouldVisit("org.springseason"));
         Assert.assertFalse("should not visit with only 2 packages 'org.spring'",
                 dependencies.shouldVisit("org.spring"));