Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Caching: Cache all com.vaadin.flow class instances #17644

Merged
merged 9 commits into from
Sep 21, 2023
Merged

Caching: Cache all com.vaadin.flow class instances #17644

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce9827b
Caching: Cache all com.vaadin.flow class instances
tepi Sep 18, 2023
f846447
Caching: Cache all com.vaadin.flow class instances
tepi Sep 18, 2023
7c8762a
Merge remote-tracking branch 'origin/cache-vaadin-classes' into cache…
tepi Sep 18, 2023
3d62980
Ensure only classes from JARs are cached
tepi Sep 20, 2023
96c4431
Fix cache test
tepi Sep 20, 2023
4e82236
Merge branch 'main' into cache-vaadin-classes
tepi Sep 20, 2023
170c797
Use replace instead of replaceAll
tepi Sep 20, 2023
88ebf80
Merge remote-tracking branch 'origin/cache-vaadin-classes' into cache…
tepi Sep 20, 2023
8a649d9
Cache com.vaadin.* and org.vaadin.* classes
tepi Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...-tests/test-redeployment/src/test/java/com/vaadin/flow/uitest/ui/DevModeClassCacheIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,14 @@ public void testDevModeClassCachePopulated() {

for (int i = 1; i < 6; i++) {
String[] value = allSpans.get(i).getText().split(":");
Assert.assertTrue("Expected " + value[0] + " to be greater than 0.",
Integer.parseInt(value[1]) > 0);
if ("dynamic white list count".equals(value[0])) {
Assert.assertTrue("Expected " + value[0] + " to be 0.",
Integer.parseInt(value[1]) == 0);
} else {
Assert.assertTrue(
"Expected " + value[0] + " to be greater than 0.",
Integer.parseInt(value[1]) > 0);
}
}

Assert.assertEquals("Unexpected cached route packages.",
Expand Down
1 change: 1 addition & 0 deletions vaadin-spring/src/main/java/com/vaadin/flow/spring/ReloadCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ class ReloadCache implements Serializable {
static Set<String> skippedResources = new HashSet<>();
static Set<String> dynamicWhiteList;
static Set<String> routePackages;
static Set<Class<?>> vaadinClasses = new HashSet<>();
}
9 changes: 8 additions & 1 deletion vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,15 @@ public void failFastContextInitialized(ServletContextEvent event)
.collect(Collectors.toSet());

if (devModeCachingEnabled) {
classes.addAll(ReloadCache.vaadinClasses);
ReloadCache.dynamicWhiteList = classes.stream()
.map(Class::getPackageName).collect(Collectors.toSet());
.map(Class::getPackageName)
.filter(packageName -> !packageName
.startsWith("com.vaadin.flow"))
.collect(Collectors.toSet());
ReloadCache.vaadinClasses = classes.stream().filter(
c -> c.getPackageName().startsWith("com.vaadin.flow"))
tepi marked this conversation as resolved.
Show resolved Hide resolved
tepi marked this conversation as resolved.
Show resolved Hide resolved
.collect(Collectors.toSet());
}

long ms = (System.nanoTime() - start) / 1000000;
Expand Down
Loading