Added an extra check for the configDropins file. (#251)

* Adding extra check to configDropins * Fixed styling
OpenLiberty · Apr 25, 2018 · 3550896 · 3550896
1 parent 570dc7b
commit 3550896
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/src/main/groovy/net/wasdev/wlp/gradle/plugins/tasks/AbstractServerTask.groovy b/src/main/groovy/net/wasdev/wlp/gradle/plugins/tasks/AbstractServerTask.groovy
@@ -364,7 +364,7 @@ abstract class AbstractServerTask extends AbstractTask {
                 serverNode.appendNode('installAppsConfigDropins', installAppsConfigDropinsFile.toString())
             }
           } else {
-                if (!isAppConfiguredInSourceServerXml(getArchiveName(task))) {
+                if (!isAppConfiguredInSourceServerXml(getArchiveName(task)) || hasConfiguredApp(ApplicationXmlDocument.getApplicationXmlFile(getServerDir(project)))) {
                     serverNode.appendNode('installAppsConfigDropins', installAppsConfigDropinsFile.toString())
                 }
             }
@@ -515,5 +515,15 @@ abstract class AbstractServerTask extends AbstractTask {
       else {
           throw new GradleException("Archive path not found. Supported formats are jar, war, and ear.")
       }
-  }
+    }
+
+    //Checks if there is an app configured in an existing configDropins application xml file
+    protected boolean hasConfiguredApp(File applicationXmlFile) {
+      if (applicationXmlFile.exists()) {
+          ApplicationXmlDocument appXml = new ApplicationXmlDocument()
+          appXml.createDocument(applicationXmlFile)
+          return appXml.hasChildElements()
+      }
+      return false
+    }
 }
diff --git a/src/main/groovy/net/wasdev/wlp/gradle/plugins/tasks/InstallAppsTask.groovy b/src/main/groovy/net/wasdev/wlp/gradle/plugins/tasks/InstallAppsTask.groovy
@@ -312,20 +312,8 @@ class InstallAppsTask extends AbstractServerTask {
         }
     }
 
-    //Checks if there is an app configured in an existing configDropins application xml file
-    private boolean hasConfiguredApp(File applicationXmlFile) {
-        if (applicationXmlFile.exists()) {
-            ApplicationXmlDocument appXml = new ApplicationXmlDocument()
-            appXml.createDocument(applicationXmlFile)
-            return appXml.hasChildElements()
-        }
-        return false
-    }
-
     void createApplicationFolder(String appDir) {
-        File serverDir = getServerDir(project)
-        File applicationDirectory = new File(serverDir, appDir)
-
+        File applicationDirectory = new File(getServerDir(project), appDir)
         try {
             if (!applicationDirectory.exists()) {
                 applicationDirectory.mkdir()