save topology template after applying features

OpenTOSCA · May 29, 2019 · 0c09cad · 0c09cad
1 parent d521db2
commit 0c09cad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...daptation/src/main/java/org/eclipse/winery/model/adaptation/enhance/EnhancementUtils.java b/...daptation/src/main/java/org/eclipse/winery/model/adaptation/enhance/EnhancementUtils.java
@@ -278,7 +278,8 @@ public static TTopologyTemplate applyFeaturesForTopology(TTopologyTemplate topol
                     PropertyDefinitionKVList definedProperties = generatedNodeType.getWinerysPropertiesDefinition().getPropertyDefinitionKVList();
 
                     // todo: think about moving this code to a separate ModelUtilities method.
-                    Map<String, String> kvProperties = Objects.nonNull(nodeTemplate.getProperties().getKVProperties())
+                    Map<String, String> kvProperties = Objects.nonNull(nodeTemplate.getProperties())
+                        && Objects.nonNull(nodeTemplate.getProperties().getKVProperties())
                         ? nodeTemplate.getProperties().getKVProperties()
                         : new HashMap<>();
                     if (kvProperties.isEmpty()) {

diff --git a/...epository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResource.java b/...epository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResource.java
@@ -366,6 +366,10 @@ public TTopologyTemplate applyAvailableFeatures(ArrayList<AvailableFeaturesApiDa
             }
         });
 
-        return EnhancementUtils.applyFeaturesForTopology(this.topologyTemplate, featureMap);
+        TTopologyTemplate enrichedTopology = EnhancementUtils.applyFeaturesForTopology(this.topologyTemplate, featureMap);
+        this.parent.setTopology(enrichedTopology, this.type);
+        RestUtils.persist(this.parent);
+
+        return enrichedTopology;
     }
 }