changes based on review comments

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

Author: venmanyarun

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

@@ -779,14 +779,12 @@ private boolean isValidURL(String url) {
 
     public void parseVariablesForDefaultValues(Document doc) throws XPathExpressionException {
         List<Properties> propsList = parseVariables(doc, true, false, false);
-        props.putAll(propsList.get(0));
         defaultProps.putAll(propsList.get(1));
     }
 
     private void parseVariablesForValues(Document doc) throws XPathExpressionException {
         List<Properties> propsList = parseVariables(doc, false, true, false);
         props.putAll(propsList.get(0));
-        defaultProps.putAll(propsList.get(1));
     }
 
     public void parseVariablesForBothValues(Document doc) throws XPathExpressionException {

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

@@ -192,7 +192,7 @@ public static List<Properties> parseVariables(Document doc, boolean defaultValue
                 }
             }
         }
-        List<Properties>result=new ArrayList<>();
+        List<Properties> result = new ArrayList<>();
         result.add(props);
         result.add(defaultProps);
         return result;