Report properly on errors during CSAR generation

Author: juancadavid

ToscaDesigner/Generated TOSCA files/MYRTUS Face Application.csar

@@ -0,0 +1,47 @@
+tosca_definitions_version: tosca_simple_yaml_1_3
+
+
+
+topology_template:
+    
+  node_templates:  
+      Myrtus_Workstation_1:
+        type: example.eu.myrtus.nodetypes.Myrtus-Workstation
+        
+        
+        
+        
+      MyrtusFaceDetectionService_0:
+        type: example.eu.myrtus.nodetypes.MyrtusFaceDetectionService
+        
+        properties:
+          dockerImage: "thebigpotatoe/face-recognition-docker"
+        
+        
+      MyrtusCameraFeed_0:
+        type: example.eu.myrtus.nodetypes.MyrtusCameraFeed
+        
+        properties:
+          dockerImage: "ci.hesi.energy:5000/myrtus/examples/myrtusface/camera_feed:web"
+        
+        
+      Myrtus_Proxy_0:
+        type: example.eu.myrtus.nodetypes.MyrtusProxy
+        
+        properties:
+          dockerImage: "nginx:alpine"
+          port: "443"
+        
+        
+    
+  relationship_templates:
+    hostedOn:
+      type: hostedOn
+    hostedOn:
+      type: hostedOn
+    hostedOn:
+      type: hostedOn
+    connectsOn:
+      type: hostedOn
+    connectsOn:
+      type: hostedOn

ToscaDesigner/Generated TOSCA files/MyrtusSmartTrafficManagementTopologyTemplate.tosca

@@ -28,6 +28,8 @@
 
 import fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate;
 import fr.softeam.toscadesigner.api.tosca.standard.attribute.TCapabilityDefinition;
+import fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityStereotype;
+import fr.softeam.toscadesigner.api.tosca.standard.class_.TCapabilityType;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeType;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType;
@@ -70,7 +72,7 @@ private Handlebars setupHandlebars() {
 						TNodeTemplate node = tRequirement.getNode();
 						propertyStringValue = node != null ? node.getName() : "''";
 					} else if (searchedPropertyName.equals("capability")) {
-						fr.softeam.toscadesigner.api.tosca.standard.class_.TCapabilityDefinition capability = tRequirement.getCapability();
+						CapabilityStereotype capability = tRequirement.getCapability();
 						propertyStringValue = capability != null ? capability.getElement().getName() : "";
 					}
 				} else if (stereotype.getName().equals("TRequirementDefinition")) {
@@ -80,7 +82,7 @@ private Handlebars setupHandlebars() {
 					if (searchedPropertyName.equals("node")) {
 						propertyStringValue = tRequirementDefinition.getNodeType().getName();
 					} else if (searchedPropertyName.equals("capability")) {
-						fr.softeam.toscadesigner.api.tosca.standard.class_.TCapabilityDefinition capability = tRequirementDefinition.getCapability();
+						TCapabilityType capability = tRequirementDefinition.getCapability();
 						propertyStringValue = capability.getElement().getName();
 					} else if (searchedPropertyName.equals("relationshipType")) {
 						propertyStringValue = tRequirementDefinition.getRelationshipType().getElement().getName();

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/export/AbstractToscaFileGenerator.java

@@ -11,6 +11,8 @@
 import org.modelio.metamodel.uml.infrastructure.ModelTree;
 import org.modelio.vcore.smkernel.mapi.MObject;
 
+import com.github.jknack.handlebars.HandlebarsException;
+
 public class CsarFileGenerator extends AbstractToscaFileGenerator {
 
 	private static final String[] CSAR_FILE_EXTENSIONS = { "*.csar" };
@@ -67,7 +69,15 @@ public void generateContent(MObject toscaModel) throws IOException {
 			logger.error(e);
 			MessageDialog.openError(Display.getCurrent().getActiveShell(), "CSAR export error",
 					e.getLocalizedMessage());
-		}
+		} catch (HandlebarsException ex) {
+	        logger.error(ex);
+	        MessageDialog.openError(Display.getCurrent().getActiveShell(), "Handlebars Error",
+	                "An error occurred while rendering the Handlebars template: " + ex.getMessage());
+	    } catch (NullPointerException ex) {
+	        logger.error(ex);
+	        MessageDialog.openError(Display.getCurrent().getActiveShell(), "NullPointerException",
+	                ex.getStackTrace().toString());
+	    }
 	}
 
 	private void addToscaMetadata(ZipOutputStream zos) throws IOException {

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/export/CsarFileGenerator.java

@@ -7,8 +7,8 @@ node_types:
       targetNamespace: "{{getProperty this "targetNamespace"}}"
       abstract: "{{getProperty this "abstract"}}"
       final: "{{getProperty this "final"}}"
-    {{#unless (noStereotypeApplications this "TRequirementDefinitionType")}}requirements:{{/unless}}
-	{{#each ownedElement}}{{#extension}}{{#eq name "TRequirementDefinitionType"}}{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TRequirementDefinition"}}
+    {{#unless (noStereotypeApplications this "RequirementDefinitionType")}}requirements:{{/unless}}
+	{{#each ownedElement}}{{#extension}}{{#eq name "RequirementDefinitionType"}}{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TRequirementDefinition"}}
       - {{../name}}:
           capability: {{getProperty ../this "capability"}}
           relationship: {{getProperty ../this "relationshipType"}}