diff options
Diffstat (limited to 'common-be/src/main/java')
2 files changed, 5 insertions, 5 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java index 5a7acf4919..ee5cd0ec96 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java @@ -332,7 +332,6 @@ public class PropertyDataDefinition extends ToscaDataDefinition { return this.toscaGetFunctionType != null || this.toscaFunction != null; } - @JsonIgnoreProperties public boolean isToscaGetFunction() { return this.toscaFunction != null diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaGetFunctionDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaGetFunctionDataDefinition.java index 82958a7532..6f78c6828a 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaGetFunctionDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaGetFunctionDataDefinition.java @@ -126,17 +126,18 @@ public class ToscaGetFunctionDataDefinition implements ToscaFunction, ToscaFunct } private Map<String, Object> buildGetInputFunctionValue() { - List<Object> propertySourceCopy = new ArrayList<Object>(this.propertyPathFromSource); - List<Object> propertySourceOneCopy = new ArrayList<>(); + final List<Object> propertySourceCopy = new ArrayList<>(this.propertyPathFromSource); + final List<Object> propertySourceOneCopy = new ArrayList<>(); propertySourceOneCopy.add(this.propertyPathFromSource.get(0)); if (CollectionUtils.isNotEmpty(toscaIndexList)) { propertySourceCopy.addAll(toscaIndexList); propertySourceOneCopy.addAll(toscaIndexList); } if (this.propertyPathFromSource.size() == 1) { - return Map.of(this.functionType.getFunctionName(), propertySourceOneCopy); + return Map.of(functionType.getFunctionName(), propertySourceOneCopy.size() == 1 ? propertySourceOneCopy.get(0) : propertySourceOneCopy); + } else { + return Map.of(functionType.getFunctionName(), propertySourceCopy.size() == 1 ? propertySourceCopy.get(0) : propertySourceCopy); } - return Map.of(this.functionType.getFunctionName(), propertySourceCopy); } @Override |