bug fix in .tosca generation: relationship templates in topology template files

Author: juancadavid

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

@@ -34,27 +34,27 @@
 import org.modelio.metamodel.uml.statik.Class;
 import org.modelio.vcore.smkernel.mapi.MObject;
 
-@objid ("e7453252-f578-4da1-815c-d2ce0e765130")
+@objid("e7453252-f578-4da1-815c-d2ce0e765130")
 public abstract class AbstractToscaFileGenerator {
-    @objid ("6ca66b17-c54f-42dc-862d-4c41f8cbec9b")
+    @objid("6ca66b17-c54f-42dc-862d-4c41f8cbec9b")
     private static final String TEMPLATE_PATH = "/fr/softeam/templates/";
 
-    @objid ("44617ecf-78ee-46d2-a367-cbdfee5c0854")
+    @objid("44617ecf-78ee-46d2-a367-cbdfee5c0854")
     private static final String MAIN_TEMPLATE = "_mainTemplate";
 
-    @objid ("a897a13e-b8dc-4f4f-b967-60133eb7f69d")
+    @objid("a897a13e-b8dc-4f4f-b967-60133eb7f69d")
     protected Handlebars handlebars = setupHandlebars();
 
-    @objid ("e1bdb1e7-0783-441d-96e1-fdaa0f8e8514")
+    @objid("e1bdb1e7-0783-441d-96e1-fdaa0f8e8514")
     protected abstract String getFileType();
 
-    @objid ("ebedc3d7-f673-4680-a8b3-159124af40c8")
+    @objid("ebedc3d7-f673-4680-a8b3-159124af40c8")
     protected abstract String[] getFileExtensions();
 
-    @objid ("a064e044-abc6-430f-9a31-680bf8f13dad")
+    @objid("a064e044-abc6-430f-9a31-680bf8f13dad")
     public abstract void generateContent(MObject object) throws IOException;
 
-    @objid ("0a64efd3-9d89-46b9-91e8-40aaa00626a4")
+    @objid("0a64efd3-9d89-46b9-91e8-40aaa00626a4")
     protected String saveToFile(String[] fileExtensions, String fileType) {
         FileDialog fileDialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE);
         fileDialog.setFilterExtensions(fileExtensions);
@@ -64,7 +64,7 @@ protected String saveToFile(String[] fileExtensions, String fileType) {
         return filePath;
     }
 
-    @objid ("3a782c82-535e-40a1-96b6-10d70a8fd4b4")
+    @objid("3a782c82-535e-40a1-96b6-10d70a8fd4b4")
     private Handlebars setupHandlebars() {
         Handlebars handlebars = new Handlebars(new ClassPathTemplateLoader(TEMPLATE_PATH, ".hbs"));
         handlebars.setPrettyPrint(true);
@@ -133,15 +133,10 @@ private Handlebars setupHandlebars() {
             }
             throw new RuntimeException("Stereotype property " + searchedPropertyName + " not found in " + context);
         });
