private List<InputDefinition> prepareInputsForRedeclaration(Map<String, InputDefinition> oldInputsById, RedeclareInputData redeclareInputData) {
List<InputDefinition> inputsForRedeclaration = redeclareInputData.declaredInputIds.stream()
+ .filter(oldInputsById::containsKey)
.map(oldInputsById::get)
.map(InputDefinition::new)
.collect(Collectors.toList());
package org.openecomp.sdc.be.components.merge.property;
+import java.util.Objects;
import org.openecomp.sdc.be.dao.utils.MapUtil;
import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
private static List<String> getOldDeclaredInputsByUser(List<GetInputValueDataDefinition> getInputValues, Map<String, InputDefinition> oldInputsByName) {
return getInputValues.stream().map(GetInputValueDataDefinition::getInputName)
.map(oldInputsByName::get)
- .filter(oldInput -> oldInput.getInstanceUniqueId() != null)
+ .filter(oldInput -> Objects.nonNull(oldInput) && oldInput.getInstanceUniqueId() != null)
.map(PropertyDataDefinition::getName)
.collect(Collectors.toList());
}