fix: fix resource loading for embedded spring boot apps (#9743)

Loading from classpath resource should not start with '/' when Spring Boot is used.
vaadin · Mar 16, 2021 · 93c466f · 93c466f
1 parent da2aba4
commit 93c466f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/BootstrapHandler.java b/flow-server/src/main/java/com/vaadin/flow/server/BootstrapHandler.java
@@ -981,7 +981,7 @@ private String getClientEngineUrl(BootstrapContext context) {
             String clientEngine = getClientEngine(resourceProvider);
             boolean resolveNow = !productionMode || clientEngine == null;
             if (resolveNow
-                    && resourceProvider.getClientResource("/META-INF/resources/"
+                    && resourceProvider.getClientResource("META-INF/resources/"
                             + CLIENT_ENGINE_NOCACHE_FILE) != null) {
                 return context.getUriResolver().resolveVaadinUri(
                         "context://" + CLIENT_ENGINE_NOCACHE_FILE);
@@ -998,7 +998,7 @@ private String getClientEngineUrl(BootstrapContext context) {
         private String getClientEngine(ResourceProvider resourceProvider) {
             // read client engine file name
             try (InputStream prop = resourceProvider
-                    .getClientResourceAsStream("/META-INF/resources/"
+                    .getClientResourceAsStream("META-INF/resources/"
                             + ApplicationConstants.CLIENT_ENGINE_PATH
                             + "/compile.properties")) {
                 // null when running SDM or tests

diff --git a/flow-server/src/test/java/com/vaadin/flow/server/BootstrapHandlerDependenciesTest.java b/flow-server/src/test/java/com/vaadin/flow/server/BootstrapHandlerDependenciesTest.java
@@ -279,7 +279,7 @@ public void setup() throws Exception {
         ResourceProvider resourceProvider = service.getContext()
                 .getAttribute(Lookup.class).lookup(ResourceProvider.class);
         InputStream stream = resourceProvider.getClientResourceAsStream(
-                "/META-INF/resources/" + ApplicationConstants.CLIENT_ENGINE_PATH
+                "META-INF/resources/" + ApplicationConstants.CLIENT_ENGINE_PATH
                         + "/compile.properties");
         Properties properties = new Properties();
         properties.load(stream);

diff --git a/flow-server/src/test/java/com/vaadin/flow/server/MockServletServiceSessionSetup.java b/flow-server/src/test/java/com/vaadin/flow/server/MockServletServiceSessionSetup.java
@@ -256,7 +256,7 @@ public MockServletServiceSessionSetup(boolean sessionAvailable)
                 .thenReturn(resourceProvider);
 
         Mockito.when(resourceProvider.getClientResourceAsStream(
-                "/META-INF/resources/" + ApplicationConstants.CLIENT_ENGINE_PATH
+                "META-INF/resources/" + ApplicationConstants.CLIENT_ENGINE_PATH
                         + "/compile.properties"))
                 .thenAnswer(invocation -> new ByteArrayInputStream(
                         "jsFile=foo".getBytes(StandardCharsets.UTF_8)));

diff --git a/.../src/test/java/com/vaadin/flow/server/communication/WebComponentBootstrapHandlerTest.java b/.../src/test/java/com/vaadin/flow/server/communication/WebComponentBootstrapHandlerTest.java
@@ -268,7 +268,7 @@ private void initLookup(VaadinServletService service) throws IOException {
                                 + STATISTICS_JSON_DEFAULT));
 
         Mockito.when(provider.getClientResourceAsStream(
-                "/META-INF/resources/" + ApplicationConstants.CLIENT_ENGINE_PATH
+                "META-INF/resources/" + ApplicationConstants.CLIENT_ENGINE_PATH
                         + "/compile.properties"))
                 .thenAnswer(invocation -> new ByteArrayInputStream(
                         "jsFile=foo".getBytes(StandardCharsets.UTF_8)));