Removes the feature flag around archetypes.

Author: simonbrowndotje

changelog.md

@@ -10,6 +10,7 @@
 - structurizr-dsl: Adds a reluctant version of `include *` (`include *?`) for component views that only adds relationships to/from the components in the scoped container.
 - structurizr-dsl: Removes deprecated `!ref` and `!extend` keywords.
 - structurizr-dsl: Adds support for Java style `"""` multi-line text blocks.
+- structurizr-dsl: Adds support for defining element and relationship archetypes.
 
 ## 3.2.1 (10th December 2024)
 

structurizr-dsl/src/main/java/com/structurizr/dsl/Features.java

@@ -1,7 +1,4 @@
 package com.structurizr.dsl;
 
 public final class Features extends com.structurizr.util.Features {
-
-    public static final String ARCHETYPES = "structurizr.feature.dsl.archetypes";
-
 }

structurizr-dsl/src/main/java/com/structurizr/dsl/StructurizrDslParser.java

@@ -661,7 +661,7 @@ void parse(List<String> lines, File dslFile, boolean fragment, boolean includeIn
                         startContext(new ModelDslContext());
                         parsedTokens.add(MODEL_TOKEN);
 
-                    } else if (ARCHETYPES_TOKEN.equalsIgnoreCase(firstToken) && inContext(ModelDslContext.class) && features.isEnabled(Features.ARCHETYPES)) {
+                    } else if (ARCHETYPES_TOKEN.equalsIgnoreCase(firstToken) && inContext(ModelDslContext.class)) {
                         startContext(new ArchetypesDslContext());
 
                     } else if (isElementKeywordOrArchetype(firstToken, GROUP_TOKEN) && inContext(ArchetypesDslContext.class)) {
@@ -1337,28 +1337,22 @@ public Features getFeatures() {
     }
 
     private boolean isElementKeywordOrArchetype(String token, String keyword) {
-        if (features.isEnabled(Features.ARCHETYPES)) {
-            if (token.equalsIgnoreCase(keyword)) {
-                return true;
-            } else {
-                return (archetypes.get(keyword).containsKey(token.toLowerCase()));
-            }
+        if (token.equalsIgnoreCase(keyword)) {
+            return true;
         } else {
-            return token.equalsIgnoreCase(keyword);
+            return (archetypes.get(keyword).containsKey(token.toLowerCase()));
         }
     }
 
     private boolean isRelationshipKeywordOrArchetype(String token) {
-        if (features.isEnabled(Features.ARCHETYPES)) {
-            if (token.equalsIgnoreCase(RELATIONSHIP_TOKEN)) {
-                return true;
-            } else if (token.startsWith(RELATIONSHIP_ARCHETYPE_PREFIX) && token.endsWith(RELATIONSHIP_ARCHETYPE_SUFFIX)) {
-                token = token.substring(RELATIONSHIP_ARCHETYPE_PREFIX.length(), token.length()-RELATIONSHIP_ARCHETYPE_SUFFIX.length());
-                return (archetypes.get(RELATIONSHIP_TOKEN).containsKey(token.toLowerCase()));
-            }
+        if (token.equalsIgnoreCase(RELATIONSHIP_TOKEN)) {
+            return true;
+        } else if (token.startsWith(RELATIONSHIP_ARCHETYPE_PREFIX) && token.endsWith(RELATIONSHIP_ARCHETYPE_SUFFIX)) {
+            token = token.substring(RELATIONSHIP_ARCHETYPE_PREFIX.length(), token.length()-RELATIONSHIP_ARCHETYPE_SUFFIX.length());
+            return (archetypes.get(RELATIONSHIP_TOKEN).containsKey(token.toLowerCase()));
         }
 
-        return token.equalsIgnoreCase(RELATIONSHIP_TOKEN);
+        return false;
     }
 
     private void addArchetype(Archetype archetype) {
@@ -1368,14 +1362,12 @@ private void addArchetype(Archetype archetype) {
     private Archetype getArchetype(String archetypeType, String archetypeName) {
         Archetype archetype = null;
 
-        if (features.isEnabled(Features.ARCHETYPES)) {
-            if (RELATIONSHIP_TOKEN.equals(archetypeType)) {
-                if (archetypeName.startsWith(RELATIONSHIP_ARCHETYPE_PREFIX) && archetypeName.endsWith(RELATIONSHIP_ARCHETYPE_SUFFIX)) {
-                    archetypeName = archetypeName.substring(RELATIONSHIP_ARCHETYPE_PREFIX.length(), archetypeName.length() - RELATIONSHIP_ARCHETYPE_SUFFIX.length());
-                }
+        if (RELATIONSHIP_TOKEN.equals(archetypeType)) {
+            if (archetypeName.startsWith(RELATIONSHIP_ARCHETYPE_PREFIX) && archetypeName.endsWith(RELATIONSHIP_ARCHETYPE_SUFFIX)) {
+                archetypeName = archetypeName.substring(RELATIONSHIP_ARCHETYPE_PREFIX.length(), archetypeName.length() - RELATIONSHIP_ARCHETYPE_SUFFIX.length());
             }
-            archetype = archetypes.get(archetypeType).get(archetypeName.toLowerCase());
         }
+        archetype = archetypes.get(archetypeType).get(archetypeName.toLowerCase());
 
         if (archetype == null) {
             archetype = new Archetype(archetypeName, archetypeType);

structurizr-dsl/src/test/java/com/structurizr/dsl/DslTests.java

@@ -1459,23 +1459,9 @@ void test_sourceIsNotRetained() throws Exception {
     }
 
     @Test
-    void test_archetypes_WhenDisabled() throws Exception {
-        try {
-            File parentDslFile = new File("src/test/resources/dsl/archetypes.dsl");
-            StructurizrDslParser parser = new StructurizrDslParser();
-            parser.parse(parentDslFile);
-            fail();
-        } catch (StructurizrDslParserException e) {
-            assertTrue(e.getMessage().startsWith("Unexpected tokens (expected: !identifiers, group, person, softwareSystem, deploymentEnvironment, element, ->) at line 4"));
-            assertTrue(e.getMessage().endsWith("archetypes {"));
-        }
-    }
-
-    @Test
-    void test_archetypes_WhenEnabled() throws Exception {
+    void test_archetypes() throws Exception {
         File parentDslFile = new File("src/test/resources/dsl/archetypes.dsl");
         StructurizrDslParser parser = new StructurizrDslParser();
-        parser.getFeatures().enable(Features.ARCHETYPES);
         parser.parse(parentDslFile);
         Workspace workspace = parser.getWorkspace();
 
@@ -1492,7 +1478,6 @@ void test_archetypes_WhenEnabled() throws Exception {
     void test_archetypesForDefaults() throws Exception {
         File parentDslFile = new File("src/test/resources/dsl/archetypes-for-defaults.dsl");
         StructurizrDslParser parser = new StructurizrDslParser();
-        parser.getFeatures().enable(Features.ARCHETYPES);
         parser.parse(parentDslFile);
         Workspace workspace = parser.getWorkspace();
 
@@ -1520,7 +1505,6 @@ void test_archetypesForDefaults() throws Exception {
     void test_archetypesForExtension() throws Exception {
         File parentDslFile = new File("src/test/resources/dsl/archetypes-for-extension.dsl");
         StructurizrDslParser parser = new StructurizrDslParser();
-        parser.getFeatures().enable(Features.ARCHETYPES);
         parser.parse(parentDslFile);
         Workspace workspace = parser.getWorkspace();