Fix 'Wrong Inputs creation on (Add Service)'

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Iadfe03718066dafe5a438020c488f5b242fe6a41
Issue-ID: SDC-4097

5 files changed, 111 insertions, 77 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
index bca901ee8b..763552fcf3 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
@@ -213,7 +213,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         }
         component = getComponentEither.left().value();
         Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
-        if (!op.isPresent()) {
+        if (op.isEmpty()) {
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
             log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, parentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
@@ -369,7 +369,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         }
         component = getComponentEither.left().value();
         Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
-        if (!op.isPresent()) {
+        if (op.isEmpty()) {
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
             log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, componentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
@@ -664,7 +664,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
                 filter(input -> input.getUniqueId().equals(inputId)).
             // Get the input
                 findAny();
-        if (!optionalInput.isPresent()) {
+        if (optionalInput.isEmpty()) {
             throw new ByActionStatusComponentException(ActionStatus.INPUT_IS_NOT_CHILD_OF_COMPONENT, inputId, componentId);
         }
         InputDefinition inputForDelete = optionalInput.get();
@@ -770,7 +770,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
             }
             Component component = getComponentEither.left().value();
             Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
-            if (!op.isPresent()) {
+            if (op.isEmpty()) {
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
                 log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, componentId, actionStatus);
                 return Either.right(componentsUtils.getResponseFormat(actionStatus));
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
index 2cccc31ded..577d1f5e32 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
@@ -109,8 +109,10 @@ import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstInputsMap;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.ComponentInstanceInterface;
+import org.openecomp.sdc.be.model.ComponentInstancePropInput;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.DistributionStatusEnum;
@@ -189,13 +191,12 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     private final ServiceInstantiationTypeValidator serviceInstantiationTypeValidator;
     private final ServiceCategoryValidator serviceCategoryValidator;
     private final ServiceValidator serviceValidator;
-    private final PolicyBusinessLogic policyBusinessLogic;
-    private final GroupBusinessLogic groupBusinessLogic;
     private ForwardingPathOperation forwardingPathOperation;
     private AuditCassandraDao auditCassandraDao;
     private ServiceTypeValidator serviceTypeValidator;
     private List<ServiceCreationPlugin> serviceCreationPluginList;
     private ServiceFunctionValidator serviceFunctionValidator;
+    private final InputsBusinessLogic inputsBusinessLogic;
 
     public ServiceBusinessLogic(IElementOperation elementDao, IGroupOperation groupOperation, IGroupInstanceOperation groupInstanceOperation,
                                 IGroupTypeOperation groupTypeOperation, GroupBusinessLogic groupBusinessLogic, InterfaceOperation interfaceOperation,
@@ -210,7 +211,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
                                 final ServiceRoleValidator serviceRoleValidator,
                                 final ServiceInstantiationTypeValidator serviceInstantiationTypeValidator,
                                 final ServiceCategoryValidator serviceCategoryValidator, final ServiceValidator serviceValidator,
-                                final PolicyBusinessLogic policyBusinessLogic) {
+                                final InputsBusinessLogic inputsBusinessLogic) {
         super(elementDao, groupOperation, groupInstanceOperation, groupTypeOperation, groupBusinessLogic, interfaceOperation,
             interfaceLifecycleTypeOperation, artifactsBusinessLogic, artifactToscaOperation, componentContactIdValidator, componentNameValidator,
             componentTagsValidator, componentValidator, componentIconValidator, componentProjectCodeValidator, componentDescriptionValidator);
@@ -224,8 +225,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         this.serviceInstantiationTypeValidator = serviceInstantiationTypeValidator;
         this.serviceCategoryValidator = serviceCategoryValidator;
         this.serviceValidator = serviceValidator;
-        this.policyBusinessLogic = policyBusinessLogic;
-        this.groupBusinessLogic = groupBusinessLogic;
+        this.inputsBusinessLogic = inputsBusinessLogic;
     }
 
     @Autowired
@@ -311,7 +311,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         }
         Optional<ComponentInstance> serviceInstanceCandidate = componentInstances.stream()
             .filter(instance -> instance.getUniqueId().equals(serviceInstanceId)).findAny();
-        if (!serviceInstanceCandidate.isPresent()) {
+        if (serviceInstanceCandidate.isEmpty()) {
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.INTERFACE_OPERATION_NOT_FOUND, serviceInstanceId));
         }
         Map<String, List<ComponentInstanceInterface>> componentInstancesInterfaces = parentService.getComponentInstancesInterfaces();
@@ -324,7 +324,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         }
         ComponentInstance serviceInstance = serviceInstanceCandidate.get();
         Optional<InterfaceDefinition> interfaceCandidate = InterfaceOperationUtils.getInterfaceDefinitionFromOperationId(interfaces, operationId);
-        if (!interfaceCandidate.isPresent()) {
+        if (interfaceCandidate.isEmpty()) {
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.INTERFACE_OPERATION_NOT_FOUND, serviceInstanceId));
         }
         InterfaceDefinition interfaceDefinition = interfaceCandidate.get();
