[SDC] Onboarding 1710 rebase.

[sdc.git] / openecomp-be / api / openecomp-sdc-rest-webapp / vendor-software-products-rest / vendor-software-products-rest-services / src / main / java / org / openecomp / sdcrests / vsp / rest / mapping / MapValidationResponseToDto.java

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapValidationResponseToDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapValidationResponseToDto.java
index e6346c4..89d210f 100644 (file)
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapValidationResponseToDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapValidationResponseToDto.java
@@ -24,6 +24,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.datatypes.error.ErrorMessage;
+import org.openecomp.sdc.vendorsoftwareproduct.types.ComponentValidationResult;
+import org.openecomp.sdc.vendorsoftwareproduct.types.DeploymentFlavorValidationResult;
 import org.openecomp.sdc.vendorsoftwareproduct.types.QuestionnaireValidationResult;
 import org.openecomp.sdc.vendorsoftwareproduct.types.ValidationResponse;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityValidationData;
@@ -32,15 +34,17 @@ import org.openecomp.sdcrests.common.mapping.MapErrorMessageToDto;
 import org.openecomp.sdcrests.common.types.ErrorCodeDto;
 import org.openecomp.sdcrests.common.types.ErrorMessageDto;
 import org.openecomp.sdcrests.mapping.MappingBase;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentValidationResultDto;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityValidationDataDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.DeploymentFlavorValidationResultDto;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireValidationResultDto;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.ValidationResponseDto;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -57,7 +61,8 @@ public class MapValidationResponseToDto
 
   private static QuestionnaireValidationResultDto mapQuestionnaireValidationResult(
       QuestionnaireValidationResult questionnaireValidationResult) {
-    if (questionnaireValidationResult == null) {
+    if (Objects.isNull(questionnaireValidationResult)
+        || Objects.isNull(questionnaireValidationResult.getValidationData())) {
       return null;
     }
     QuestionnaireValidationResultDto questionnaireValidationResultDto =
@@ -74,6 +79,44 @@ public class MapValidationResponseToDto
     return questionnaireValidationResultDto;
   }
 
+  private static ComponentValidationResultDto mapcomponentValidationResult(
+      ComponentValidationResult componentValidationResult) {
+    if (componentValidationResult == null) {
+      return null;
+    }
+    ComponentValidationResultDto componentValidationResultDto =
+        new ComponentValidationResultDto();
+    componentValidationResultDto.setValid(componentValidationResult.isValid());
+
+    Set<CompositionEntityValidationDataDto> validationDataDto = new HashSet<>();
+    for(CompositionEntityValidationData validationData : componentValidationResult.getValidationData()){
+      validationDataDto.add(new MapCompositionEntityValidationDataToDto().applyMapping
+          (validationData, CompositionEntityValidationDataDto.class));
+    }
+
+    componentValidationResultDto.setValidationData(validationDataDto);
+    return componentValidationResultDto;
+  }
+
+  private static DeploymentFlavorValidationResultDto mapdeploymentFlavorValidationResult(
+      DeploymentFlavorValidationResult deploymentFlavorValidationResult) {
+    if (deploymentFlavorValidationResult == null) {
+      return null;
+    }
+    DeploymentFlavorValidationResultDto deploymentFlavorValidationResultDto =
+        new DeploymentFlavorValidationResultDto();
+    deploymentFlavorValidationResultDto.setValid(deploymentFlavorValidationResult.isValid());
+
+    Set<CompositionEntityValidationDataDto> validationDataDto = new HashSet<>();
+    for(CompositionEntityValidationData validationData : deploymentFlavorValidationResult.getValidationData()){
+      validationDataDto.add(new MapCompositionEntityValidationDataToDto().applyMapping
+          (validationData, CompositionEntityValidationDataDto.class));
+    }
+
+    deploymentFlavorValidationResultDto.setValidationData(validationDataDto);
+    return deploymentFlavorValidationResultDto;
+  }
+
   private static List<ErrorMessageDto> mapErrorMessages(List<ErrorMessage> errorMessages) {
     return errorMessages == null ? null : errorMessages.stream().map(
         errorMessage -> new MapErrorMessageToDto()
@@ -94,5 +137,7 @@ public class MapValidationResponseToDto
     target.setUploadDataErrors(mapUploadDataErrors(source.getUploadDataErrors()));
     target.setQuestionnaireValidationResult(
         mapQuestionnaireValidationResult(source.getQuestionnaireValidationResult()));
+    target.setComponentValidationResult(mapcomponentValidationResult(source.getComponentValidationResult()));
+    target.setDeploymentFlavorValidationResult(mapdeploymentFlavorValidationResult(source.getDeploymentFlavorValidationResult()));
   }
 }