1 files changed, 120 insertions, 125 deletions

diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/manifest/ManifestUtil.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/manifest/ManifestUtil.java
index ef057a9fc9..8c6daac71e 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/manifest/ManifestUtil.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/manifest/ManifestUtil.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,156 +20,151 @@
 
 package org.openecomp.sdc.heat.services.manifest;
 
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.heat.datatypes.manifest.FileData;
-import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+
 public class ManifestUtil {
 
 
-  /**
-   * Gets file and its env.
-   *
-   * @param manifestContent the manifest content
-   * @return the file and its env
-   */
-  public static Map<String, FileData> getFileAndItsEnv(ManifestContent manifestContent) {
-    Map<String, FileData> fileEnvMap = new HashMap<>();
-    scanFileEnvMap(null, manifestContent.getData(), fileEnvMap);
-    return fileEnvMap;
-  }
-
-
-  /**
-   * Scan file env map.
-   *
-   * @param fileData     the file data
-   * @param fileDataList the file data list
-   * @param fileEnvMap   the file env map
-   */
-  public static void scanFileEnvMap(FileData fileData, List<FileData> fileDataList,
-                                    Map<String, FileData> fileEnvMap) {
-
-    if (CollectionUtils.isEmpty(fileDataList)) {
-      return;
+    /**
+     * Gets file and its env.
+     *
+     * @param manifestContent the manifest content
+     * @return the file and its env
+     */
+    public static Map<String, FileData> getFileAndItsEnv(ManifestContent manifestContent) {
+        Map<String, FileData> fileEnvMap = new HashMap<>();
+        scanFileEnvMap(null, manifestContent.getData(), fileEnvMap);
+        return fileEnvMap;
     }
 
-    for (FileData childFileData : fileDataList) {
-      FileData.Type childType = childFileData.getType();
-      if (fileData != null) {
-        if (childType != null && childType.equals(FileData.Type.HEAT_ENV)) {
-          fileEnvMap.put(fileData.getFile(), childFileData);
+
+    /**
+     * Scan file env map.
+     *
+     * @param fileData     the file data
+     * @param fileDataList the file data list
+     * @param fileEnvMap   the file env map
+     */
+    private static void scanFileEnvMap(FileData fileData, List<FileData> fileDataList,
+                                      Map<String, FileData> fileEnvMap) {
+
+        if (CollectionUtils.isEmpty(fileDataList)) {
+            return;
+        }
+
+        for (FileData childFileData : fileDataList) {
+            FileData.Type childType = childFileData.getType();
+            if (fileData != null) {
+                if (childType != null && childType.equals(FileData.Type.HEAT_ENV)) {
+                    fileEnvMap.put(fileData.getFile(), childFileData);
+                }
+            }
+            scanFileEnvMap(childFileData, childFileData.getData(), fileEnvMap);
         }
-      }
-      scanFileEnvMap(childFileData, childFileData.getData(), fileEnvMap);
-    }
-  }
-
-
-  /**
-   * Gets file type map.
-   *
-   * @param manifestContent the manifest content
-   * @return the file type map
-   */
-  public static Map<String, FileData.Type> getFileTypeMap(ManifestContent manifestContent) {
-    Map<String, FileData.Type> fileTypeMap = new HashMap<>();
-    scanFileTypeMap(null, manifestContent.getData(), fileTypeMap);
-    return fileTypeMap;
-  }
-
-  private static FileData.Type scanFileTypeMap(FileData fileData, List<FileData> data,
-                                               Map<String, FileData.Type> fileTypeMap) {
-    if (fileData != null) {
-      fileTypeMap.put(fileData.getFile(), fileData.getType());
-    }
-    if (data == null) {
-      return null;
     }
 
-    for (FileData chileFileData : data) {
-      FileData.Type type = scanFileTypeMap(chileFileData, chileFileData.getData(), fileTypeMap);
-      if (type != null) {
-        return type;
-      }
+
+    /**
+     * Gets file type map.
+     *
+     * @param manifestContent the manifest content
+     * @return the file type map
+     */
+    public static Map<String, FileData.Type> getFileTypeMap(ManifestContent manifestContent) {
+        Map<String, FileData.Type> fileTypeMap = new HashMap<>();
+        scanFileTypeMap(null, manifestContent.getData(), fileTypeMap);
+        return fileTypeMap;
     }
-    return null;
-  }
 
+    private static FileData.Type scanFileTypeMap(FileData fileData, List<FileData> data,
+                                                 Map<String, FileData.Type> fileTypeMap) {
+        if (fileData != null) {
+            fileTypeMap.put(fileData.getFile(), fileData.getType());
+        }
+        if (data == null) {
+            return null;
+        }
 
-  /**
-   * Gets artifacts.
-   *
-   * @param manifestContent the manifest content
-   * @return the artifacts
-   */
-  public static Set<String> getArtifacts(ManifestContent manifestContent) {
-    Set<String> artifacts = new HashSet<>();
-    scanArtifacts(null, manifestContent.getData(), artifacts);
+        for (FileData chileFileData : data) {
+            FileData.Type type = scanFileTypeMap(chileFileData, chileFileData.getData(), fileTypeMap);
+            if (type != null) {
+                return type;
+            }
+        }
+        return null;
+    }
 
-    return artifacts;
-  }
 
+    /**
+     * Gets artifacts.
+     *
+     * @param manifestContent the manifest content
+     * @return the artifacts
+     */
+    public static Set<String> getArtifacts(ManifestContent manifestContent) {
+        Set<String> artifacts = new HashSet<>();
+        scanArtifacts(null, manifestContent.getData(), artifacts);
 
-  private static void scanArtifacts(FileData fileData, List<FileData> data, Set<String> artifacts) {
-    if (fileData != null && fileData.getType() != null) {
-      if (isArtifact(fileData)) {
-        artifacts.add(fileData.getFile());
-      }
+        return artifacts;
     }
 
-    if (data == null) {
-      return;
-    }
+    private static void scanArtifacts(FileData fileData, List<FileData> data, Set<String> artifacts) {
+        if (fileData != null && fileData.getType() != null) {
+            if (isArtifact(fileData)) {
+                artifacts.add(fileData.getFile());
+            }
+        }
 
-    for (FileData chileFileData : data) {
-      scanArtifacts(chileFileData, chileFileData.getData(), artifacts);
-    }
-  }
-
-  private static boolean isArtifact(FileData fileData) {
-    if (FileData.Type.valueOf(fileData.getType().name()) != null
-        && !fileData.getType().equals(FileData.Type.HEAT)
-        && !fileData.getType().equals(FileData.Type.HEAT_ENV)
-        && !fileData.getType().equals(FileData.Type.HEAT_NET)
-        && !fileData.getType().equals(FileData.Type.HEAT_VOL)) {
-      return true;
+        if (data == null) {
+            return;
+        }
+
+        for (FileData chileFileData : data) {
+            scanArtifacts(chileFileData, chileFileData.getData(), artifacts);
+        }
     }
-    return false;
-  }
-
-  /**
-   * Gets base files.
-   *
-   * @param manifestContent the manifest content
-   * @return the base files
-   */
-  public static Set<String> getBaseFiles(ManifestContent manifestContent) {
-    Set<String> baseFiles = new HashSet<>();
-    scanBase(null, manifestContent.getData(), baseFiles);
-    return baseFiles;
-  }
-
-  private static void scanBase(FileData fileData, List<FileData> data, Set<String> baseFiles) {
-    if (fileData != null && fileData.getBase() != null) {
-      if (fileData.getBase()) {
-        baseFiles.add(fileData.getFile());
-      }
+
+    private static boolean isArtifact(FileData fileData) {
+        return FileData.Type.valueOf(fileData.getType().name()) != null
+                && !fileData.getType().equals(FileData.Type.HEAT)
+                && !fileData.getType().equals(FileData.Type.HEAT_ENV)
+                && !fileData.getType().equals(FileData.Type.HEAT_NET)
+                && !fileData.getType().equals(FileData.Type.HEAT_VOL);
     }
 
-    if (data == null) {
-      return;
+    /**
+     * Gets base files.
+     *
+     * @param manifestContent the manifest content
+     * @return the base files
+     */
+    public static Set<String> getBaseFiles(ManifestContent manifestContent) {
+        Set<String> baseFiles = new HashSet<>();
+        scanBase(null, manifestContent.getData(), baseFiles);
+        return baseFiles;
     }
 
-    for (FileData chileFileData : data) {
-      scanBase(chileFileData, chileFileData.getData(), baseFiles);
+    private static void scanBase(FileData fileData, List<FileData> data, Set<String> baseFiles) {
+        if (fileData != null && fileData.getBase() != null) {
+            if (fileData.getBase()) {
+                baseFiles.add(fileData.getFile());
+            }
+        }
+
+        if (data == null) {
+            return;
+        }
+
+        for (FileData chileFileData : data) {
+            scanBase(chileFileData, chileFileData.getData(), baseFiles);
+        }
     }
-  }
 }