Incorporating code change after peer review.

Author: Emanuel Martinez Vazquez

dev/com.ibm.ws.http.plugin.merge/src/com/ibm/ws/http/plugin/merge/internal/PluginMergeToolImpl.java

@@ -16,13 +16,13 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -191,7 +191,7 @@ private void printMergedCopy(String output) throws IOException, ParserConfigurat
         DocumentBuilder parser = dbf.newDocumentBuilder();
         Document mergeDoc = parser.newDocument();
         final Comment comment = mergeDoc.createComment(" This config file was generated by pluginUtility merge v1.0.75 on " +
-                                                       new SimpleDateFormat("yyyy.MM.dd 'at' HH:mm:ss z").format(new Date()) + " ");
+                                                       dateTimeFormatter.format(ZonedDateTime.now()) + " ");
         mergeDoc.appendChild(comment);
 
         mergeDoc.appendChild(mergeDoc.importNode(mergeConfigNode, true));
@@ -255,24 +255,6 @@ private void printMergedCopy(String output) throws IOException, ParserConfigurat
             }
         }
 
-
-   /*     Node[] vhgs = null;
-        itrSharedPlugins = sharedPlugins.iterator();
-        while (itrSharedPlugins.hasNext()) {
-            vhgs = (itrSharedPlugins.next()).getSharedVHostGrps();
-            for (int i = 0; i < vhgs.length; i++) {
-                mergeConfigNode.appendChild(mergeDoc.importNode(vhgs[i], true));
-            }
-        }
-
-        vhgs = null;
-        for (int i = 0; i < plugins.length; i++) {
-            vhgs = plugins[i].getUnsharedVHostGrp();
-            for (int j = 0; j < vhgs.length; j++)
-                mergeConfigNode.appendChild(mergeDoc.importNode(vhgs[j], true));
-        } */
-
-
         mergeConfigNode.appendChild(mergeDoc.createComment(" URI Groups "));
 
         Node[] uriGrps = null;
@@ -701,8 +683,7 @@ private boolean validateEach(String[] inputFiles, String mergeFileName) {
                     break;
                 }
             }
-            if (!passFail)
-                break;
+            if (!passFail) break;
         }
         return passFail;
     }
@@ -738,14 +719,11 @@ public void merge(String argv[]) {
             throw new IllegalArgumentException("Please provide at least 1 plugin-cfg.xml file to merge.");
 
         PluginMergeToolImpl toolInstance = new PluginMergeToolImpl();
-
         sharedPlugins = new ArrayList<PluginInfo>(); // Needed in order to not add unnecessary server clusters
 
         List<String> filesList = toolInstance.loadParms(argv);
         String mergeFileName = filesList.remove(filesList.size() - 1);
-        String[] fileList = filesList.toArray(new String[filesList.size()]);
-        // plugins = new PluginInfo[fileList.length];
-        try {
+        String[] fileList = filesList.toArray(new String[filesList.size()]);        try {
             Tr.info(traceComponent, "Merging...");
             fileList = toolInstance.sortFiles(fileList, FILEINFO_SMALL_TO_LARGE_COMPARATOR);
             toolInstance.loadData(fileList);