@@ -336,7 +336,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         Either<Operation, ResponseFormat> operationEither = Either.left(operation);
         ListDataDefinition<OperationInputDefinition> inputs = operation.getInputs();
         Optional<OperationInputDefinition> inputCandidate = getOperationInputByInputId(serviceConsumptionData, inputs);
-        if (!inputCandidate.isPresent()) {
+        if (inputCandidate.isEmpty()) {
             return Either.right(new ResponseFormat(HttpStatus.NOT_FOUND.value()));
         }
         OperationInputDefinition operationInputDefinition = inputCandidate.get();
@@ -419,7 +419,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
                     .getListToscaDataDefinition();
             } else {
                 Optional<ComponentInstance> getComponentInstance = containerService.getComponentInstanceById(source);
-                if (!getComponentInstance.isPresent()) {
+                if (getComponentInstance.isEmpty()) {
                     return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, source));
                 }
                 ComponentInstance componentInstance = getComponentInstance.get();
@@ -692,7 +692,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     private Either<Service, ResponseFormat> createServiceByDao(final Service service, final User user) {
         log.debug("send service {} to dao for create", service.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
-        Either<Boolean, ResponseFormat> lockResult = lockComponentByName(service.getSystemName(), service, "Create Service");
+        final Either<Boolean, ResponseFormat> lockResult = lockComponentByName(service.getSystemName(), service, "Create Service");
         if (lockResult.isRight()) {
             ResponseFormat responseFormat = lockResult.right().value();
             componentsUtils.auditComponentAdmin(responseFormat, user, service, AuditingActionEnum.CREATE_RESOURCE, ComponentTypeEnum.SERVICE);
@@ -710,25 +710,64 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
                 generateAndAddInputsFromGenericTypeProperties(service, genericType);
             }
             beforeCreate(service);
-            Either<Service, StorageOperationStatus> dataModelResponse = toscaOperationFacade.createToscaComponent(service);
-            if (dataModelResponse.isLeft()) {
-                log.debug("Service '{}' created successfully", service.getName());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.CREATED);
+            final Either<Service, StorageOperationStatus> dataModelResponse = toscaOperationFacade.createToscaComponent(service);
+            if (dataModelResponse.isRight()) {
+                ResponseFormat responseFormat = componentsUtils
+                    .getResponseFormatByComponent(componentsUtils.convertFromStorageResponse(dataModelResponse.right().value()), service,
+                        ComponentTypeEnum.SERVICE);
+                log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
                 componentsUtils.auditComponentAdmin(responseFormat, user, service, AuditingActionEnum.CREATE_RESOURCE, ComponentTypeEnum.SERVICE);
-                ASDCKpiApi.countCreatedServicesKPI();
-                return Either.left(dataModelResponse.left().value());
+                return Either.right(responseFormat);
             }
-            ResponseFormat responseFormat = componentsUtils
-                .getResponseFormatByComponent(componentsUtils.convertFromStorageResponse(dataModelResponse.right().value()), service,
-                    ComponentTypeEnum.SERVICE);
-            log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
-            componentsUtils.auditComponentAdmin(responseFormat, user, service, AuditingActionEnum.CREATE_RESOURCE, ComponentTypeEnum.SERVICE);
-            return Either.right(responseFormat);
+            final Service createdService = dataModelResponse.left().value();
+            if (createdService.isSubstituteCandidate() || genericTypeBusinessLogic.hasMandatorySubstitutionType(createdService)) {
+                updateInputs(createdService);
+            }
+            log.debug("Service '{}' created successfully", createdService.getName());
+            final ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.CREATED);
+            componentsUtils.auditComponentAdmin(responseFormat, user, createdService, AuditingActionEnum.CREATE_RESOURCE, ComponentTypeEnum.SERVICE);
+            ASDCKpiApi.countCreatedServicesKPI();
+            return Either.left(createdService);
         } finally {
             graphLockOperation.unlockComponentByName(service.getSystemName(), service.getUniqueId(), NodeTypeEnum.Service);
         }
     }
 
