Fixes an issue extending relationship archetypes.

structurizr · Feb 20, 2025 · a3af931 · a3af931
1 parent d9a6f1c
commit a3af931
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/structurizr-dsl/src/main/java/com/structurizr/dsl/StructurizrDslParser.java b/structurizr-dsl/src/main/java/com/structurizr/dsl/StructurizrDslParser.java
@@ -1361,12 +1361,11 @@ private Archetype getArchetype(String archetypeType, String archetypeName) {
 
     private void extendArchetype(Archetype archetype, String archetypeName) {
         archetypeName = archetypeName.toLowerCase();
-        Archetype parentArchetype = archetypes.get(archetype.getType()).get(archetypeName);
-        if (parentArchetype != null) {
-            archetype.setDescription(parentArchetype.getDescription());
-            archetype.setTechnology(parentArchetype.getTechnology());
-            archetype.addTags(parentArchetype.getTags().toArray(new String[0]));
-        }
+        Archetype parentArchetype = getArchetype(archetype.getType(), archetypeName);
+
+        archetype.setDescription(parentArchetype.getDescription());
+        archetype.setTechnology(parentArchetype.getTechnology());
+        archetype.addTags(parentArchetype.getTags().toArray(new String[0]));
     }
 
     /**

diff --git a/structurizr-dsl/src/test/java/com/structurizr/dsl/DslTests.java b/structurizr-dsl/src/test/java/com/structurizr/dsl/DslTests.java
@@ -1537,6 +1537,7 @@ void test_archetypesForExtension() throws Exception {
         assertEquals("Makes API calls to", r.getDescription());
         assertEquals("HTTPS", r.getTechnology());
         assertTrue(r.hasTag("Default Tag"));
+        assertTrue(r.hasTag("Synchronous"));
         assertTrue(r.hasTag("HTTPS"));
     }
 

diff --git a/structurizr-dsl/src/test/resources/dsl/archetypes-for-extension.dsl b/structurizr-dsl/src/test/resources/dsl/archetypes-for-extension.dsl
@@ -15,7 +15,11 @@ workspace {
                 tag "Default Tag"
             }
 
-            https = -> {
+            sync = -> {
+                tag "Synchronous"
+            }
+
+            https = --sync-> {
                 technology "HTTPS"
                 tag "HTTPS"
             }