Removed dead and duplicate code in onboarding

Change-Id: I2ca0f1a4b00938838213ba2d615ab72c80d6dda3
Issue-ID: SDC-1903
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

7 files changed, 63 insertions, 179 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
index d4526da1e5..52135fad55 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
@@ -36,8 +36,6 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDto
     target.setThresholdUnits(source.getThresholdUnit());
     target.setIncrements(source.getIncrements());
 
-    MapChoiceOrOtherToChoiceOrOtherDto choiceOrOtherMapper =
-        new MapChoiceOrOtherToChoiceOrOtherDto();
     target.setOperationalScope(new MapMultiChoiceOrOtherToMultiChoiceOrOtherDto()
         .applyMapping(source.getOperationalScope(), MultiChoiceOrOtherDto.class));
 
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.java
index 69cd285cf7..5832596580 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.java
@@ -35,8 +35,6 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntity
     target.setThresholdValue(source.getThresholdValue());
     target.setThresholdUnit(source.getThresholdUnits());
     target.setIncrements(source.getIncrements());
-    MapChoiceOrOtherDtoToChoiceOrOther choiceOrOtherMapper =
-        new MapChoiceOrOtherDtoToChoiceOrOther();
     target.setOperationalScope(new MapMultiChoiceOrOtherDtoToMultiChoiceOrOther()
         .applyMapping(source.getOperationalScope(), MultiChoiceOrOther.class));
 
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/CompositionEntityDataManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/CompositionEntityDataManagerImpl.java
index 1946db8b5d..e9c75319f5 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/CompositionEntityDataManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/CompositionEntityDataManagerImpl.java
@@ -16,6 +16,16 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.impl;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.openecomp.core.utilities.CommonMethods;
@@ -34,7 +44,15 @@ import org.openecomp.sdc.vendorsoftwareproduct.dao.ImageDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.NetworkDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.NicDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao;
-import org.openecomp.sdc.vendorsoftwareproduct.dao.type.*;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.CompositionEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComputeEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.DeploymentFlavorEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ImageEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NetworkEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspQuestionnaireEntity;
 import org.openecomp.sdc.vendorsoftwareproduct.services.schemagenerator.SchemaGenerator;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Component;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.ComponentData;
@@ -52,17 +70,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator.SchemaTempl
 import org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator.SchemaTemplateInput;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
 public class CompositionEntityDataManagerImpl implements CompositionEntityDataManager {
 
   private static final String COMPOSITION_ENTITY_DATA_MANAGER_ERR =
@@ -218,38 +225,6 @@ public class CompositionEntityDataManagerImpl implements CompositionEntityDataMa
     return new HashSet<>();
   }
 
