Skip to content

Commit 139bee2

Browse files
vaadin-bottepi
andauthored
feat: Cache all classes from JARs (#17701) (#17775)
Co-authored-by: Teppo Kurki <teppo.kurki@vaadin.com>
1 parent d5480f1 commit 139bee2

2 files changed

Lines changed: 9 additions & 15 deletions

File tree

‎vaadin-spring/src/main/java/com/vaadin/flow/spring/ReloadCache.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ class ReloadCache implements Serializable {
3030
static Set<String> skippedResources = new HashSet<>();
3131
static Set<String> dynamicWhiteList;
3232
static Set<String> routePackages;
33-
static Set<String> vaadinClassNames = new HashSet<>();
34-
static Set<Class<?>> vaadinClasses = new HashSet<>();
33+
static Set<String> jarClassNames = new HashSet<>();
34+
static Set<Class<?>> jarClasses = new HashSet<>();
3535
}

‎vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
import com.vaadin.flow.server.startup.ApplicationRouteRegistry;
8080
import com.vaadin.flow.server.startup.ClassLoaderAwareServletContainerInitializer;
8181
import com.vaadin.flow.server.startup.LookupServletContainerInitializer;
82-
import com.vaadin.flow.server.startup.ServletDeployer;
8382
import com.vaadin.flow.server.startup.VaadinAppShellInitializer;
8483
import com.vaadin.flow.server.startup.VaadinInitializerException;
8584
import com.vaadin.flow.server.startup.WebComponentConfigurationRegistryInitializer;
@@ -527,13 +526,12 @@ public void failFastContextInitialized(ServletContextEvent event)
527526
.collect(Collectors.toSet());
528527

529528
if (devModeCachingEnabled) {
530-
classes.addAll(ReloadCache.vaadinClasses);
531-
ReloadCache.dynamicWhiteList = classes.stream()
532-
.filter(c -> !ReloadCache.vaadinClassNames
533-
.contains(c.getName()))
529+
classes.addAll(ReloadCache.jarClasses);
530+
ReloadCache.dynamicWhiteList = classes.stream().filter(
531+
c -> !ReloadCache.jarClassNames.contains(c.getName()))
534532
.map(Class::getPackageName).collect(Collectors.toSet());
535-
ReloadCache.vaadinClasses = classes.stream().filter(
536-
c -> ReloadCache.vaadinClassNames.contains(c.getName()))
533+
ReloadCache.jarClasses = classes.stream().filter(
534+
c -> ReloadCache.jarClassNames.contains(c.getName()))
537535
.collect(Collectors.toSet());
538536
}
539537

@@ -992,15 +990,11 @@ private Resource[] collectResources(String locationPattern)
992990
String relativePath = path.substring(index + 6);
993991
if (devModeCachingEnabled
994992
&& relativePath.endsWith(".class")) {
995-
// Stores names of vaadin classes from JARs
993+
// Stores names of all classes from JARs
996994
String className = relativePath
997995
.replace(File.separatorChar, '.')
998996
.replace(".class", "");
999-
if (className.startsWith("com.vaadin")
1000-
|| className.startsWith("org.vaadin")
1001-
|| className.startsWith("dev.hilla")) {
1002-
ReloadCache.vaadinClassNames.add(className);
1003-
}
997+
ReloadCache.jarClassNames.add(className);
1004998
}
1005999
if (shouldPathBeScanned(relativePath)) {
10061000
resourcesList.add(resource);

0 commit comments

Comments
 (0)