Enforcing HEAT validation after HEAT upload

Refactored method name , removed unused variable, Moved variable to near its usage.

Change-Id: Ief21e88bd6a4ec1b1683b89089cfdb1a948a5402
Issue-ID: SDC-1027
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
index bf5f19fb2b..8961df70ea 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
@@ -214,8 +214,6 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
       }
       validationResponse.setUploadDataErrors(validateOrchestrationTemplate(orchestrationTemplate));
     }
-    Collection<ComponentDependencyModelEntity> componentDependencies =
-        componentDependencyModelDao.list(new ComponentDependencyModelEntity(vspId, version, null));
 
     QuestionnaireValidationResult questionnaireValidationResult = validateQuestionnaire
         (vspDetails.getId(), vspDetails.getVersion(), vspDetails.getOnboardingMethod());
@@ -230,6 +228,9 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
       }
     }
 
+    Collection<ComponentDependencyModelEntity> componentDependencies =
+        componentDependencyModelDao.list(new ComponentDependencyModelEntity(vspId, version, null));
+
     if (validateComponentDependencies(componentDependencies)) {
       vspErrors
           .add(ComponentDependencyModelErrorBuilder.getcyclicDependencyComponentErrorBuilder());
@@ -251,11 +252,10 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
       if (validationData.isEmpty()) {
         vspErrors.add(VendorSoftwareProductInvalidErrorBuilder
             .candidateDataNotProcessedOrAbortedErrorBuilder(fileName));
-        validationResponse.setVspErrors(vspErrors);
       } else {
         vspErrors.add(VendorSoftwareProductInvalidErrorBuilder.invalidProcessedCandidate(fileName));
-        validationResponse.setVspErrors(vspErrors);
       }
+      validationResponse.setVspErrors(vspErrors);
     }
   }