fix: Not throw for not yet copied CSS when checking for re-bundling (CP: 24.0) (#16142)

* fix: Not throw for not yet copied CSS when checking for re-bundling

* Add tests for checking no exception and styles are applied

* fix formatting

* fix expected hash

Author: mshabarov

flow-server/src/main/java/com/vaadin/flow/server/frontend/AbstractUpdateImports.java

@@ -500,7 +500,19 @@ private boolean isFileOrDirectory(File base, String... path) {
         return file.isFile() || file.isDirectory();
     }
 
-    private boolean addCssLines(Collection<String> lines, CssData cssData,
+    /**
+     * Adds CSS imports to the generated flow imports file based on the given
+     * CssImport data.
+     *
+     * @param lines
+     *            collection of generated file lines to add imports to
+     * @param cssData
+     *            CssImport data
+     * @param i
+     *            imported CSS counter
+     * @return true if the imported CSS files does exist, false otherwise
+     */
+    protected boolean addCssLines(Collection<String> lines, CssData cssData,
             int i) {
         String cssFile = resolveResource(cssData.getValue());
         boolean found = importedFileExists(cssFile);

flow-server/src/main/java/com/vaadin/flow/server/frontend/GenerateMainImports.java

@@ -72,6 +72,16 @@ public List<String> getLines() {
         return lines;
     }
 
+    @Override
+    protected boolean addCssLines(Collection<String> lines, CssData cssData,
+            int i) {
+        super.addCssLines(lines, cssData, i);
+        // CSS files in 'generated/jar-resources' are not generated at this
+        // moment, so not let the application interrupt and continue with
+        // checking the dev-bundle
+        return true;
+    }
+
     @Override
     protected void writeImportLines(List<String> lines) {
         // NO-OP. Only store the lines to write

flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/CssAnnotationVisitor.java

@@ -57,13 +57,13 @@ public void visit(String name, Object obj) {
             newData();
         }
         if (FrontendClassVisitor.VALUE.equals(name)) {
-            cssData.value = value;
+            cssData.setValue(value);
         } else if (FrontendClassVisitor.ID.equals(name)) {
-            cssData.id = value;
+            cssData.setId(value);
         } else if (FrontendClassVisitor.INCLUDE.equals(name)) {
-            cssData.include = value;
+            cssData.setInclude(value);
         } else if (FrontendClassVisitor.THEME_FOR.equals(name)) {
-            cssData.themefor = value;
+            cssData.setThemefor(value);
         }
     }
 

flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/CssData.java

@@ -28,10 +28,20 @@
  * @since 2.0
  */
 public final class CssData implements Serializable {
-    String value;
-    String id;
-    String include;
-    String themefor;
+    private String value;
+    private String id;
+    private String include;
+    private String themefor;
+
+    public CssData() {
+    }
+
+    public CssData(String value, String id, String include, String themefor) {
+        this.value = value;
+        this.id = id;
+        this.include = include;
+        this.themefor = themefor;
+    }
 
     /**
      * The value getter.
@@ -69,6 +79,22 @@ public String getThemefor() {
         return themefor;
     }
 
+    void setValue(String value) {
+        this.value = value;
+    }
+
+    void setId(String id) {
+        this.id = id;
+    }
+
+    void setInclude(String include) {
+        this.include = include;
+    }
+
+    void setThemefor(String themefor) {
+        this.themefor = themefor;
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == null || !(other instanceof CssData)) {

flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/FullDependenciesScanner.java

@@ -207,12 +207,11 @@ public Set<String> getClasses() {
     }
 
     private CssData createCssData(Annotation cssImport) {
-        CssData data = new CssData();
-        data.id = adaptCssValue(cssImport, "id");
-        data.include = adaptCssValue(cssImport, "include");
-        data.themefor = adaptCssValue(cssImport, "themeFor");
-        data.value = adaptCssValue(cssImport, VALUE);
-        return data;
+        String id = adaptCssValue(cssImport, "id");
+        String include = adaptCssValue(cssImport, "include");
+        String themeFor = adaptCssValue(cssImport, "themeFor");
+        String value = adaptCssValue(cssImport, VALUE);
+        return new CssData(value, id, include, themeFor);
     }
 
     private String adaptCssValue(Annotation cssImport, String method) {

flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunDevBundleBuildTest.java

@@ -19,6 +19,7 @@
 import com.vaadin.flow.di.Lookup;
 import com.vaadin.flow.server.Constants;
 import com.vaadin.flow.server.frontend.scanner.ClassFinder;
+import com.vaadin.flow.server.frontend.scanner.CssData;
 import com.vaadin.flow.server.frontend.scanner.FrontendDependenciesScanner;
 import com.vaadin.flow.testutil.TestUtils;
 import com.vaadin.flow.theme.ThemeDefinition;
@@ -1701,6 +1702,40 @@ public void standardVaadinComponent_notAddedToProjectAsJar_noRebuildRequired()
         }
     }
 
+    @Test
+    public void cssImport_cssInMetaInfResources_notThrow_bundleRequired()
+            throws IOException {
+        createPackageJsonStub(BLANK_PACKAGE_JSON_WITH_HASH);
+
+        final FrontendDependenciesScanner depScanner = Mockito
+                .mock(FrontendDependenciesScanner.class);
+
+        CssData cssData = new CssData("./addons-styles/my-styles.css", null,
+                null, null);
+
+        Mockito.when(depScanner.getCss())
+                .thenReturn(Collections.singleton(cssData));
+
+        JsonObject stats = getBasicStats();
+
+        try (MockedStatic<FrontendUtils> utils = Mockito
+                .mockStatic(FrontendUtils.class)) {
+            utils.when(() -> FrontendUtils.getDevBundleFolder(Mockito.any()))
+                    .thenReturn(temporaryFolder.getRoot());
+            utils.when(() -> FrontendUtils
+                    .findBundleStatsJson(temporaryFolder.getRoot()))
+                    .thenReturn(stats.toJson());
+
+            // Should not throw an IllegalStateException:
+            // "Failed to find the following css files in the...."
+            boolean needsBuild = TaskRunDevBundleBuild
+                    .needsBuildInternal(options, depScanner, finder);
+            Assert.assertTrue(
+                    "Should re-bundle if CSS is imported from META-INF/resources",
+                    needsBuild);
+        }
+    }
+
     @Test
     public void flowFrontendPackageInPackageJson_noBundleRebuild()
             throws IOException {

flow-server/src/test/java/com/vaadin/flow/server/frontend/scanner/FullDependenciesScannerTest.java

@@ -342,12 +342,7 @@ public void getModules_explcitTheme_returnAllModulesExcludingNotUsedTheme_getCla
 
     private CssData createCssData(String value, String id, String include,
             String themefor) {
-        CssData data = new CssData();
-        data.value = value;
-        data.id = id;
-        data.include = include;
-        data.themefor = themefor;
-        return data;
+        return new CssData(value, id, include, themefor);
     }
 
     private List<? extends Annotation> findAnnotations(Class<?> type,

flow-server/src/test/java/com/vaadin/flow/server/frontend/scanner/ScannerDependenciesTest.java

@@ -53,7 +53,7 @@ public void visitRouteEntryPoint_ExpectToAlsoVisitImplementedInterface() {
         assertEquals("There should be 1 css import", 1, deps.getCss().size());
 
         assertEquals("Invalid css import", "frontend://styles/interface.css",
-                deps.getCss().iterator().next().value);
+                deps.getCss().iterator().next().getValue());
     }
 
     @Test

flow-tests/test-express-build/test-dev-bundle-frontend-add-on/src/main/java/com/vaadin/flow/frontend/DevBundleCssImportView.java

@@ -24,11 +24,17 @@
 @CssImport("./styles/my-styles.css")
 public class DevBundleCssImportView extends Div {
 
+    static final String MY_COMPONENT_ID = "test-css-import-meta-inf-resources-span";
+
     static final String SPAN_ID = "test-css-import-frontend-span";
 
     public DevBundleCssImportView() {
         Span span = new Span("Test CssImport with dev bundle");
         span.setId(SPAN_ID);
         add(span);
+
+        MyComponent myComponent = new MyComponent();
+        myComponent.setId(MY_COMPONENT_ID);
+        add(myComponent);
     }
 }

flow-tests/test-express-build/test-dev-bundle-frontend-add-on/src/main/java/com/vaadin/flow/frontend/MyComponent.java

@@ -0,0 +1,13 @@
+package com.vaadin.flow.frontend;
+
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.html.Div;
+
+@CssImport("./addons-styles/add-on-styles.css")
+public class MyComponent extends Div {
+
+    public MyComponent() {
+        setText("Test CssImport from META-INF/resources with dev bundle");
+        addClassName("my-component");
+    }
+}