Merge pull request #500 from turkeylurkey/issue-1967

Make optimizeGenerateFeatures() available to ci.maven and ci.gradle

Author: turkeylurkey

src/main/java/io/openliberty/tools/common/plugins/util/DevUtil.java

@@ -438,6 +438,7 @@ private enum FileTrackMode {
     private boolean generateToSrc;
     private Set<String> generatedFeaturesSet; // set of features in generated-features.xml file
     private boolean generatedFeaturesModified;
+    private boolean generatedFeaturesCopied;
     private Set<String> compileArtifactPaths;
     private Set<String> testArtifactPaths;
     protected File generateFeaturesFile; // the file that is created from the generate-features goal/task
@@ -565,6 +566,7 @@ public DevUtil(File buildDirectory, File serverDirectory, File sourceDirectory,
         this.testArtifactPaths = testArtifactPaths;
         this.monitoredWebResourceDirs = monitoredWebResourceDirs;
         this.generatedFeaturesModified = false;
+        this.generatedFeaturesCopied = false;
         if (this.generateFeatures) {
             this.generatedFeaturesSet = getGeneratedFeatures();
         } else {
@@ -580,6 +582,9 @@ private void initGenerationContext() {
 
     public void copyGeneratedFeaturesFile(File destinationDir) throws IOException {
         copyFile(generateFeaturesFile, generateFeaturesOutputDir, destinationDir, null);
+        if (destinationDir.equals(serverDirectory)) {
+            generatedFeaturesCopied = true; // features copied into server dir and not some temp dir
+        }
     }
     /**
      * Run unit and/or integration tests
@@ -2755,15 +2760,15 @@ protected void setFeatureGeneration(boolean generateFeatures) {
         logFeatureGenerationStatus();
     }
 
-    private boolean optimizeGenerateFeatures(boolean useTmpDir) {
+    protected boolean optimizeGenerateFeatures(boolean useTmpDir) {
         debug("Entering optimizeGenerateFeatures(boolean)");
         return optimizeGenerateFeatures(useTmpDir, false);
     }
 
     /**
      * Generate features using all classes and only user specified features.
      */
-    private boolean optimizeGenerateFeatures(boolean useTmpDirOut, boolean useTmpDirIn) {
+    protected boolean optimizeGenerateFeatures(boolean useTmpDirOut, boolean useTmpDirIn) {
         debug("Generating optimized features list...use temp directory for output=" + useTmpDirOut + " use temp directory for input=" + useTmpDirIn);
         // scan all class files and provide only user specified features
         boolean generatedFeatures = libertyGenerateFeatures(null, true, generateToSrc, useTmpDirOut, useTmpDirIn);
@@ -3445,15 +3450,6 @@ public void watchFiles(File outputDirectory, File testOutputDirectory, final Thr
         }
     }
 
-    /**
-     * 
-     * @return {@code Collection<String>} of class paths
-     * @throws IOException
-     */
-    public Collection<String> getJavaSourceClassPaths() throws IOException {
-        return getClassPaths(modifiedClasses);
-    }
-
     /**
      * 
      * @param classFiles javaSourceClassFiles that have been modified
@@ -4682,14 +4678,26 @@ private void processConfigFileChange(File fileChanged, ChangeType changeType, Th
                 System.setProperty(SKIP_BETA_INSTALL_WARNING, Boolean.TRUE.toString());
                 installFeaturesToTempDir(fileChanged, fileChangedParentDir, targetFileName, generateFeaturesSuccess);
             }
-            copyFile(fileChanged, fileChangedParentDir, serverDirectory, targetFileName);
-
-            // if the generated features file was modified as a result of another config
-            // file modification, copy it over to target so the server picks up the changes
-            // together
+            // Copy the config file which was changed to the server directory unless it is
+            // the generated features file. The generated features file may have been copied 
+            // to the server directory already as a result of a change to the build file (pom.xml)
+            // or the server.xml.
+            if (!isGeneratedFeaturesFile) { // all other config files
+                copyFile(fileChanged, fileChangedParentDir, serverDirectory, targetFileName);
+            } else {
+                if (!generatedFeaturesCopied) {
+                    copyGeneratedFeaturesFile(serverDirectory);
+                }
+                generatedFeaturesCopied = false;
+            }
+            // If the generated features file was modified as a result of another config file modification
+            // (usually server.xml), copy it over to target so the server picks up the two changes together
             if (generateFeaturesSuccess && generatedFeaturesModified && !isGeneratedFeaturesFile) {
-                // this logic is not entered if the fileChanged is the generated features file
-                // copy generated features file to server dir
+                // This logic is not entered if the fileChanged is the generated features file.
+                // Copy generated features file to server dir and set generatedFeaturesCopied true
+                // (not referring to generatedFeaturesModified).
+                // Leave generatedFeaturesCopied true because the call to optimize/incrementalGenerateFeatures that was
+                // required to get into this IF block will also generate a file change event for generatedFeaturesFile
                 copyGeneratedFeaturesFile(serverDirectory);
                 generatedFeaturesModified = false;
             }