-  private boolean isThereErrorsInSubTree(CompositionEntityValidationData entity) {
-    if (Objects.isNull(entity)) {
-      return false;
-    }
-
-    if (CollectionUtils.isNotEmpty(entity.getErrors())) {
-      return true;
-    }
-
-    Collection<CompositionEntityValidationData> subEntitiesValidationData =
-        entity.getSubEntitiesValidationData();
-    return !CollectionUtils.isEmpty(subEntitiesValidationData) &&
-        checkForErrorsInChildren(subEntitiesValidationData);
-
-  }
-
-  private boolean checkForErrorsInChildren(
-      Collection<CompositionEntityValidationData> subEntitiesValidationData) {
-    boolean result = false;
-    for (CompositionEntityValidationData subEntity : subEntitiesValidationData) {
-      if (CollectionUtils.isNotEmpty(subEntity.getErrors())) {
-        return true;
-      }
-
-      result = isThereErrorsInSubTree(subEntity) || result;
-      if (result) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   private void saveComponents(String vspId, Version version, CompositionData compositionData,
                               Map<String, String> networkIdByName) {
     if (CollectionUtils.isNotEmpty(compositionData.getComponents())) {
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ComponentQuestionnaireData.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ComponentQuestionnaireData.java
index 78242a6c61..4b9ed4f45e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ComponentQuestionnaireData.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ComponentQuestionnaireData.java
@@ -16,6 +16,17 @@
 
 package org.openecomp.sdc.enrichment.impl.tosca;
 
+import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.HIGH_AVAIL_MODE;
+import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MANDATORY;
+import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MAX_INSTANCES;
+import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MIN_INSTANCES;
+import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.NFC_NAMING_CODE;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.openecomp.core.utilities.json.JsonUtil;
 import org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
@@ -28,18 +39,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.composition.ComponentData;
 import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.ComponentQuestionnaire;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.HIGH_AVAIL_MODE;
-import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MANDATORY;
-import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MAX_INSTANCES;
-import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MIN_INSTANCES;
-import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.NFC_NAMING_CODE;
-
 
 public class ComponentQuestionnaireData {
 
@@ -59,10 +58,8 @@ public class ComponentQuestionnaireData {
 
   public Map<String, Map<String, Object>> getPropertiesfromCompQuestionnaire(String key,
                                                                              Version version) {
-    Map<String, Map<String, Object>> componentProperties =
-        new HashMap<String, Map<String, Object>>();
+    Map<String, Map<String, Object>> componentProperties = new HashMap<>();
 
-    ComponentEntity entity = new ComponentEntity(key, version, null);
     final Collection<ComponentEntity> componentEntities =
         componentDao.listCompositionAndQuestionnaire(key, version);
 
@@ -79,12 +76,10 @@ public class ComponentQuestionnaireData {
 
       sourceToTarget.put(component.getId(), componentData.getDisplayName());
 
-      String nfcNamingCode = componentQuestionnaire.getGeneral().getNfcNamingCode() != null ?
-                                     componentQuestionnaire.getGeneral().getNfcNamingCode() : null;
+      String nfcNamingCode = componentQuestionnaire.getGeneral().getNfcNamingCode();
       questionnaireParams.put(NFC_NAMING_CODE, nfcNamingCode);
 
-      String vfcDescription = componentQuestionnaire.getGeneral().getNfcFunction() != null ?
-                                      componentQuestionnaire.getGeneral().getNfcFunction() : null;
+      String vfcDescription = componentQuestionnaire.getGeneral().getNfcFunction();
       questionnaireParams.put(EnrichmentConstants.NFC_FUNCTION, vfcDescription);
 
 
@@ -128,21 +123,21 @@ public class ComponentQuestionnaireData {
     Collection<ComponentDependencyModelEntity> componentDependencies =
         componentDependencyModelDao.list(new ComponentDependencyModelEntity(vspId, version, null));
 
-    Map<String, List<String>> sourceToTargetComponent = new HashMap<String, List<String>>();
-    List<String> targetComponents = null;
+    Map<String, List<String>> dependencies = new HashMap<>();
+    List<String> targetComponents;
     for (ComponentDependencyModelEntity dependency : componentDependencies) {
       String sourceComponentName = componentNameData.get(dependency.getSourceComponentId());
       String targetComponentName = componentNameData.get(dependency.getTargetComponentId());
-      if (!sourceToTargetComponent.containsKey(sourceComponentName)) {
-        targetComponents = new ArrayList<String>();
+      if (!dependencies.containsKey(sourceComponentName)) {
+        targetComponents = new ArrayList<>();
       } else {
-        targetComponents = sourceToTargetComponent.get(sourceComponentName);
+        targetComponents = dependencies.get(sourceComponentName);
       }
       targetComponents.add(targetComponentName);
-      sourceToTargetComponent.put(sourceComponentName, targetComponents);
+      dependencies.put(sourceComponentName, targetComponents);
     }
 
-    return sourceToTargetComponent;
+    return dependencies;
   }
 
 }
diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java
index 8c7a7ca6a8..3d428d0b58 100644
--- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java
+++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java
@@ -16,9 +16,22 @@
 
 package org.openecomp.sdc.generator.core.services;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
-import org.onap.sdc.tosca.datatypes.model.*;
+import org.onap.sdc.tosca.datatypes.model.Import;
+import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
+import org.onap.sdc.tosca.datatypes.model.NodeType;
+import org.onap.sdc.tosca.datatypes.model.PropertyDefinition;
+import org.onap.sdc.tosca.datatypes.model.PropertyType;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.datatypes.model.TopologyTemplate;
 import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
 import org.openecomp.sdc.generator.core.utils.GeneratorUtils;
 import org.openecomp.sdc.generator.datatypes.tosca.MultiFlavorVfcImage;
@@ -27,7 +40,6 @@ import org.openecomp.sdc.generator.util.GeneratorConstants;
 import org.openecomp.sdc.tosca.datatypes.ToscaNodeType;
 import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 import org.openecomp.sdc.tosca.services.DataModelUtil;
-import org.openecomp.sdc.tosca.services.ToscaAnalyzerService;
 import org.openecomp.sdc.tosca.services.ToscaConstants;
 import org.openecomp.sdc.tosca.services.ToscaUtil;
 import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl;
@@ -36,8 +48,6 @@ import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypes
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.NetworkType;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic;
 
-import java.util.*;
-
 /**
  * The type Manual vsp tosca generator.
  */
@@ -57,7 +67,6 @@ public class ManualVspToscaGenerationService {
    */
   public ToscaServiceModel createManualVspToscaServiceModel(VspModelInfo vspModelInfo) {
     ToscaServiceModel toscaServiceModel = new ToscaServiceModel();
-    ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl();
     Map<String, ServiceTemplate> serviceTemplates = new HashMap<>(GlobalTypesGenerator
         .getGlobalTypesServiceTemplate(OnboardingTypesEnum.MANUAL));
     toscaServiceModel.setServiceTemplates(serviceTemplates);
@@ -74,7 +83,6 @@ public class ManualVspToscaGenerationService {
 
   private void createToscaFromVspData(VspModelInfo vspModelInfo,
                                         ToscaServiceModel toscaServiceModel) {
-    List<ServiceTemplate> serviceTemplates = new ArrayList<>();
     //Only one component supported
     Optional<String> componentName = getComponentNameFromVspModel(vspModelInfo);
     if (componentName.isPresent()) {
@@ -198,7 +206,6 @@ public class ManualVspToscaGenerationService {
         .GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME));
     globalSubstitutionTypeImportMap.put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
         globalSubstitutionTypeImport);
-    Map<String, Import> globalImports = new HashMap<>();
     List<Map<String, Import>> manualVspGlobalTypesImportList = GlobalTypesGenerator
         .getManualVspGlobalTypesImportList();
     manualVspGlobalTypesImportList.add(globalSubstitutionTypeImportMap);
@@ -211,10 +218,8 @@ public class ManualVspToscaGenerationService {
                                                             ToscaServiceModel toscaServiceModel) {
     ServiceTemplate substitutionServiceTemplate =
         createInitSubstitutionServiceTemplate(serviceTemplateName);
-    createSubstitutionServiceTemplateComponents(substitutionServiceTemplate, vspModelInfo,
-        toscaServiceModel);
-    createSubstitutionServiceTemplateNics(substitutionServiceTemplate, vspModelInfo,
-        toscaServiceModel);
+    createSubstitutionServiceTemplateComponents(substitutionServiceTemplate, vspModelInfo);
+    createSubstitutionServiceTemplateNics(substitutionServiceTemplate, vspModelInfo);
     handleSubstitutionMapping(substitutionServiceTemplate, toscaServiceModel,
         substitutionNodeTypeId, serviceTemplateName);
     return substitutionServiceTemplate;
@@ -222,12 +227,10 @@ public class ManualVspToscaGenerationService {
 
   private void createSubstitutionServiceTemplateComponents(ServiceTemplate
                                                                substitutionServiceTemplate,
-                                                           VspModelInfo vspModelInfo,
-                                                           ToscaServiceModel toscaServiceModel) {
+                                                           VspModelInfo vspModelInfo) {
     Map<String, String> components = vspModelInfo.getComponents();
     if (MapUtils.isNotEmpty(components)) {
-      for (String componentId : components.keySet()) {
-        String componentName = components.get(componentId);
+      for (String componentName : components.values()) {
         String localNodeTypeId =
             createComponentDefinitionNodeTemplate(substitutionServiceTemplate, componentName);
         createLocalNodeType(substitutionServiceTemplate, localNodeTypeId);
@@ -236,8 +239,7 @@ public class ManualVspToscaGenerationService {
   }
 
   private void createSubstitutionServiceTemplateNics(ServiceTemplate substitutionServiceTemplate,
-                                                     VspModelInfo vspModelInfo,
-                                                     ToscaServiceModel toscaServiceModel) {
+                                                     VspModelInfo vspModelInfo) {
     Map<String, List<Nic>> nics = vspModelInfo.getNics();
     if (MapUtils.isNotEmpty(nics)) {
       for (Map.Entry<String, List<Nic>> entry : nics.entrySet()) {
@@ -347,12 +349,11 @@ public class ManualVspToscaGenerationService {
         .createInitSubstitutionNodeType(substitutionServiceTemplate,
             ToscaNodeType.MULTIFLAVOR_VFC_NODE_TYPE);
     substitutionNodeType.setProperties(
-        getManualVspSubstitutionNodeTypeProperties(substitutionNodeType, componentName));
+        getManualVspSubstitutionNodeTypeProperties(componentName));
     return substitutionNodeType;
   }
 
-  private Map<String, PropertyDefinition> getManualVspSubstitutionNodeTypeProperties(
-      NodeType substitutionNodeType, String componentName) {
+  private Map<String, PropertyDefinition> getManualVspSubstitutionNodeTypeProperties(String componentName) {
     //Create num_cpus property
     PropertyDefinition numCpus = new PropertyDefinition();
     numCpus.setType(PropertyType.INTEGER.getDisplayName());
@@ -377,10 +378,6 @@ public class ManualVspToscaGenerationService {
     return manualVspProperties;
   }
 
-  private String getSubstitutionNodeTypeId(String componentName) {
-    return ToscaNodeType.MULTIDEPLOYMENTFLAVOR_NODE_TYPE + "." + componentName;
-  }
-
   /**
    * Fetch global substitution service template service template.
    *
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
index ae289f9178..5fb2953b6a 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.onap.sdc.tosca.services.YamlUtil;
@@ -39,7 +38,6 @@ import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
 import org.openecomp.sdc.heat.datatypes.model.Environment;
 import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
 import org.openecomp.sdc.heat.datatypes.model.HeatPseudoParameters;
-import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
 import org.openecomp.sdc.heat.datatypes.model.Output;
 import org.openecomp.sdc.heat.datatypes.model.Parameter;
 import org.openecomp.sdc.heat.datatypes.model.Resource;
@@ -282,7 +280,7 @@ public class HeatValidator implements Validator {
                                              globalContext) {
     for (Output output : outputMap.values()) {
       Object outputValue = output.getValue();
-      if (outputValue != null && outputValue instanceof Map) {
+      if (outputValue instanceof Map) {
         Map<String, Object> outputValueMap = (Map<String, Object>) outputValue;
         List<String> getAttrValue =
             (List<String>) outputValueMap.get(
@@ -423,7 +421,7 @@ public class HeatValidator implements Validator {
                                                                     globalContext) {
     Map<String, Parameter> parametersMap = heatOrchestrationTemplate.getParameters();
 
-    if (parametersMap != null && MapUtils.isNotEmpty(parametersMap)) {
+    if (MapUtils.isNotEmpty(parametersMap)) {
       for (Map.Entry<String, Parameter> parameterEntry : parametersMap.entrySet()) {
           validateParameterEntryForParameterDefaultTypeAlignWithType(parameterEntry,
                         fileName, globalContext);
@@ -629,36 +627,4 @@ public class HeatValidator implements Validator {
                "The heat file does not contain any resources"));
     }
   }
-
-
-  @SuppressWarnings("unchecked")
-  private void getSecurityGroupsReferencedResourcesFromOutputs(
-      Set<String> securityGroupsNamesFromOutputsMap, Map<String, Output> outputMap,
-      Map<String, Resource> resourceMap) {
-    if (MapUtils.isNotEmpty(outputMap)) {
-      for (Map.Entry<String, Output> outputEntry : outputMap.entrySet()) {
-
-          validateOutputEntryForGetSecurityGroupsReferencedResourcesFromOutputs(outputEntry,
-                  resourceMap, securityGroupsNamesFromOutputsMap);
-
-      }
-    }
-  }
-    private void validateOutputEntryForGetSecurityGroupsReferencedResourcesFromOutputs(
-            Map.Entry<String, Output> outputEntry,
-            Map<String, Resource> resourceMap, Set<String> securityGroupsNamesFromOutputsMap){
-        Object outputValue = outputEntry.getValue().getValue();
-        if (Objects.nonNull(outputValue) && outputValue instanceof Map) {
-            String resourceName = (String) ((Map) outputValue)
-                    .get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
-            if (Objects.nonNull(resourceName)) {
-                Resource resource = resourceMap.get(resourceName);
-                if (Objects.nonNull(resource) && resource.getType().equals(
-                        HeatResourcesTypes.NEUTRON_SECURITY_GROUP_RESOURCE_TYPE.getHeatResource())) {
-                    securityGroupsNamesFromOutputsMap.add(outputEntry.getKey());
-                }
-            }
-        }
-    }
-
 }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NeutronPortResourceValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NeutronPortResourceValidator.java
index b11a287a41..a21173a6b2 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NeutronPortResourceValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NeutronPortResourceValidator.java
@@ -17,12 +17,8 @@
 package org.openecomp.sdc.validation.impl.validators.heatresource;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.openecomp.core.validation.ErrorMessageCode;
@@ -32,8 +28,6 @@ import org.openecomp.sdc.common.errors.Messages;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
 import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
 import org.openecomp.sdc.heat.datatypes.model.Resource;
-import org.openecomp.sdc.heat.datatypes.model.ResourceReferenceFunctions;
-import org.openecomp.sdc.heat.services.HeatStructureUtil;
 import org.openecomp.sdc.validation.ResourceValidator;
 import org.openecomp.sdc.validation.ValidationContext;
 import org.openecomp.sdc.validation.type.HeatResourceValidationContext;
@@ -125,43 +119,4 @@ public class NeutronPortResourceValidator implements ResourceValidator {
     return CollectionUtils.isNotEmpty(pointingNovaServers)
             && pointingNovaServers.size() > 1;
   }
-
-  @SuppressWarnings("unchecked")
-  private static void validateAllSecurityGroupsAreUsed(String filename,
-                                                       Map.Entry<String, Resource> resourceEntry,
-                                                       List<String> securityGroupResourceNameList,
-                                                       GlobalValidationContext globalContext) {
-    Map<String, Object> propertiesMap = resourceEntry.getValue().getProperties();
-
-    if (MapUtils.isEmpty(propertiesMap)) {
-      return;
-    }
-
-    Object securityGroupsValue = propertiesMap.get("security_groups");
-
-    if (Objects.isNull(securityGroupsValue)) {
-      return;
-    }
-
-    if (securityGroupsValue instanceof List) {
-      List<Object> securityGroupsListFromCurrResource =
-              (List<Object>) propertiesMap.get("security_groups");
-      for (Object securityGroup : securityGroupsListFromCurrResource) {
-        removeSecurityGroupNamesFromListByGivenFunction(filename,
-                ResourceReferenceFunctions.GET_RESOURCE.getFunction(), securityGroup,
-                securityGroupResourceNameList, globalContext);
-      }
-    }
-  }
-
-  private static void removeSecurityGroupNamesFromListByGivenFunction(String filename,
-                                                                      String functionName,
-                                                                      Object securityGroup,
-                                                                      Collection<String>
-                                                                              securityGroupResourceNameList,
-                                                                      GlobalValidationContext globalContext) {
-    Set<String> securityGroupsNamesFromFunction = HeatStructureUtil
-            .getReferencedValuesByFunctionName(filename, functionName, securityGroup, globalContext);
-    securityGroupsNamesFromFunction.forEach(securityGroupResourceNameList::remove);
-  }
 }