From 20679b258fc6bfbcf3afa1f5aec6a94715f3ebf5 Mon Sep 17 00:00:00 2001 From: shiria Date: Mon, 18 Mar 2019 12:07:12 +0200 Subject: Fix flat node type interface Change-Id: I45457f1f33f2197c11d0711cedca82f53db5df79 Issue-ID: SDC-2198 Signed-off-by: shiria --- .../sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'openecomp-be/lib/openecomp-tosca-lib/src/main/java/org') diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java index 1f0b728c53..332555d509 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java @@ -920,10 +920,13 @@ public class ToscaAnalyzerServiceImpl implements ToscaAnalyzerService { targetNodeType.setInterfaces(interfaceNoMerge.get()); return; } - targetNodeType.setInterfaces(combineInterfaces(sourceNodeType, targetNodeType)); + combineInterfaces(sourceNodeType, targetNodeType).ifPresent(targetNodeType::setInterfaces); } - private Map combineInterfaces(NodeType sourceNodeType, NodeType targetNodeType) { + private Optional> combineInterfaces(NodeType sourceNodeType, NodeType targetNodeType) { + if (MapUtils.isEmpty(sourceNodeType.getInterfaces())) { + return Optional.empty(); + } Map combineInterfaces = new HashMap<>(); for (Map.Entry sourceInterfaceDefEntry : sourceNodeType.getInterfaces().entrySet()) { String interfaceName = sourceInterfaceDefEntry.getKey(); @@ -943,7 +946,7 @@ public class ToscaAnalyzerServiceImpl implements ToscaAnalyzerService { } } - return combineInterfaces; + return Optional.of(combineInterfaces); } private Optional> combineInterfaceNoMerge(NodeType sourceNodeType, NodeType targetNodeType) { -- cgit