Analyze new files as modified files

IntelliJ do a lot of file changes on save, leading to an existing file being considered as new by the watcher. So even new files are now analyzed to invalidate potential classes inside.

Author: adrienlauer

src/license/THIRD-PARTY.properties

@@ -13,7 +13,7 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Fri Nov 24 15:15:14 CET 2017
+#Wed Nov 29 15:23:13 CET 2017
 classworlds--classworlds--1.1-alpha-2=
 commons-collections--commons-collections--3.1=
 dom4j--dom4j--1.6.1=

src/main/java/org/seedstack/maven/WatchMojo.java

@@ -56,7 +56,7 @@
         requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 @Execute(phase = LifecyclePhase.PROCESS_CLASSES)
 public class WatchMojo extends AbstractExecutableMojo {
-    public static final int LIVE_RELOAD_PORT = 35729;
+    private static final int LIVE_RELOAD_PORT = 35729;
     private DirectoryWatcher directoryWatcher;
     private Thread watcherThread;
     private List<String> compileSourceRoots;
@@ -165,9 +165,9 @@ private void refresh(Set<FileEvent> fileEvents) {
                 Set<File> compiledFilesToRemove = new HashSet<>();
                 Set<File> compiledFilesToUpdate = new HashSet<>();
 
-                boolean newFiles = analyzeEvents(fileEvents, compiledFilesToRemove, compiledFilesToUpdate);
+                analyzeEvents(fileEvents, compiledFilesToRemove, compiledFilesToUpdate);
 
-                if (newFiles || !compiledFilesToRemove.isEmpty() || !compiledFilesToUpdate.isEmpty()) {
+                if (!compiledFilesToRemove.isEmpty() || !compiledFilesToUpdate.isEmpty()) {
                     getLog().info("Source changes detected");
 
                     try {
@@ -213,9 +213,8 @@ private void refresh(Set<FileEvent> fileEvents) {
             }
         }
 
-        private boolean analyzeEvents(Set<FileEvent> fileEvents, Set<File> compiledFilesToRemove,
+        private void analyzeEvents(Set<FileEvent> fileEvents, Set<File> compiledFilesToRemove,
                 Set<File> compiledFilesToUpdate) throws MojoExecutionException {
-            boolean newFiles = false;
             for (FileEvent fileEvent : fileEvents) {
                 File changedFile = fileEvent.getFile();
                 if (!changedFile.isDirectory()) {
@@ -226,17 +225,15 @@ private boolean analyzeEvents(Set<FileEvent> fileEvents, Set<File> compiledFiles
                             if (canonicalChangedFile.startsWith(sourceRootPath + File.separator)
                                     && canonicalChangedFile.endsWith(".java")) {
                                 if (fileEvent.getKind() == FileEvent.Kind.CREATE) {
-                                    if (changedFile.length() > 0) {
-                                        // ignore empty files (not relevant for app refresh)
-                                        getLog().info("NEW: " + canonicalChangedFile);
-                                        newFiles = true;
-                                    }
+                                    getLog().debug("NEW: " + canonicalChangedFile);
+                                    compiledFilesToUpdate.add(resolveCompiledFile(sourceRootPath,
+                                            canonicalChangedFile));
                                 } else if (fileEvent.getKind() == FileEvent.Kind.MODIFY) {
-                                    getLog().info("MODIFIED: " + canonicalChangedFile);
+                                    getLog().debug("MODIFIED: " + canonicalChangedFile);
                                     compiledFilesToUpdate.add(resolveCompiledFile(sourceRootPath,
                                             canonicalChangedFile));
                                 } else if (fileEvent.getKind() == FileEvent.Kind.DELETE) {
-                                    getLog().info("DELETED: " + canonicalChangedFile);
+                                    getLog().debug("DELETED: " + canonicalChangedFile);
                                     compiledFilesToRemove.add(resolveCompiledFile(sourceRootPath,
                                             canonicalChangedFile));
                                 }
@@ -248,7 +245,6 @@ private boolean analyzeEvents(Set<FileEvent> fileEvents, Set<File> compiledFiles
                     }
                 }
             }
-            return newFiles;
         }
 
         private File resolveCompiledFile(String sourceRootPath, String changedFilePath) {
@@ -268,7 +264,9 @@ private void removeFiles(Set<File> compiledFilesToRemove) throws MojoExecutionEx
         private Set<String> analyzeClasses(Set<File> classFiles) throws MojoExecutionException {
             Set<String> classNamesToInvalidate = new HashSet<>();
             for (File file : classFiles) {
-                classNamesToInvalidate.addAll(collectClassNames(file));
+                if (file.exists() && file.length() > 0) {
+                    classNamesToInvalidate.addAll(collectClassNames(file));
+                }
             }
             return classNamesToInvalidate;
         }

src/main/java/org/seedstack/maven/watcher/DirectoryWatcher.java

@@ -131,15 +131,21 @@ public void run() {
                 File file = path.toFile();
 
                 if (!file.isDirectory()) {
-                    if (event.kind() == ENTRY_CREATE && isReallyCreatedOrModified(file)) {
+                    if (event.kind() == ENTRY_CREATE) {
                         log.debug("New file: " + path);
-                        fileEvents.add(new FileEvent(FileEvent.Kind.CREATE, file));
-                    } else if (event.kind() == ENTRY_MODIFY && isReallyCreatedOrModified(file)) {
+                        if (isReallyCreatedOrModified(file)) {
+                            fileEvents.add(new FileEvent(FileEvent.Kind.CREATE, file));
+                        }
+                    } else if (event.kind() == ENTRY_MODIFY) {
                         log.debug("File modified: " + path);
-                        fileEvents.add(new FileEvent(FileEvent.Kind.MODIFY, file));
-                    } else if (event.kind() == ENTRY_DELETE && isReallyDeleted(file)) {
+                        if (isReallyCreatedOrModified(file)) {
+                            fileEvents.add(new FileEvent(FileEvent.Kind.MODIFY, file));
+                        }
+                    } else if (event.kind() == ENTRY_DELETE) {
                         log.debug("File deleted: " + path);
-                        fileEvents.add(new FileEvent(FileEvent.Kind.DELETE, file));
+                        if (isReallyDeleted(file)) {
+                            fileEvents.add(new FileEvent(FileEvent.Kind.DELETE, file));
+                        }
                     }
                 }