-        handlebars.registerHelper("noStereotypeApplications", (ModelTree context, Options options) -> 
-            Stream.concat(
-                context.getOwnedElement().stream(), 
-                context instanceof Class ? ((Class) context).getOwnedAttribute().stream() : Stream.empty()
-            )
-            .noneMatch(element -> element.getExtension().stream()
-                .anyMatch(stereotype -> stereotype.getName().equals(options.params[0]))
-            )
-        );
+        // Helper returning true if none of the owned elements/attributes/ends apply the
+        // given stereotype name
+        handlebars.registerHelper("noStereotypeApplications",
+                (context, options) -> hasNoStereotypeApplications((ModelTree) context, (String) options.params[0]));
         handlebars.registerHelper("imports", (ModelElement context, Options options) -> {
 
             Set<Import> imports = new HashSet<>();
@@ -159,30 +154,23 @@ private Handlebars setupHandlebars() {
                     imports.add(new Import(derivedFromValue + ".tosca", targetNamespace, "MYRTUS-"));
                 }
 
-                // 2. Check for non-tosca valid source types in capabilities
-        //                CapabilityDefinitionsType capabilityDefinitionsTypeInstance = tNodeType.getCapabilityDefinitions();
-        //                List<TCapabilityDefinition> capabilityDefinitions = capabilityDefinitionsTypeInstance.getCapabilityDefinition();
-                // To develop when capabilities will be supported
-        //                for (TCapabilityDefinition tCapabilityDefinition : capabilityDefinitions) {
-        //                    if (hasNonToscaValidSourceType(capability)) {
-        //                        imports.add(/* import statement */);
-        //                    }
-        //                }
             } else if (new TopologyTemplateChecker().isTypeOf(context)) {
-                // 3. Check for non-tosca types in node templates
-        List<TNodeTemplate> nodeTemplates = context.getCompositionChildren().stream().filter(object -> {
-        Stereotype tNodeTemplateStereotype = ToscaDesignerModule.getInstance().getModuleContext()
-        .getModelingSession().getMetamodelExtensions()
-        .getStereotype("TNodeTemplate", object.getMClass());
-        return tNodeTemplateStereotype != null
-        && ((ModelElement) object).isStereotyped(tNodeTemplateStereotype);
-        }).map(Class.class::cast).map(c -> TNodeTemplate.safeInstantiate(c)).collect(Collectors.toList());
-        for (TNodeTemplate nodeTemplate : nodeTemplates) {
-
-        String targetNamespace = ((Class) context).getOwner().getName();
-        imports.add(new Import(nodeTemplate.getElement().getName() + ".tosca", targetNamespace , "MYRTUS-"));
-
-        }
+                // 2. Check for non-tosca types in node templates
+                List<TNodeTemplate> nodeTemplates = context.getCompositionChildren().stream().filter(object -> {
+                    Stereotype tNodeTemplateStereotype = ToscaDesignerModule.getInstance().getModuleContext()
+                            .getModelingSession().getMetamodelExtensions()
+                            .getStereotype("TNodeTemplate", object.getMClass());
+                    return tNodeTemplateStereotype != null
+                            && ((ModelElement) object).isStereotyped(tNodeTemplateStereotype);
+                }).map(Class.class::cast).map(c -> TNodeTemplate.safeInstantiate(c)).collect(Collectors.toList());
+                for (TNodeTemplate nodeTemplate : nodeTemplates) {
+                    TNodeType nodeType = nodeTemplate.getNodeType();
+                    if (nodeType != null) {
+                        String typeName = nodeType.getElement().getName();
+                        String targetNamespace = nodeType.getTargetNamespace();
+                        imports.add(new Import(typeName + ".tosca", targetNamespace, "MYRTUS-"));
+                    }
+                }
 
             }
 
@@ -195,7 +183,7 @@ private Handlebars setupHandlebars() {
         return handlebars;
     }
 
-    @objid ("4e0fc0cf-420e-4626-b34d-fd6df12a1e01")
+    @objid("4e0fc0cf-420e-4626-b34d-fd6df12a1e01")
     private String generateImportString(Set<Import> imports) {
         StringBuilder importString = new StringBuilder();
         if (!imports.isEmpty())
@@ -209,7 +197,47 @@ private String generateImportString(Set<Import> imports) {
         return importString.toString();
     }
 
-    @objid ("b6716c1e-6ab4-4dce-8bbe-f749a6185d60")
+    /**
+     * Return true if none of the owned elements / attributes / composition children
+     * (recursively)
+     * apply the given stereotype name.
+     * Recursive traversal replaces previous reliance on owned association ends.
+     */
+    private boolean hasNoStereotypeApplications(ModelTree context, String stereotypeName) {
+        Stream<ModelElement> ownedElements = context.getOwnedElement().stream()
+                .filter(ModelElement.class::isInstance)
+                .map(ModelElement.class::cast);
+
+        Stream<ModelElement> ownedAttributes = context instanceof Class
+                ? ((Class) context).getOwnedAttribute().stream()
+                        .filter(ModelElement.class::isInstance)
+                        .map(ModelElement.class::cast)
+                : Stream.empty();
+
+        Stream<ModelElement> compositionDescendants = compositionDescendants(context);
+
+        return Stream.concat(Stream.concat(ownedElements, ownedAttributes), compositionDescendants)
+                .distinct()
+                .noneMatch(element -> element.getExtension().stream()
+                        .anyMatch(st -> st.getName().equals(stereotypeName)));
+    }
+
+    /**
+     * Recursively collect all composition children below the given context.
+     */
+    private Stream<ModelElement> compositionDescendants(ModelTree parent) {
+        return parent.getCompositionChildren().stream()
+                .filter(ModelElement.class::isInstance)
+                .map(ModelElement.class::cast)
+                .flatMap(child -> {
+                    if (child instanceof ModelTree) {
+                        return Stream.concat(Stream.of(child), compositionDescendants((ModelTree) child));
+                    }
+                    return Stream.of(child);
+                });
+    }
+
+    @objid("b6716c1e-6ab4-4dce-8bbe-f749a6185d60")
     protected String renderTemplate(Handlebars handlebars, Object data) throws IOException {
         Template mainTemplate = handlebars.compile(MAIN_TEMPLATE);
         try (StringWriter writer = new StringWriter()) {
@@ -218,25 +246,25 @@ protected String renderTemplate(Handlebars handlebars, Object data) throws IOExc
         }
     }
 
-    @objid ("a0abc478-ed5d-497e-b9ec-7a8ca374ad06")
+    @objid("a0abc478-ed5d-497e-b9ec-7a8ca374ad06")
     final class Import {
-        @objid ("17c76b26-3910-426f-8cd6-38dede4173ba")
+        @objid("17c76b26-3910-426f-8cd6-38dede4173ba")
         private String file;
 
-        @objid ("cd485831-b7d3-44c3-a39f-0cd6485a7afd")
+        @objid("cd485831-b7d3-44c3-a39f-0cd6485a7afd")
         private String namespaceUri;
 
-        @objid ("bc36ccf4-d7ce-4126-bb6a-e5b56eb5001f")
+        @objid("bc36ccf4-d7ce-4126-bb6a-e5b56eb5001f")
         private String namespacePrefix;
 
-        @objid ("cab33e64-b830-4ee5-be1e-d67a046d71b3")
-        public  Import(String file, String namespaceUri, String namespacePrefix) {
+        @objid("cab33e64-b830-4ee5-be1e-d67a046d71b3")
+        public Import(String file, String namespaceUri, String namespacePrefix) {
             this.file = file;
             this.namespaceUri = namespaceUri;
             this.namespacePrefix = namespacePrefix;
         }
 
-        @objid ("9e614e14-9276-4de0-adbf-7d3284e36ffa")
+        @objid("9e614e14-9276-4de0-adbf-7d3284e36ffa")
         @Override
         public boolean equals(Object o) {
             if (this == o)
@@ -249,22 +277,22 @@ public boolean equals(Object o) {
                     && namespacePrefix.equals(anImport.namespacePrefix);
         }
 
-        @objid ("7539be58-524e-48ff-911d-db847524b474")
+        @objid("7539be58-524e-48ff-911d-db847524b474")
         public String getFile() {
             return file;
         }
 
-        @objid ("e1838d70-2162-47c9-ad66-a1a204354ba1")
+        @objid("e1838d70-2162-47c9-ad66-a1a204354ba1")
         public String getNamespaceUri() {
             return namespaceUri;
         }
 
-        @objid ("687bfd11-4d48-4a5c-89d0-f9dcd58d825d")
+        @objid("687bfd11-4d48-4a5c-89d0-f9dcd58d825d")
         public String getNamespacePrefix() {
             return namespacePrefix;
         }
 
-        @objid ("76de5aa3-91b2-44f3-9741-8405f5ca3e6d")
+        @objid("76de5aa3-91b2-44f3-9741-8405f5ca3e6d")
         @Override
         public int hashCode() {
             return Objects.hash(file, namespaceUri, namespacePrefix);

src/main/resources/fr/softeam/templates/TTopologyTemplate.hbs

@@ -27,7 +27,7 @@ topology_template:
 {{#unless (noStereotypeApplications this "TRelationshipTemplateEnd")}}
   relationship_templates:
   {{#ownedElement}}{{#targetingEnd}}{{#association as |association|}}{{#extension as |extension|}}{{#eq extension.name "TRelationshipTemplate"}}
-    {{../name}}:
+    {{association.name}}:
       type: {{getProperty association "type"}}
   {{/eq}}{{/extension}}{{/association}}{{/targetingEnd}}{{/ownedElement}}
 {{/unless}}