changes for throwing error when there is multiple springbootapplicat…

…ion node including all server xml configurations

Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com>

src/main/java/io/openliberty/tools/common/plugins/config/ServerConfigDocument.java

@@ -512,6 +512,9 @@ private void parseApplication(Document doc, XPathExpression expression) throws X
             // add unique values only
             if (!nodeValue.isEmpty()) {
                 if(expression.equals(XPATH_SERVER_SPRINGBOOT_APPLICATION)){
+                    if(springBootAppNodeLocation.isPresent()){
+                        throw new PluginExecutionException("Found multiple springBootApplication elements specified in the server configuration. Only one springBootApplication can be configured per Liberty server.");
+                    }
                     springBootAppNodeLocation = Optional.of(nodeValue);
                 }
                 String resolved = VariableUtility.resolveVariables(log, nodeValue, null, getProperties(), getDefaultProperties(), getLibertyDirPropertyFiles());
@@ -550,9 +553,9 @@ private void parseInclude(Document doc) throws XPathExpressionException, IOExcep
                 for (Document inclDoc : inclDocs) {
                     parseApplication(inclDoc, XPATH_SERVER_APPLICATION);
                     parseApplication(inclDoc, XPATH_SERVER_WEB_APPLICATION);
-                    parseApplication(doc, XPATH_SERVER_SPRINGBOOT_APPLICATION);
+                    parseApplication(inclDoc, XPATH_SERVER_SPRINGBOOT_APPLICATION);
                     parseApplication(inclDoc, XPATH_SERVER_ENTERPRISE_APPLICATION);
-                    parseNames(doc, XPATH_ALL_SERVER_APPLICATIONS);
+                    parseNames(inclDoc, XPATH_ALL_SERVER_APPLICATIONS);
                     // handle nested include elements
                     parseInclude(inclDoc);
                 }

src/test/java/io/openliberty/tools/common/config/ServerConfigDocumentOverridesTest.java

@@ -38,6 +38,7 @@ public class ServerConfigDocumentOverridesTest {
     private final static Path SERVER_CONFIG_DIR = WLP_USER_DIR.resolve("servers/defaultServer");
     private final static Path SHARED_CONFIG_DIR = WLP_USER_DIR.resolve("shared");
     private final static Path SERVERS_RESOURCES_DIR = RESOURCES_DIR.resolve("servers/");
+    private final static Path SERVER_CONFIG_INCLUDE_DIR = SERVER_CONFIG_DIR.resolve("includes");
 
     // 1. variable default values in server.xml file
     // 6. variable values declared in the server.xml file
@@ -277,4 +278,28 @@ public void testServerConfigDocumentForLCLS() throws IOException, PluginExecutio
         assertEquals("ServerConfigDocument http.port variable is not assigned properly ", "1111", configDocument.getProperties().getProperty("http.port"));
         assertEquals("ServerConfigDocument includeLocation default property is not assigned properly ", "includes", configDocument.getDefaultProperties().getProperty("includeLocation"));
     }
+
+    @Test
+    public void testProcessServerXmlWithMultipleSpringBootNodesInMultipleConfigFiles() throws IOException{
+        // we have added <springbootapplication> in valid_server.xml and included_server.xml
+        File serverConfigDir = SERVER_CONFIG_DIR.toFile();
+        Map<String, File> libertyDirPropMap = new HashMap<String, File>();
+        libertyDirPropMap.put(ServerFeatureUtil.SERVER_CONFIG_DIR, serverConfigDir);
+        libertyDirPropMap.put(ServerFeatureUtil.WLP_INSTALL_DIR, WLP_DIR.toFile());
+        libertyDirPropMap.put(ServerFeatureUtil.WLP_USER_DIR, WLP_USER_DIR.toFile());
+        libertyDirPropMap.put(ServerFeatureUtil.SHARED_CONFIG_DIR, SHARED_CONFIG_DIR.toFile());
+        File serversResourceDir = SERVERS_RESOURCES_DIR.toFile();
+        File springBootServerXmlDir = new File(serversResourceDir, "springBootApplicationTest");
+
+        File includedServerXml = new File(springBootServerXmlDir, "included_server.xml");
+        File newIncludedServerXml = new File(SERVER_CONFIG_INCLUDE_DIR.toFile(), "included_server.xml");
+        Files.copy(includedServerXml.toPath(), newIncludedServerXml.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        File validServerXml = new File(springBootServerXmlDir, "valid_server.xml");
+        File newValidServerXml = new File(SERVER_CONFIG_INCLUDE_DIR.toFile(), "valid_server.xml");
+        Files.copy(validServerXml.toPath(), newValidServerXml.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        assertThrows("Found multiple springBootApplication elements specified in the server configuration. Only one springBootApplication can be configured per Liberty server.",
+                PluginExecutionException.class, () -> new ServerConfigDocument(new TestLogger(), null, libertyDirPropMap));
+        Files.delete(newIncludedServerXml.toPath());
+        Files.delete(newValidServerXml.toPath());
+    }
 }

src/test/resources/serverConfig/liberty/wlp/usr/servers/defaultServer/server.xml

@@ -26,4 +26,7 @@
     <variable name="server.env.defined" value="${this.value}"/>
     <variable name="bootstrap.property.defined" value="${that.value}"/>
     <variable name="config.dropins.server" value="2"/>
+
+    <include location="${includeLocationNonDefault}/included_server.xml"/>
+    <include location="${includeLocationNonDefault}/valid_server.xml"/>
 </server>

src/test/resources/servers/springBootApplicationTest/included_server.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="new server">
+    <springBootApplication id="guide-spring-boot"
+                           location="guide-spring-boot-0.2.0.jar"
+                           name="guide-spring-boot" />
+</server>