diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/InterfaceOperationUtils.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/InterfaceOperationUtils.java | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/InterfaceOperationUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/InterfaceOperationUtils.java index 0ee6264f4d..38cdeb8d40 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/InterfaceOperationUtils.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/InterfaceOperationUtils.java @@ -87,14 +87,18 @@ public class InterfaceOperationUtils { } public static boolean isOperationInputMappedToComponentInput(OperationInputDefinition input, - List<InputDefinition> inputs) { + List<InputDefinition> inputs) { if (CollectionUtils.isEmpty(inputs)) { return false; } - return inputs.stream().anyMatch(inp -> inp.getUniqueId().equals(input.getInputId())) - || (input.getInputId().contains(".") - && inputs.stream().anyMatch(inp -> inp.getUniqueId().equals( - input.getInputId().substring(0, input.getInputId().lastIndexOf('.'))))) ; + + boolean matchedInput = inputs.stream().anyMatch(inp -> inp.getUniqueId().equals(input.getInputId())); + if (!matchedInput && input.getInputId().contains(".")) { + return inputs.stream() + .anyMatch(inp -> inp.getUniqueId() + .equals(input.getInputId().substring(0, input.getInputId().lastIndexOf('.')))); + } + return matchedInput; } public static boolean isOperationInputMappedToOtherOperationOutput(String outputName, @@ -119,6 +123,20 @@ public class InterfaceOperationUtils { return getPropertyMap; } + public static Map<String, List<String>> createMappedCapabilityPropertyDefaultValue(String capabilityName, + String propertyName) { + Map<String, List<String>> getPropertyMap = new HashMap<>(); + List<String> values = new ArrayList<>(); + values.add(InterfacesOperationsToscaUtil.SELF); + values.add(capabilityName); + + if (Objects.nonNull(propertyName) && !propertyName.isEmpty()) { + values.addAll(Arrays.asList(propertyName.split("\\."))); + } + getPropertyMap.put(ToscaFunctions.GET_PROPERTY.getFunctionName(), values); + return getPropertyMap; + } + /** * Get the list of outputs of other operations of all the interfaces in the component. * @param currentOperationIdentifier Fully qualified operation name e.g. org.test.interfaces.node.lifecycle.Abc.stop |