Merge pull request #724 from kathrynkodama/1441-build-file

Call generate features on compile dependency changes in dev mode flow
OpenLiberty · Mar 23, 2022 · 0710e24 · 0710e24
2 parents 10d9286 + d29ef2e
commit 0710e24
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy
@@ -409,7 +409,7 @@ class DevTask extends AbstractFeatureTask {
         }
 
         @Override
-        public boolean updateArtifactPaths(ProjectModule projectModule, boolean redeployCheck, ThreadPoolExecutor executor)
+        public boolean updateArtifactPaths(ProjectModule projectModule, boolean redeployCheck, boolean generateFeatures, ThreadPoolExecutor executor)
                 throws PluginExecutionException {
             // not supported for Gradle, only used for multi module Maven projects
             return false;
@@ -442,10 +442,10 @@ class DevTask extends AbstractFeatureTask {
         }
 
         @Override
-        public boolean recompileBuildFile(File buildFile, Set<String> compileArtifactPaths, Set<String> testArtifactPaths, ThreadPoolExecutor executor) {
+        public boolean recompileBuildFile(File buildFile, Set<String> compileArtifactPaths, Set<String> testArtifactPaths, boolean generateFeatures, ThreadPoolExecutor executor) {
             boolean restartServer = false;
             boolean installFeatures = false;
-            boolean compileDependenciesChanged = false;
+            boolean optimizeGenerateFeatures = false;
 
             ProjectBuilder builder = ProjectBuilder.builder();
             Project newProject;
@@ -556,7 +556,7 @@ class DevTask extends AbstractFeatureTask {
                 newProjectCompileDependencies.removeAll(existingProjectCompileDependencies);
                 if (!newProjectCompileDependencies.isEmpty()) {
                     logger.debug("Compile dependencies changed");
-                    compileDependenciesChanged = true;
+                    optimizeGenerateFeatures = true;
                 }
 
                 Configuration newLibertyFeatureConfiguration = newProject.configurations.getByName('libertyFeature');
@@ -572,21 +572,24 @@ class DevTask extends AbstractFeatureTask {
                 }
 
             }
+            if (optimizeGenerateFeatures && generateFeatures) {
+                logger.debug("Detected a change in the compile dependencies, regenerating features");
+                // optimize generate features on build dependency change
+                boolean generateFeaturesSuccess = libertyGenerateFeatures(null, true);
+                if (generateFeaturesSuccess) {
+                    util.javaSourceClassPaths.clear();
+                } else {
+                    installFeatures = false;
+                }
+            }
             if (restartServer) {
                 // - stop Server
-                // - generate features (if generateFeatures=true)
                 // - create server or runBoostMojo
                 // - install feature
                 // - deploy app
                 // - start server
                 util.restartServer();
                 return true;
-            } else if (compileDependenciesChanged && generateFeatures) { // generate features if compile dependencies have been modified
-                // optimize generate features on build dependency change
-                boolean generateFeaturesSuccess = libertyGenerateFeatures(null, true);
-                if (generateFeaturesSuccess) {
-                    util.javaSourceClassPaths.clear();
-                };
             } else if (installFeatures) {
                 libertyInstallFeature();
             }