refactor: Move push JS to META-INF/VAADIN/webapp to avoid dual serving

flow-push/pom.xml

@@ -12,7 +12,7 @@
   <description>${project.name}</description>
 
   <properties>
-    <pushDirectory>${project.build.outputDirectory}/META-INF/resources/VAADIN/static/push</pushDirectory>
+    <pushDirectory>${project.build.outputDirectory}/META-INF/VAADIN/webapp/VAADIN/static/push</pushDirectory>
     <vaadinPush.js>${pushDirectory}/vaadinPush.js</vaadinPush.js>
     <vaadinPush-min.js>${pushDirectory}/vaadinPush-min.js</vaadinPush-min.js>
   </properties>

flow-server/src/test/java/com/vaadin/flow/server/StaticFileServerTest.java

@@ -423,7 +423,7 @@
 
         setupRequestURI("", "", "/frontend/.");
         Mockito.when(servletService.getStaticResource("/frontend/."))
                 .thenReturn(new URL("jar:" + warFile.toURI().toURL() + "!/"
                         + archiveFile.getName() + "!/frontend"));
         Assert.assertTrue(
                 "Request should return as static request as we can not determine non file resources in jar files.",
@@ -1252,6 +1252,51 @@
         Assert.assertFalse(fileServer.serveStaticResource(request, response));
     }
 
+    @Test
+    public void serveStaticResource_vaadinPushScript_servedFromMetaInfVaadinWebapp()
+            throws IOException {
+        String pathInfo = "/VAADIN/static/push/vaadinPush.js";
+        setupRequestURI("", "", pathInfo);
+        String fileData = "window.vaadinPush = {};";
+        ClassLoader mockLoader = Mockito.mock(ClassLoader.class);
+        Mockito.when(servletService.getClassLoader()).thenReturn(mockLoader);
+
+        // The push script should be loaded from META-INF/VAADIN/webapp/
+        // (not from META-INF/resources/VAADIN/static/push/)
+        Mockito.when(mockLoader.getResource(
+                "META-INF/VAADIN/webapp/VAADIN/static/push/vaadinPush.js"))
+                .thenReturn(createFileURLWithDataAndLength(
+                        "/push/vaadinPush.js", fileData));
+
+        mockStatsBundles(mockLoader);
+        mockConfigurationPolyfills();
+
+        Assert.assertTrue(fileServer.serveStaticResource(request, response));
+        Assert.assertEquals(fileData, out.getOutputString());
+    }
+
+    @Test
+    public void serveStaticResource_vaadinPushMinScript_servedFromMetaInfVaadinWebapp()
+            throws IOException {
+        String pathInfo = "/VAADIN/static/push/vaadinPush-min.js";
+        setupRequestURI("", "", pathInfo);
+        String fileData = "window.vaadinPush={};";
+        ClassLoader mockLoader = Mockito.mock(ClassLoader.class);
+        Mockito.when(servletService.getClassLoader()).thenReturn(mockLoader);
+
+        // The push script should be loaded from META-INF/VAADIN/webapp/
+        Mockito.when(mockLoader.getResource(
+                "META-INF/VAADIN/webapp/VAADIN/static/push/vaadinPush-min.js"))
+                .thenReturn(createFileURLWithDataAndLength(
+                        "/push/vaadinPush-min.js", fileData));
+
+        mockStatsBundles(mockLoader);
+        mockConfigurationPolyfills();
+
+        Assert.assertTrue(fileServer.serveStaticResource(request, response));
+        Assert.assertEquals(fileData, out.getOutputString());
+    }
+
     private static class CapturingServletOutputStream
             extends ServletOutputStream {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();