fix: make sure that app resources are properly deleted before we make…

… the first request fixes quarkusio#5163
machi1990 · Nov 4, 2019 · f10318b · f10318b
1 parent 755662e
commit f10318b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java b/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java
@@ -87,6 +87,7 @@ public void start() throws Exception {
 
         runtimeUpdatesProcessor = setupRuntimeCompilation(context);
         if (runtimeUpdatesProcessor != null) {
+            runtimeUpdatesProcessor.checkForFileChange();
             runtimeUpdatesProcessor.checkForChangedClasses();
         }
         //TODO: we can't handle an exception on startup with hot replacement, as Undertow might not have started

diff --git a/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java b/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java
@@ -283,7 +283,7 @@ private String getFileExtension(File file) {
         return name.substring(lastIndexOf);
     }
 
-    private Set<String> checkForFileChange() {
+    Set<String> checkForFileChange() {
         Set<String> ret = new HashSet<>();
         for (DevModeContext.ModuleInfo module : context.getModules()) {
             final Set<Path> moduleResources = correspondingResources.computeIfAbsent(module.getName(),

diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
@@ -484,6 +484,25 @@ public void testThatApplicationRecoversStartupIssue() throws MavenInvocationExce
         assertThat(last.get()).isEqualTo("hello");
     }
 
+    @Test
+    public void testThatResourcesDeletionArePickedUpBeforeFirstRequest() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/classic", "projects/project-classic-run-deletion-of-resources-before-first-request");
+
+        // Create the nresource
+        File source = new File(testDir, "src/main/resources/META-INF/resources/lorem.txt");
+        FileUtils.write(source,
+                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                "UTF-8");
+
+        // run the application
+        run();
+
+        // delete the resource before first request
+        source.delete();
+
+        assertThat(getHttpResponse("/lorem.txt", 404)).isEqualTo(true); // verify that index file has been deleted
+    }
+
     @Test
     public void testThatNewBeanAreDiscovered() throws IOException, MavenInvocationException {
         testDir = initProject("projects/classic", "projects/project-classic-run-new-bean");