1 files changed, 107 insertions, 177 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/SharedResourceGuideLineValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/SharedResourceGuideLineValidator.java
index 0c279c23ee..3bac4c786d 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/SharedResourceGuideLineValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/SharedResourceGuideLineValidator.java
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.validation.impl.validators;
 
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import org.apache.commons.collections4.CollectionUtils;
 import org.openecomp.core.utilities.CommonMethods;
 import org.openecomp.core.validation.ErrorMessageCode;
@@ -36,198 +38,126 @@ import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.validation.Validator;
 import org.openecomp.sdc.validation.util.ValidationUtil;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 public class SharedResourceGuideLineValidator implements Validator {
-  private static final Logger LOGGER = LoggerFactory.getLogger(
-          SharedResourceGuideLineValidator.class);
-  private static final ErrorMessageCode ERROR_CODE_SRG_1 = new ErrorMessageCode("SRG1");
-  private static final ErrorMessageCode ERROR_CODE_SRG_2 = new ErrorMessageCode("SRG2");
-  private static final ErrorMessageCode ERROR_CODE_SRG_3 = new ErrorMessageCode("SRG3");
-  private static final ErrorMessageCode ERROR_CODE_SRG_4 = new ErrorMessageCode("SRG4");
-  private static final ErrorMessageCode ERROR_CODE_SRG_5 = new ErrorMessageCode("SRG5");
-  private static final ErrorMessageCode ERROR_CODE_SRG_6 = new ErrorMessageCode("SRG6");
-
-  @Override
-  public void validate(GlobalValidationContext globalContext) {
-    ManifestContent manifestContent;
-    try {
-      manifestContent = ValidationUtil.validateManifest(globalContext);
-    } catch (Exception exception) {
-      LOGGER.error("Fialed to check  Validation PreCondition ",exception);
-      return;
-    }
-
-     Set<String> baseFiles = validateManifest(manifestContent, globalContext);
-
-    Map<String, FileData.Type> fileTypeMap = ManifestUtil.getFileTypeMap(manifestContent);
-    globalContext.getFiles().stream()
-        .filter(fileName -> FileData
-            .isHeatFile(fileTypeMap.get(fileName)))
-        .forEach(fileName -> validate(fileName,
-            fileTypeMap, baseFiles, globalContext));
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(SharedResourceGuideLineValidator.class);
+    private static final ErrorMessageCode ERROR_CODE_SRG_1 = new ErrorMessageCode("SRG1");
+    private static final ErrorMessageCode ERROR_CODE_SRG_2 = new ErrorMessageCode("SRG2");
+    private static final ErrorMessageCode ERROR_CODE_SRG_3 = new ErrorMessageCode("SRG3");
+    private static final ErrorMessageCode ERROR_CODE_SRG_4 = new ErrorMessageCode("SRG4");
+    private static final ErrorMessageCode ERROR_CODE_SRG_5 = new ErrorMessageCode("SRG5");
+    private static final ErrorMessageCode ERROR_CODE_SRG_6 = new ErrorMessageCode("SRG6");
 
-  }
-
-  private Set<String> validateManifest(ManifestContent manifestContent,
-                                              GlobalValidationContext globalContext) {
-    Set<String> baseFiles = ManifestUtil.getBaseFiles(manifestContent);
-    if (baseFiles == null || baseFiles.isEmpty()) {
-      globalContext.addMessage(
-          SdcCommon.MANIFEST_NAME,
-          ErrorLevel.ERROR,
-          ErrorMessagesFormatBuilder
-              .getErrorWithParameters(ERROR_CODE_SRG_3,Messages
-                  .MISSIN_BASE_HEAT_FILE.getErrorMessage()));
-    } else if (baseFiles.size() > 1) {
-      String baseFileList = getElementListAsString(baseFiles);
-      globalContext.addMessage(
-          SdcCommon.MANIFEST_NAME,
-          ErrorLevel.ERROR,
-          ErrorMessagesFormatBuilder
-              .getErrorWithParameters(ERROR_CODE_SRG_4,Messages
-                      .MULTI_BASE_HEAT_FILE.getErrorMessage(),
-                  baseFileList));
+    private static String getElementListAsString(Set<String> elementCollection) {
+        return "[" + CommonMethods.collectionToCommaSeparatedString(elementCollection) + "]";
     }
-    return baseFiles;
-  }
-
-  private static String getElementListAsString(Set<String> elementCollection) {
-    return "["
-        + CommonMethods.collectionToCommaSeparatedString(elementCollection)
-        +  "]";
-  }
 
-  private void validate(String fileName, Map<String, FileData.Type> fileTypeMap,
-                        Set<String> baseFiles, GlobalValidationContext globalContext) {
-    globalContext.setMessageCode(ERROR_CODE_SRG_5);
-    HeatOrchestrationTemplate
-        heatOrchestrationTemplate = ValidationUtil
-        .checkHeatOrchestrationPreCondition(fileName, globalContext);
-    if (heatOrchestrationTemplate == null) {
-      return;
+    @Override
+    public void validate(GlobalValidationContext globalContext) {
+        ManifestContent manifestContent;
+        try {
+            manifestContent = ValidationUtil.validateManifest(globalContext);
+        } catch (Exception exception) {
+            LOGGER.error("Fialed to check  Validation PreCondition ", exception);
+            return;
+        }
+        Set<String> baseFiles = validateManifest(manifestContent, globalContext);
+        Map<String, FileData.Type> fileTypeMap = ManifestUtil.getFileTypeMap(manifestContent);
+        globalContext.getFiles().stream().filter(fileName -> FileData.isHeatFile(fileTypeMap.get(fileName)))
+            .forEach(fileName -> validate(fileName, fileTypeMap, baseFiles, globalContext));
     }
 
-    validateBaseFile(fileName, baseFiles, heatOrchestrationTemplate, globalContext);
-    validateHeatVolumeFile(fileName, fileTypeMap, heatOrchestrationTemplate, globalContext);
-  }
-
-
-  private void validateBaseFile(String fileName, Set<String> baseFiles,
-                                HeatOrchestrationTemplate heatOrchestrationTemplate,
-                                GlobalValidationContext globalContext) {
-    //if not base return
-    if (baseFiles == null || !baseFiles.contains(fileName)) {
-      return;
-    }
-
-    //if no resources exist return
-    if (heatOrchestrationTemplate.getResources() == null
-        || heatOrchestrationTemplate.getResources().size() == 0) {
-      return;
-    }
-
-    Set<String> expectedExposedResources = new HashSet<>();
-    heatOrchestrationTemplate.getResources()
-        .entrySet()
-        .stream()
-        .filter(entry -> ValidationUtil.isExpectedToBeExposed(entry.getValue().getType()))
-        .forEach(entry -> expectedExposedResources.add(entry.getKey()));
-    Set<String> actualExposedResources = new HashSet<>();
-
-    if (heatOrchestrationTemplate.getOutputs() != null) {
-      globalContext.setMessageCode(ERROR_CODE_SRG_6);
-      heatOrchestrationTemplate.getOutputs().entrySet()
-          .stream()
-          .filter(entry -> isPropertyValueGetResource(fileName, entry.getValue().getValue(),
-              globalContext))
-          .forEach(entry -> actualExposedResources.add(
-              getResourceIdFromPropertyValue(fileName, entry.getValue().getValue(),
-                  globalContext)));
-    }
-    ValidationUtil.removeExposedResourcesCalledByGetResource(fileName, actualExposedResources,
-        heatOrchestrationTemplate, globalContext);
-
-    actualExposedResources.forEach(expectedExposedResources::remove);
-
-    if (CollectionUtils.isNotEmpty(expectedExposedResources)) {
-      expectedExposedResources
-          .stream()
-          .forEach(name -> globalContext.addMessage(
-              fileName,
-              ErrorLevel.WARNING, ErrorMessagesFormatBuilder
-                  .getErrorWithParameters(ERROR_CODE_SRG_1,
-                          Messages.RESOURCE_NOT_DEFINED_IN_OUTPUT.getErrorMessage(),
-                          name)));
+    private Set<String> validateManifest(ManifestContent manifestContent, GlobalValidationContext globalContext) {
+        Set<String> baseFiles = ManifestUtil.getBaseFiles(manifestContent);
+        if (baseFiles == null || baseFiles.isEmpty()) {
+            globalContext.addMessage(SdcCommon.MANIFEST_NAME, ErrorLevel.ERROR,
+                ErrorMessagesFormatBuilder.getErrorWithParameters(ERROR_CODE_SRG_3, Messages.MISSIN_BASE_HEAT_FILE.getErrorMessage()));
+        } else if (baseFiles.size() > 1) {
+            String baseFileList = getElementListAsString(baseFiles);
+            globalContext.addMessage(SdcCommon.MANIFEST_NAME, ErrorLevel.ERROR,
+                ErrorMessagesFormatBuilder.getErrorWithParameters(ERROR_CODE_SRG_4, Messages.MULTI_BASE_HEAT_FILE.getErrorMessage(), baseFileList));
+        }
+        return baseFiles;
     }
-  }
 
-  private void validateHeatVolumeFile(String fileName, Map<String, FileData.Type> fileTypeMap,
-                                      HeatOrchestrationTemplate heatOrchestrationTemplate,
-                                      GlobalValidationContext globalContext) {
-    //if not heat volume return
-    if (!fileTypeMap.get(fileName).equals(FileData.Type.HEAT_VOL)) {
-      return;
+    private void validate(String fileName, Map<String, FileData.Type> fileTypeMap, Set<String> baseFiles, GlobalValidationContext globalContext) {
+        globalContext.setMessageCode(ERROR_CODE_SRG_5);
+        HeatOrchestrationTemplate heatOrchestrationTemplate = ValidationUtil.checkHeatOrchestrationPreCondition(fileName, globalContext);
+        if (heatOrchestrationTemplate == null) {
+            return;
+        }
+        validateBaseFile(fileName, baseFiles, heatOrchestrationTemplate, globalContext);
+        validateHeatVolumeFile(fileName, fileTypeMap, heatOrchestrationTemplate, globalContext);
     }
 
-    //if no resources exist return
-    if (heatOrchestrationTemplate.getResources() == null
-        || heatOrchestrationTemplate.getResources().size() == 0) {
-      return;
+    private void validateBaseFile(String fileName, Set<String> baseFiles, HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                  GlobalValidationContext globalContext) {
+        //if not base return
+        if (baseFiles == null || !baseFiles.contains(fileName)) {
+            return;
+        }
+        //if no resources exist return
+        if (heatOrchestrationTemplate.getResources() == null || heatOrchestrationTemplate.getResources().size() == 0) {
+            return;
+        }
+        Set<String> expectedExposedResources = new HashSet<>();
+        heatOrchestrationTemplate.getResources().entrySet().stream().filter(entry -> ValidationUtil.isExpectedToBeExposed(entry.getValue().getType()))
+            .forEach(entry -> expectedExposedResources.add(entry.getKey()));
+        Set<String> actualExposedResources = new HashSet<>();
+        if (heatOrchestrationTemplate.getOutputs() != null) {
+            globalContext.setMessageCode(ERROR_CODE_SRG_6);
+            heatOrchestrationTemplate.getOutputs().entrySet().stream()
+                .filter(entry -> isPropertyValueGetResource(fileName, entry.getValue().getValue(), globalContext))
+                .forEach(entry -> actualExposedResources.add(getResourceIdFromPropertyValue(fileName, entry.getValue().getValue(), globalContext)));
+        }
+        ValidationUtil.removeExposedResourcesCalledByGetResource(fileName, actualExposedResources, heatOrchestrationTemplate, globalContext);
+        actualExposedResources.forEach(expectedExposedResources::remove);
+        if (CollectionUtils.isNotEmpty(expectedExposedResources)) {
+            expectedExposedResources.stream().forEach(name -> globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(ERROR_CODE_SRG_1, Messages.RESOURCE_NOT_DEFINED_IN_OUTPUT.getErrorMessage(), name)));
+        }
     }
 
-    Set<String> expectedExposedResources = new HashSet<>();
-    Set<String> actualExposedResources = new HashSet<>();
-    heatOrchestrationTemplate.getResources()
-        .entrySet()
-        .stream()
-        .filter(entry -> entry.getValue().getType()
-            .equals(HeatResourcesTypes.CINDER_VOLUME_RESOURCE_TYPE.getHeatResource()))
-        .forEach(entry -> expectedExposedResources.add(entry.getKey()));
-
-    if (heatOrchestrationTemplate.getOutputs() != null) {
-      globalContext.setMessageCode(ERROR_CODE_SRG_6);
-      heatOrchestrationTemplate.getOutputs().entrySet()
-          .stream()
-          .filter(entry -> isPropertyValueGetResource(fileName, entry.getValue().getValue(),
-              globalContext))
-          .forEach(entry -> actualExposedResources.add(
-              getResourceIdFromPropertyValue(fileName, entry.getValue().getValue(),
-                  globalContext)));
+    private void validateHeatVolumeFile(String fileName, Map<String, FileData.Type> fileTypeMap, HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                        GlobalValidationContext globalContext) {
+        //if not heat volume return
+        if (!fileTypeMap.get(fileName).equals(FileData.Type.HEAT_VOL)) {
+            return;
+        }
+        //if no resources exist return
+        if (heatOrchestrationTemplate.getResources() == null || heatOrchestrationTemplate.getResources().size() == 0) {
+            return;
+        }
+        Set<String> expectedExposedResources = new HashSet<>();
+        Set<String> actualExposedResources = new HashSet<>();
+        heatOrchestrationTemplate.getResources().entrySet().stream()
+            .filter(entry -> entry.getValue().getType().equals(HeatResourcesTypes.CINDER_VOLUME_RESOURCE_TYPE.getHeatResource()))
+            .forEach(entry -> expectedExposedResources.add(entry.getKey()));
+        if (heatOrchestrationTemplate.getOutputs() != null) {
+            globalContext.setMessageCode(ERROR_CODE_SRG_6);
+            heatOrchestrationTemplate.getOutputs().entrySet().stream()
+                .filter(entry -> isPropertyValueGetResource(fileName, entry.getValue().getValue(), globalContext))
+                .forEach(entry -> actualExposedResources.add(getResourceIdFromPropertyValue(fileName, entry.getValue().getValue(), globalContext)));
+        }
+        actualExposedResources.forEach(expectedExposedResources::remove);
+        if (CollectionUtils.isNotEmpty(expectedExposedResources)) {
+            expectedExposedResources.stream().forEach(name -> globalContext.addMessage(fileName, ErrorLevel.WARNING,
+                ErrorMessagesFormatBuilder.getErrorWithParameters(ERROR_CODE_SRG_2, Messages.VOLUME_HEAT_NOT_EXPOSED.getErrorMessage(), name)));
+        }
     }
 
-    actualExposedResources.forEach(expectedExposedResources::remove);
-
-    if (CollectionUtils.isNotEmpty(expectedExposedResources)) {
-      expectedExposedResources
-          .stream()
-          .forEach(name -> globalContext.addMessage(
-              fileName,
-              ErrorLevel.WARNING, ErrorMessagesFormatBuilder
-                  .getErrorWithParameters(ERROR_CODE_SRG_2,
-                          Messages.VOLUME_HEAT_NOT_EXPOSED.getErrorMessage(), name)));
+    private boolean isPropertyValueGetResource(String filename, Object value, GlobalValidationContext globalContext) {
+        Set<String> referenceValues = HeatStructureUtil
+            .getReferencedValuesByFunctionName(filename, ResourceReferenceFunctions.GET_RESOURCE.getFunction(), value, globalContext);
+        return referenceValues != null && (CollectionUtils.isNotEmpty(referenceValues));
     }
-  }
 
-
-  private boolean isPropertyValueGetResource(String filename, Object value,
-                                             GlobalValidationContext globalContext) {
-    Set<String> referenceValues = HeatStructureUtil.getReferencedValuesByFunctionName(filename,
-        ResourceReferenceFunctions.GET_RESOURCE.getFunction(), value, globalContext);
-    return referenceValues != null && (CollectionUtils.isNotEmpty(referenceValues));
-  }
-
-  private String getResourceIdFromPropertyValue(String filename, Object value,
-                                                GlobalValidationContext globalContext) {
-    Set<String> referenceValues = HeatStructureUtil.getReferencedValuesByFunctionName(filename,
-        ResourceReferenceFunctions.GET_RESOURCE.getFunction(), value, globalContext);
-    if (referenceValues != null && CollectionUtils.isNotEmpty(referenceValues)) {
-      return (String) referenceValues.toArray()[0];
+    private String getResourceIdFromPropertyValue(String filename, Object value, GlobalValidationContext globalContext) {
+        Set<String> referenceValues = HeatStructureUtil
+            .getReferencedValuesByFunctionName(filename, ResourceReferenceFunctions.GET_RESOURCE.getFunction(), value, globalContext);
+        if (referenceValues != null && CollectionUtils.isNotEmpty(referenceValues)) {
+            return (String) referenceValues.toArray()[0];
+        }
+        return null;
     }
-    return null;
-  }
-
 }