+    private void updateInputs(final Service service) {
+        final List<InputDefinition> genericTypeInputs = service.getInputs();
+        final Either<List<InputDefinition>, ResponseFormat> inputs = inputsBusinessLogic.getInputs(service.getCreatorUserId(), service.getUniqueId());
+        if (inputs.isRight() || CollectionUtils.isEmpty(inputs.left().value())) {
+            log.warn("Failed to declare Generic Type Properties as Inputs");
+            service.setInputs(null);
+            return;
+        }
+        inputs.left().value().forEach(
+            inputDefinition -> inputsBusinessLogic.deleteInput(service.getUniqueId(), service.getCreatorUserId(), inputDefinition.getUniqueId()));
+
+        service.setInputs(null);
+        if (CollectionUtils.isNotEmpty(genericTypeInputs)) {
+            // From SELF
+            final ComponentInstInputsMap componentInstInputsMap = new ComponentInstInputsMap();
+            final List<ComponentInstancePropInput> componentInstancePropInputs = genericTypeInputs.stream()
+                .map(prop -> {
+                        prop.setInstanceUniqueId(service.getUniqueId());
+                        prop.setParentUniqueId(service.getUniqueId());
+                        return new ComponentInstancePropInput(new ComponentInstanceProperty(prop));
+                    }
+                ).collect(Collectors.toList());
+            componentInstInputsMap.setServiceProperties(Collections.singletonMap(service.getUniqueId(), componentInstancePropInputs));
+
+            final Either<List<InputDefinition>, ResponseFormat> listResponseFormatEither = inputsBusinessLogic.declareProperties(
+                service.getCreatorUserId(), service.getUniqueId(), ComponentTypeEnum.SERVICE, componentInstInputsMap);
+            if (listResponseFormatEither.isRight()) {
+                log.warn("Failed to declare Generic Type Properties as Inputs");
+                service.setInputs(null);
+                return;
+            }
+            service.setInputs(listResponseFormatEither.left().value());
+        }
+    }
+
     private void beforeCreate(final Service service) {
         if (CollectionUtils.isEmpty(serviceCreationPluginList)) {
             return;
@@ -745,10 +784,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     @SuppressWarnings("unchecked")
     private void createServiceApiArtifactsData(Service service, User user) {
         // create mandatory artifacts
-
-        // TODO it must be removed after that artifact uniqueId creation will be
-
-        // moved to ArtifactOperation
+        // TODO it must be removed after that artifact uniqueId creation will be moved to ArtifactOperation
         String serviceUniqueId = service.getUniqueId();
         Map<String, ArtifactDefinition> artifactMap = service.getServiceApiArtifacts();
         if (artifactMap == null) {
@@ -1630,13 +1666,13 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             BeEcompErrorManager.getInstance()
                 .logBeComponentMissingError("markDistributionAsDeployed", ComponentTypeEnum.SERVICE.getValue(), serviceId);
             log.debug("service {} not found", serviceId);
-            ResponseFormat responseFormat = auditDeployError(did, user, auditAction, null,
+            ResponseFormat responseFormat = auditDeployError(did, user, null,
                 componentsUtils.convertFromStorageResponse(getServiceResponse.right().value(), ComponentTypeEnum.SERVICE), "");
             return Either.right(responseFormat);
         }
         Service service = getServiceResponse.left().value();
         user = validateRoleForDeploy(did, user, auditAction, service);
-        return checkDistributionAndDeploy(did, user, auditAction, service);
+        return checkDistributionAndDeploy(did, user, service);
     }
 
     public Either<Service, ResponseFormat> generateVfModuleArtifacts(Service service, User modifier, boolean shouldLock, boolean inTransaction) {
@@ -1710,13 +1746,13 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return null;
     }
 
-    private synchronized Either<Service, ResponseFormat> checkDistributionAndDeploy(String distributionId, User user, AuditingActionEnum auditAction,
+    private synchronized Either<Service, ResponseFormat> checkDistributionAndDeploy(String distributionId, User user,
                                                                                     Service service) {
         boolean isDeployed = isDistributionDeployed(distributionId);
         if (isDeployed) {
             return Either.left(service);
         }
-        Either<Boolean, ResponseFormat> distributionSuccess = checkDistributionSuccess(distributionId, user, auditAction, service);
+        Either<Boolean, ResponseFormat> distributionSuccess = checkDistributionSuccess(distributionId, user, service);
         if (distributionSuccess.isRight()) {
             return Either.right(distributionSuccess.right().value());
         }
@@ -1739,20 +1775,20 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return isDeployed;
     }
 
-    protected Either<Boolean, ResponseFormat> checkDistributionSuccess(String did, User user, AuditingActionEnum auditAction, Service service) {
+    protected Either<Boolean, ResponseFormat> checkDistributionSuccess(String did, User user, Service service) {
         log.trace("checkDistributionSuccess");
         // get all "DRequest" records for this distribution
         Either<List<ResourceAdminEvent>, ActionStatus> distRequestsResponse = auditCassandraDao
             .getDistributionRequest(did, AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST.getName());
         if (distRequestsResponse.isRight()) {
-            ResponseFormat error = auditDeployError(did, user, auditAction, service, distRequestsResponse.right().value());
+            ResponseFormat error = auditDeployError(did, user, service, distRequestsResponse.right().value());
             return Either.right(error);
         }
         List<ResourceAdminEvent> distributionRequests = distRequestsResponse.left().value();
         if (distributionRequests.isEmpty()) {
             BeEcompErrorManager.getInstance().logBeDistributionMissingError("markDistributionAsDeployed", did);
             log.info("distribution {} is not found", did);
-            ResponseFormat error = auditDeployError(did, user, auditAction, service, ActionStatus.DISTRIBUTION_REQUESTED_NOT_FOUND);
+            ResponseFormat error = auditDeployError(did, user, service, ActionStatus.DISTRIBUTION_REQUESTED_NOT_FOUND);
             return Either.right(error);
         }
         boolean isRequestSucceeded = false;
@@ -1767,7 +1803,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         Either<List<DistributionNotificationEvent>, ActionStatus> distNotificationsResponse = auditCassandraDao
             .getDistributionNotify(did, AuditingActionEnum.DISTRIBUTION_NOTIFY.getName());
         if (distNotificationsResponse.isRight()) {
-            ResponseFormat error = auditDeployError(did, user, auditAction, service, distNotificationsResponse.right().value());
+            ResponseFormat error = auditDeployError(did, user, service, distNotificationsResponse.right().value());
             return Either.right(error);
         }
         List<DistributionNotificationEvent> distributionNotifications = distNotificationsResponse.left().value();
@@ -1783,13 +1819,13 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         if (!(isRequestSucceeded && isNotificationsSucceeded)) {
             log.info("distribution {} has failed", did);
             ResponseFormat error = componentsUtils.getResponseFormat(ActionStatus.DISTRIBUTION_REQUESTED_FAILED, did);
-            auditDeployError(did, user, auditAction, service, ActionStatus.DISTRIBUTION_REQUESTED_FAILED, did);
+            auditDeployError(did, user, service, ActionStatus.DISTRIBUTION_REQUESTED_FAILED, did);
             return Either.right(error);
         }
         return Either.left(true);
     }
 
-    private ResponseFormat auditDeployError(String did, User user, AuditingActionEnum auditAction, Service service, ActionStatus status,
+    private ResponseFormat auditDeployError(String did, User user, Service service, ActionStatus status,
                                             String... params) {
         ResponseFormat error = componentsUtils.getResponseFormat(status, params);
         String message = "";
@@ -1817,7 +1853,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             validateUserRole(user, service, roles, auditAction, null);
         } catch (ByActionStatusComponentException e) {
             log.info("role {} is not allowed to perform this action", user.getRole());
-            auditDeployError(did, user, auditAction, service, e.getActionStatus());
+            auditDeployError(did, user, service, e.getActionStatus());
             throw e;
         }
         return user;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDeclarator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDeclarator.java
index 0412516390..07d5ba0f24 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDeclarator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDeclarator.java
@@ -126,7 +126,7 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
 
     private Either<List<PolicyDefinition>, StorageOperationStatus> declarePropertiesAsPolicies(Component component, PROPERTYOWNER propertiesOwner,
                                                                                                List<ComponentInstancePropInput> propsToDeclare) {
-        PropertiesDeclarationData policyProperties = createPoliciesAndOverridePropertiesValues(propertiesOwner.getUniqueId(), propertiesOwner,
+        PropertiesDeclarationData policyProperties = createPoliciesAndOverridePropertiesValues(propertiesOwner.getUniqueId(),
             propsToDeclare);
         return updatePropertiesValues(component, propertiesOwner.getUniqueId(), policyProperties.getPropertiesToUpdate()).left()
             .map(updatePropsRes -> policyProperties.getPoliciesToCreate());
@@ -144,8 +144,7 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
             .map(updatePropsRes -> inputsProperties.getInputsToCreate());
     }
 
-    private PropertiesDeclarationData createPoliciesAndOverridePropertiesValues(String componentId, PROPERTYOWNER propertiesOwner,
-                                                                                List<ComponentInstancePropInput> propsToDeclare) {
+    private PropertiesDeclarationData createPoliciesAndOverridePropertiesValues(String componentId, List<ComponentInstancePropInput> propsToDeclare) {
         List<PROPERTYTYPE> declaredProperties = new ArrayList<>();
         List<PolicyDefinition> policies = new ArrayList<>();
         propsToDeclare.forEach(property -> policies.add(declarePropertyPolicy(componentId, declaredProperties, property)));
@@ -250,7 +249,7 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
         if (propertyCapability.isPresent()) {
             String capName = propertyCapability.get().getName();
             if (capName.contains(".")) {
-                capName = capName.replaceAll("\\.", UNDERSCORE);
+                capName = capName.replace(".", UNDERSCORE);
             }
             generatedInputPrefix =
                 generatedInputPrefix == null || generatedInputPrefix.isEmpty() ? capName : generatedInputPrefix + UNDERSCORE + capName;
@@ -315,12 +314,12 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
         input.setInputPath(propertiesName);
         input.setInstanceUniqueId(propertiesOwner.getUniqueId());
         input.setPropertyId(propInput.getUniqueId());
-        if (Objects.isNull(input.getSubPropertyInputPath()) || (Objects.nonNull(propertiesName) && input.getSubPropertyInputPath()
+        if (Objects.isNull(input.getSubPropertyInputPath()) || (StringUtils.isNotEmpty(propertiesName) && input.getSubPropertyInputPath()
             .substring(input.getSubPropertyInputPath().lastIndexOf('#')).equals(propertiesName.substring(propertiesName.lastIndexOf('#'))))) {
             input.setParentPropertyType(propInput.getType());
             input.setSubPropertyInputPath(propertiesName);
         }
-        changePropertyValueToGetInputValue(inputName, parsedPropNames, input, prop, complexProperty);
+        changePropertyValueToGetInputValue(parsedPropNames, input, prop, complexProperty);
         if (prop instanceof IComponentInstanceConnectedElement) {
             ((IComponentInstanceConnectedElement) prop).setComponentInstanceId(propertiesOwner.getUniqueId());
             ((IComponentInstanceConnectedElement) prop).setComponentInstanceName(propertiesOwner.getName());
@@ -328,42 +327,43 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
         return input;
     }
 
-    private void changePropertyValueToGetInputValue(String inputName, String[] parsedPropNames, InputDefinition input, PropertyDataDefinition prop,
+    private void changePropertyValueToGetInputValue(String[] parsedPropNames, InputDefinition input, PropertyDataDefinition prop,
                                                     boolean complexProperty) {
         JSONObject jsonObject = new JSONObject();
-        String value = prop.getValue();
+        final String value = prop.getValue();
+        final String inputName = input.getName();
         if (value == null || value.isEmpty()) {
             if (complexProperty) {
                 jsonObject = createJSONValueForProperty(parsedPropNames.length - 1, parsedPropNames, jsonObject, inputName);
                 prop.setValue(jsonObject.toJSONString());
             } else {
-                jsonObject.put(GET_INPUT, input.getName());
+                jsonObject.put(GET_INPUT, inputName);
                 prop.setValue(jsonObject.toJSONString());
             }
         } else {
-            Object objValue = new Yaml().load(value);
+            final Object objValue = new Yaml().load(value);
             if (objValue instanceof Map || objValue instanceof List) {
                 if (!complexProperty) {
-                    jsonObject.put(GET_INPUT, input.getName());
+                    jsonObject.put(GET_INPUT, inputName);
                     prop.setValue(jsonObject.toJSONString());
                 } else {
-                    Map<String, Object> mappedToscaTemplate = (Map<String, Object>) objValue;
+                    final Map<String, Object> mappedToscaTemplate = (Map<String, Object>) objValue;
                     createInputValue(mappedToscaTemplate, 1, parsedPropNames, inputName);
-                    String json = gson.toJson(mappedToscaTemplate);
+                    final String json = gson.toJson(mappedToscaTemplate);
                     prop.setValue(json);
                 }
             } else {
-                jsonObject.put(GET_INPUT, input.getName());
+                jsonObject.put(GET_INPUT, inputName);
                 prop.setValue(jsonObject.toJSONString());
             }
         }
         if (CollectionUtils.isEmpty(prop.getGetInputValues())) {
             prop.setGetInputValues(new ArrayList<>());
         }
-        List<GetInputValueDataDefinition> getInputValues = prop.getGetInputValues();
-        GetInputValueDataDefinition getInputValueDataDefinition = new GetInputValueDataDefinition();
+        final List<GetInputValueDataDefinition> getInputValues = prop.getGetInputValues();
+        final GetInputValueDataDefinition getInputValueDataDefinition = new GetInputValueDataDefinition();
         getInputValueDataDefinition.setInputId(input.getUniqueId());
-        getInputValueDataDefinition.setInputName(input.getName());
+        getInputValueDataDefinition.setInputName(inputName);
         getInputValues.add(getInputValueDataDefinition);
     }
 
@@ -460,8 +460,7 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
             if (result.isLeft()) {
                 modifiedMappedToscaTemplate = (Map) result.left().value();
             } else {
-                log.warn("Map cleanup failed -> " + result.right().value()
-                    .toString());    //continue, don't break operation
+                log.warn("Map cleanup failed -> {}", result.right().value());    //continue, don't break operation
             }
             value = gson.toJson(modifiedMappedToscaTemplate);
         }
@@ -546,11 +545,10 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
         boolean isEmpty = true;
         if (element != null) {
             if (element instanceof Map) {
-                if (MapUtils.isEmpty((Map) element)) {
-                    isEmpty = true;
-                } else {
-                    for (Object key : ((Map) (element)).keySet()) {
-                        Object value = ((Map) (element)).get(key);
+                final Map map = (Map) element;
+                if (MapUtils.isNotEmpty(map)) {
+                    for (final Object key : map.keySet()) {
+                        final Object value = map.get(key);
                         isEmpty &= isEmptyNestedMap(value);
                     }
                 }
@@ -560,7 +558,7 @@ public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends Properties
         }
         return isEmpty;
     }
-    //@returns true iff map nested maps are all empty
+    //@returns true if map nested maps are all empty
 
     private class PropertiesDeclarationData {
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index 9591e6b1a7..25d0287d54 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -800,11 +800,11 @@ public class ToscaExportHandler {
         if (CollectionUtils.isNotEmpty(component.getProperties())) {
             List<PropertyDefinition> properties = component.getProperties();
             Map<String, ToscaProperty> convertedProperties = properties.stream()
-                .map(propertyDefinition -> resolvePropertyValueFromInput(propertyDefinition, component.getInputs())).collect(Collectors
-                    .toMap(PropertyDataDefinition::getName,
-                        property -> propertyConvertor.convertProperty(dataTypes, property, PropertyConvertor.PropertyType.PROPERTY)));
+                .map(propertyDefinition -> resolvePropertyValueFromInput(propertyDefinition, component.getInputs()))
+                .collect(Collectors.toMap(PropertyDataDefinition::getName,
+                    property -> propertyConvertor.convertProperty(dataTypes, property, PropertyConvertor.PropertyType.PROPERTY)));
             // merge component properties and inputs properties
-            mergedProperties.putAll(convertedProperties);
+            convertedProperties.forEach((k, v) -> mergedProperties.putIfAbsent(k, v));
         }
         if (MapUtils.isNotEmpty(mergedProperties)) {
             toscaNodeType.setProperties(mergedProperties);
@@ -938,7 +938,7 @@ public class ToscaExportHandler {
             nodeTemplate.setType(componentInstance.getToscaComponentName());
             nodeTemplate.setDirectives(componentInstance.getDirectives());
             NodeFilter nodeFilter = convertToNodeTemplateNodeFilterComponent(componentInstance.getNodeFilter());
-            if(nodeFilter != null && nodeFilter.hasData()){
+            if (nodeFilter != null && nodeFilter.hasData()) {
                 nodeTemplate.setNode_filter(nodeFilter);
             }
             final Either<Component, Boolean> originComponentRes = capabilityRequirementConverter
@@ -1767,7 +1767,7 @@ public class ToscaExportHandler {
     }
 
     private Map<String, ToscaProperty> convertInputsToProperties(Map<String, DataTypeDefinition> dataTypes, List<InputDefinition> componentInputs,
-                                                             String componentUniqueId) {
+                                                                 String componentUniqueId) {
         if (CollectionUtils.isEmpty(componentInputs)) {
             return new HashMap<>();
         }
@@ -1788,6 +1788,10 @@ public class ToscaExportHandler {
             .ofNullable(interfacesOperationsConverter.getInterfacesMap(proxyComponent, null, proxyComponentInterfaces, dataTypes, false, false));
     }
 
+    private Configuration getConfiguration() {
+        return ConfigurationManager.getConfigurationManager().getConfiguration();
+    }
+
     private static class CustomRepresenter extends Representer {
 
         CustomRepresenter() {
@@ -1943,8 +1947,4 @@ public class ToscaExportHandler {
         }
     }
 
-    private Configuration getConfiguration() {
-        return ConfigurationManager.getConfigurationManager().getConfiguration();
-    }
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java
index 55de9e5028..b94a32291e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java
@@ -56,7 +56,7 @@ public class InputConverter {
      *              description
      *              list of properties */
     public Map<String, ToscaProperty> convertInputs(List<InputDefinition> inputDef, Map<String, DataTypeDefinition> dataTypes) {
-        log.debug("convert inputs to to tosca  ");
+        log.debug("convert inputs to tosca");
         Map<String, ToscaProperty> inputs = new HashMap<>();
         if (inputDef != null) {
             inputDef.forEach(i -> {