Fix (#19787)

vaadin · Aug 14, 2024 · af008b0 · af008b0
1 parent 64b1b3e
commit af008b0
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/common/FrontendDataProvider.java b/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/common/FrontendDataProvider.java
@@ -261,11 +261,12 @@ private Set<File> resolveShellFileImports(File es6SourceDirectory,
                         ThemedURLTranslator.VALUE, JavaScript.class,
                         ThemedURLTranslator.VALUE));
 
-        Collection<Set<String>> htmlImports = annotationValuesExtractor
+        Map<Class<? extends Annotation>, Set<String>> htmlImports = annotationValuesExtractor
                 .extractAnnotationValues(Collections.singletonMap(
-                        HtmlImport.class, ThemedURLTranslator.VALUE))
-                .values();
-        if (!htmlImports.isEmpty()) {
+                        HtmlImport.class, ThemedURLTranslator.VALUE));
+
+        if (htmlImports.containsKey(HtmlImport.class)
+                && !htmlImports.get(HtmlImport.class).isEmpty()) {
             throw new RuntimeException(
                     "Usage of HtmlImport is deprecated and not supported. Please remove all HtmlImport annotations and use standard JavaScript or CSS imports.");
         }