1 files changed, 20 insertions, 7 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 892da8af9d..a9e7f0b34b 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
@@ -20,12 +20,19 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
-import jline.internal.Log;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.json.simple.JSONObject;
@@ -50,7 +57,6 @@ import org.openecomp.sdc.be.model.IComponentInstanceConnectedElement;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.User;
-
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
@@ -65,6 +71,7 @@ import org.yaml.snakeyaml.Yaml;
 import com.google.gson.Gson;
 
 import fj.data.Either;
+import jline.internal.Log;
 
 @Component("inputsBusinessLogic")
 public class InputsBusinessLogic extends BaseBusinessLogic {
@@ -311,6 +318,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 			}
 
 			currentInput.setDefaultValue(newValue);
+			currentInput.setOwnerId(userId);
 
 			Either<InputDefinition, StorageOperationStatus> status = toscaOperationFacade.updateInputOfComponent(component, currentInput);
 
@@ -473,6 +481,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
 			}
 
+			assignOwnerIdToInputs(userId, inputsToCreate);
 
 			Either<List<InputDefinition>, StorageOperationStatus> assotiateInputsEither = toscaOperationFacade.addInputsToComponent(inputsToCreate, component.getUniqueId());
 			if(assotiateInputsEither.isRight()){
@@ -524,6 +533,10 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
 	}
 
+	private void assignOwnerIdToInputs(String userId, Map<String, InputDefinition> inputsToCreate) {
+		inputsToCreate.values().forEach(inputDefinition -> inputDefinition.setOwnerId(userId));
+	}
+
 	private StorageOperationStatus addInputsToComponent(String componentId, Map<String, InputDefinition> inputsToCreate, Map<String, List<ComponentInstanceInput>> inputsValueToCreateMap,  Map<String, DataTypeDefinition> allDataTypes, List<InputDefinition> resList, int index,
 			String compInstId, String compInstname, org.openecomp.sdc.be.model.Component origComponent, InputDefinition input) {
 		
@@ -642,7 +655,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 				}
 				Map<String, InputDefinition> inputs = inputsDefinitions.stream().collect(Collectors.toMap( o -> o.getName(), o -> o));
 
-				result = createInputsInGraph(inputs, component, user, inTransaction);
+				result = createInputsInGraph(inputs, component);
 			}
 
 			return result;
@@ -669,7 +682,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
 	}
 
-	public Either<List<InputDefinition>, ResponseFormat> createInputsInGraph(Map<String, InputDefinition> inputs, org.openecomp.sdc.be.model.Component component, User user, boolean inTransaction) {
+	public Either<List<InputDefinition>, ResponseFormat> createInputsInGraph(Map<String, InputDefinition> inputs, org.openecomp.sdc.be.model.Component component) {
 
 		List<InputDefinition> resList = inputs.values().stream().collect(Collectors.toList());
 		Either<List<InputDefinition>, ResponseFormat> result = Either.left(resList);
@@ -1212,7 +1225,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 					propInput.setOwnerId(null);
 					propInput.setParentUniqueId(null);
 
-					Either<InputDefinition, StorageOperationStatus> createInputRes = createInputForComponentInstance(component, origComponent,ci, inputsToCreate, propertiesToCreate, inputsValueToCreate, dataTypes, inputName, propInput, isInputValue);
+					Either<InputDefinition, StorageOperationStatus> createInputRes = createInputForComponentInstance(component, ci, inputsToCreate, propertiesToCreate, inputsValueToCreate, inputName, propInput, isInputValue);
 
 					if (createInputRes.isRight()) {
 						log.debug("Failed to create input  of resource instance for id {} error {}", compInstId, createInputRes.right().value());
@@ -1235,7 +1248,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 		return Either.left(resList);
 	}
 
-	private Either<InputDefinition, StorageOperationStatus> createInputForComponentInstance(org.openecomp.sdc.be.model.Component component,org.openecomp.sdc.be.model.Component orignComponent, ComponentInstance ci, Map<String, InputDefinition> inputsToCreate, List<ComponentInstanceProperty> propertiesToCreate, List<ComponentInstanceInput> inputsValueToCreate, Map<String, DataTypeDefinition> dataTypes, String inputName, ComponentInstancePropInput propInput, boolean isInputValue) {
+	private Either<InputDefinition, StorageOperationStatus> createInputForComponentInstance(org.openecomp.sdc.be.model.Component component, ComponentInstance ci, Map<String, InputDefinition> inputsToCreate, List<ComponentInstanceProperty> propertiesToCreate, List<ComponentInstanceInput> inputsValueToCreate, String inputName, ComponentInstancePropInput propInput, boolean isInputValue) {
 		String propertiesName = propInput.getPropertiesName() ;
 		PropertyDefinition selectedProp = propInput.getInput();
 		String[] parsedPropNames = propInput.getParsedPropNames();