|
79 | 79 | import com.vaadin.flow.server.startup.ApplicationRouteRegistry; |
80 | 80 | import com.vaadin.flow.server.startup.ClassLoaderAwareServletContainerInitializer; |
81 | 81 | import com.vaadin.flow.server.startup.LookupServletContainerInitializer; |
82 | | -import com.vaadin.flow.server.startup.ServletDeployer; |
83 | 82 | import com.vaadin.flow.server.startup.VaadinAppShellInitializer; |
84 | 83 | import com.vaadin.flow.server.startup.VaadinInitializerException; |
85 | 84 | import com.vaadin.flow.server.startup.WebComponentConfigurationRegistryInitializer; |
@@ -527,13 +526,12 @@ public void failFastContextInitialized(ServletContextEvent event) |
527 | 526 | .collect(Collectors.toSet()); |
528 | 527 |
|
529 | 528 | 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())) |
534 | 532 | .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())) |
537 | 535 | .collect(Collectors.toSet()); |
538 | 536 | } |
539 | 537 |
|
@@ -992,15 +990,11 @@ private Resource[] collectResources(String locationPattern) |
992 | 990 | String relativePath = path.substring(index + 6); |
993 | 991 | if (devModeCachingEnabled |
994 | 992 | && relativePath.endsWith(".class")) { |
995 | | - // Stores names of vaadin classes from JARs |
| 993 | + // Stores names of all classes from JARs |
996 | 994 | String className = relativePath |
997 | 995 | .replace(File.separatorChar, '.') |
998 | 996 | .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); |
1004 | 998 | } |
1005 | 999 | if (shouldPathBeScanned(relativePath)) { |
1006 | 1000 | resourcesList.add(resource); |
|
0 commit comments