summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/manifest/ManifestUtil.java
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/manifest/ManifestUtil.java')
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/manifest/ManifestUtil.java28
1 files changed, 5 insertions, 23 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 8c6daac71e..65afb4bab2 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
@@ -17,7 +17,6 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdc.heat.services.manifest;
import java.util.HashMap;
@@ -25,14 +24,12 @@ 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.
*
@@ -45,7 +42,6 @@ public class ManifestUtil {
return fileEnvMap;
}
-
/**
* Scan file env map.
*
@@ -53,13 +49,10 @@ public class ManifestUtil {
* @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) {
-
+ 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) {
@@ -71,7 +64,6 @@ public class ManifestUtil {
}
}
-
/**
* Gets file type map.
*
@@ -84,15 +76,13 @@ public class ManifestUtil {
return fileTypeMap;
}
- private static FileData.Type scanFileTypeMap(FileData fileData, List<FileData> data,
- Map<String, FileData.Type> 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) {
@@ -102,7 +92,6 @@ public class ManifestUtil {
return null;
}
-
/**
* Gets artifacts.
*
@@ -112,7 +101,6 @@ public class ManifestUtil {
public static Set<String> getArtifacts(ManifestContent manifestContent) {
Set<String> artifacts = new HashSet<>();
scanArtifacts(null, manifestContent.getData(), artifacts);
-
return artifacts;
}
@@ -122,22 +110,18 @@ public class ManifestUtil {
artifacts.add(fileData.getFile());
}
}
-
if (data == null) {
return;
}
-
for (FileData chileFileData : data) {
scanArtifacts(chileFileData, chileFileData.getData(), artifacts);
}
}
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);
+ 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);
}
/**
@@ -158,11 +142,9 @@ public class ManifestUtil {
baseFiles.add(fileData.getFile());
}
}
-
if (data == null) {
return;
}
-
for (FileData chileFileData : data) {
scanBase(chileFileData, chileFileData.getData(), baseFiles);
}