Revert "adding block so windows doesn't run retrieveUninstallFileList twice"

Author: bensonlatibm

dev/com.ibm.ws.install/src/com/ibm/ws/install/internal/UninstallDirector.java

@@ -12,21 +12,16 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import com.ibm.ws.install.InstallException;
 import com.ibm.ws.install.InstallProgressEvent;
@@ -67,8 +62,8 @@ void cleanUp() {
      * Creates array and calls method below
      *
      * @param checkDependency if uninstall should check for dependencies
-     * @param productId       product id to uninstall
-     * @param toBeDeleted     Collection of files to uninstall
+     * @param productId product id to uninstall
+     * @param toBeDeleted Collection of files to uninstall
      * @throws InstallException
      */
     void uninstall(boolean checkDependency, String productId, Collection<File> toBeDeleted) throws InstallException {
@@ -93,32 +88,27 @@ void retrieveUninstallFileList(UninstallAsset uninstallAsset, boolean checkDepen
      * Uninstalls product depending on dependencies
      *
      * @param checkDependency if uninstall should check for dependencies
-     * @param productIds      product ids to uninstall
-     * @param toBeDeleted     Collection of files to uninstall
+     * @param productIds product ids to uninstall
+     * @param toBeDeleted Collection of files to uninstall
      * @throws InstallException
      */
     void uninstall(boolean checkDependency, String[] productIds, Collection<File> toBeDeleted) throws InstallException {
         if (uninstallAssets.isEmpty())
             return;
 
-        // On Windows specifically, we need to do a file lock check before attempting to uninstall assets.
+        // Run file checking only on Windows
         if (InstallUtils.isWindows) {
             // check any file is locked
             fireProgressEvent(InstallProgressEvent.CHECK, 10, Messages.INSTALL_KERNEL_MESSAGES.getLogMessage("STATE_CHECKING"));
-            Set<File> baseDirs = new HashSet<>();
             for (UninstallAsset uninstallAsset : uninstallAssets) {
-                baseDirs.addAll(getAssetBaseDirectories(uninstallAsset));
+                retrieveUninstallFileList(uninstallAsset, checkDependency);
+                engine.preCheck(uninstallAsset);
             }
-
-            // For each uninstall asset's base directory, validate no files are locked recursively.
-            for (File baseDir : baseDirs) {
-                try {
-                    List<Path> allPathsFromBaseDir = Files.walk(baseDir.toPath()).collect(Collectors.toList());
-                    for (Path path : allPathsFromBaseDir) {
-                        InstallUtils.isFileLocked("ERROR_UNINSTALL_FEATURE_FILE_LOCKED", path.toString(), path.toFile());
+            if (toBeDeleted != null) {
+                for (File f : toBeDeleted) {
+                    for (String productId : productIds) {
+                        InstallUtils.isFileLocked("ERROR_UNINSTALL_PRODUCT_FILE_LOCKED", productId, f);
                     }
-                } catch (IOException e) {
-                    throw ExceptionUtils.create(e);
                 }
             }
         }
@@ -154,75 +144,6 @@ else if (f.isDirectory())
         }
     }
 
-    /**
-     *
-     * @param uninstallAsset the uninstall asset to derive a base directory from
-     * @return the uninstallAsset's base directories derived from uninstallAsset. For example, if the uninstallAsset location is dev/spi/ibm and baseDir is
-     *         /opt/IBM/WebSphere/AppServer, this will return 'Set[/opt/IBM/WebSphere/AppServer/dev]' iff the path exists, an empty Set otherwise.
-     * @throws InstallException
-     */
-    private Set<File> getAssetBaseDirectories(UninstallAsset uninstallAsset) throws InstallException {
-
-        Set<File> baseDirs = new HashSet<>();
-        File baseDir = engine.getBaseDir(uninstallAsset.getProvisioningFeatureDefinition());
-        Set<String> assetLocations = getAssetLocations(uninstallAsset);
-
-        // For each asset location, construct a list of locations containing the first child directory appended
-        // to the base directory iff that directory exists.
-        for (String assetLocation : assetLocations) {
-            List<String> subDirs = getFirstChildSubdirectoryFromLocations(assetLocation);
-            for (String subDir : subDirs) {
-                File base = new File(baseDir + File.separator + subDir);
-                if (base.exists()) {
-                    baseDirs.add(base);
-                }
-            }
-        }
-        return baseDirs;
-    }
-
-    /**
-     * @param uninstallAsset the asset to process for relevant location data
-     * @return a set of strings that are the location data derived from uninstallAsset. This set my be empty if the asset is not BUNDLE_TYPE, JAR_TYPE, BOOT_JAR_TYPE or FILE_TYPE.
-     *         It could also be empty if the getLocation() call returns null or an empty string.
-     */
-    private Set<String> getAssetLocations(UninstallAsset uninstallAsset) {
-        // Only process BUNDLE, JAR, BOOT and FILE subsystem types.
-        final List<SubsystemContentType> resourceFilter = Arrays.asList(SubsystemContentType.BUNDLE_TYPE, SubsystemContentType.JAR_TYPE, SubsystemContentType.BOOT_JAR_TYPE,
-                                                                        SubsystemContentType.FILE_TYPE);
-        // From the collection of FeatureResources, filter out types we don't wish to process and then collect all location strings from them.
-        return uninstallAsset.getProvisioningFeatureDefinition().getConstituents(null).stream().filter(s -> resourceFilter.contains(s.getType())
-                                                                                                            && s.getLocation() != null).map(s -> s.getLocation()).collect(Collectors.toSet());
-    }
-
-    /**
-     *
-     * @param locString the location string to parse, may be null and may contain more than one location separated by `,`.
-     * @return A list of the parent directories specified in the locString. For example, if the locString is "bin/tools/tools.zip", this method will return ["bin"].
-     *         if locString contains "bin/tools/tools.zip,etc/files/files.zip" this method would return ["bin","etc"]
-     *
-     */
-    private List<String> getFirstChildSubdirectoryFromLocations(String locString) {
-        List<String> subdirectories = new ArrayList<>();
-        if (locString != null) {
-            String[] locs = locString.contains(",") ? locString.split(",") : new String[] { locString };
-            for (String loc : locs) {
-                File fle = new File(loc);
-                String fileStr = fle.toString();
-                // skip a leading separator
-                if (fileStr.charAt(0) == File.separatorChar) {
-                    fileStr = fileStr.substring(1);
-                }
-                int index = fileStr.indexOf(File.separator);
-                if (index > 0) {
-                    fileStr = fileStr.substring(0, fileStr.indexOf(File.separator));
-                }
-                subdirectories.add(fileStr);
-            }
-        }
-        return subdirectories;
-    }
-
     void uninstall(Collection<String> ids, boolean force) throws InstallException {
         Collection<ProvisioningFeatureDefinition> installedFeatureDefinitions = product.getAllFeatureDefinitions().values();
         Collection<String> featureNames = new ArrayList<String>();
@@ -251,7 +172,7 @@ void uninstall(Collection<String> ids, boolean force) throws InstallException {
      *
      * @param featureNames a list of the feature names and feature symbolic names to uninstall
      * @throws InstallException if there is a feature not installed or
-     *                              there is another feature still requires the uninstalling features.
+     *             there is another feature still requires the uninstalling features.
      */
     void uninstallFeatures(Collection<String> featureNames, Collection<String> uninstallInstallFeatures, boolean force) {
         product.refresh();
@@ -288,7 +209,7 @@ boolean contains(ProvisioningFeatureDefinition pfd) {
     /**
      * Creates array and calls method below
      *
-     * @param productId              product id to uninstall
+     * @param productId product id to uninstall
      * @param exceptPlatfromFeatuers If platform features should be ignored
      * @throws InstallException
      */
@@ -301,7 +222,7 @@ void uninstallFeaturesByProductId(String productId, boolean exceptPlatfromFeatue
     /**
      * Uninstalls features by product id
      *
-     * @param productIds             product ids to uninstall
+     * @param productIds product ids to uninstall
      * @param exceptPlatfromFeatuers If platform features should be ignored
      * @throws InstallException
      */