Removes support for deprecated enterprise and location concepts.

Author: simonbrowndotje

changelog.md

@@ -2,7 +2,8 @@
 
 ## v5.0.0 (unreleased)
 
-- structurizr-java: Fixes https://github.com/structurizr/java/issues/437 (Make ComponentFinder.run() not fail on empty Set<DiscoveredComponent>).
+- structurizr-core: Removes support for deprecated enterprise and location concepts.
+- structurizr-component: Fixes https://github.com/structurizr/java/issues/437 (Make ComponentFinder.run() not fail on empty Set<DiscoveredComponent>).
 - structurizr-dsl: Adds support for `iconPosition` on element styles (options are `Top`, `Bottom`, `Left`).
 - structurizr-dsl: Adds support for defining element and relationship styles for light and dark mode.
 - structurizr-dsl: Adds a `Bucket` shape.
@@ -16,6 +17,7 @@
 - structurizr-dsl: PlantUML, Mermaid, and Kroki image views can now be defined by an inline source block.
 - structurizr-dsl: Constants and variables are inherited when extending a DSL workspace.
 - structurizr-dsl: DSL source is only stored in the JSON workspace when the DSL is deemed as "portable" (i.e. no files, plugins, scripts).
+- structurizr-export: Removes support for deprecated enterprise and location concepts.
 - structurizr-import: Adds support for `plantuml.inline`, `mermaid.inline`, and `kroki.inline` properties to inline the resulting PNG/SVG file into the workspace.
 - structurizr-inspection: Adds a way to disable inspections via a workspace property named `structurizr.inspection` (`false` to disable).
 - structurizr-inspection: Default inspector adds a summary of error/warning/info/ignore counts as workspace properties.

structurizr-client/src/integrationTest/java/com/structurizr/api/BackwardsCompatibilityTests.java

@@ -22,23 +22,6 @@ void test() throws Exception {
         }
     }
 
-    @Test
-    void enterprise_and_location() throws Exception {
-        File file = new File(PATH_TO_WORKSPACE_FILES, "structurizr-36141-workspace.json");
-        Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(file);
-
-        assertEquals("Big Bank plc", workspace.getModel().getEnterprise().getName());
-        assertEquals(Location.Internal, workspace.getModel().getPersonWithName("Back Office Staff").getLocation());
-        assertEquals(Location.External, workspace.getModel().getPersonWithName("Personal Banking Customer").getLocation());
-
-        // make sure enterprise and location information is not lost when going to/from JSON
-        workspace = WorkspaceUtils.fromJson(WorkspaceUtils.toJson(workspace, false));
-
-        assertEquals("Big Bank plc", workspace.getModel().getEnterprise().getName());
-        assertEquals(Location.Internal, workspace.getModel().getPersonWithName("Back Office Staff").getLocation());
-        assertEquals(Location.External, workspace.getModel().getPersonWithName("Personal Banking Customer").getLocation());
-    }
-
     @Test
     void documentation() throws Exception {
         Workspace workspace = new Workspace("Name", "Description");

structurizr-core/src/main/java/com/structurizr/model/Model.java

@@ -23,8 +23,6 @@ public final class Model implements PropertyHolder {
     private final Set<Relationship> relationships = new TreeSet<>();
     private final Map<String, Relationship> relationshipsById = new HashMap<>();
 
-    private Enterprise enterprise;
-
     private Set<Person> people = new TreeSet<>();
     private Set<SoftwareSystem> softwareSystems = new TreeSet<>();
     private Set<DeploymentNode> deploymentNodes = new TreeSet<>();
@@ -37,16 +35,6 @@ public final class Model implements PropertyHolder {
     Model() {
     }
 
-    @Deprecated
-    public Enterprise getEnterprise() {
-        return enterprise;
-    }
-
-    @Deprecated
-    void setEnterprise(Enterprise enterprise) {
-        this.enterprise = enterprise;
-    }
-
     /**
      * Creates a software system (with an unspecified location) and adds it to the model.
      *

structurizr-core/src/main/java/com/structurizr/model/Person.java

@@ -12,8 +12,6 @@
  */
 public final class Person extends StaticStructureElement {
 
-    private Location location = Location.Unspecified;
-
     @Override
     @JsonIgnore
     public Element getParent() {
@@ -23,20 +21,6 @@ public Element getParent() {
     Person() {
     }
 
-    @Deprecated
-    public Location getLocation() {
-        return location;
-    }
-
-    @Deprecated
-    void setLocation(Location location) {
-        if (location != null) {
-            this.location = location;
-        } else {
-            this.location = Location.Unspecified;
-        }
-    }
-
     @Override
     public String getCanonicalName() {
         return new CanonicalNameGenerator().generate(this);

structurizr-core/src/main/java/com/structurizr/model/SoftwareSystem.java

@@ -16,8 +16,6 @@
  */
 public final class SoftwareSystem extends StaticStructureElement implements Documentable {
 
-    private Location location = Location.Unspecified;
-
     private Set<Container> containers = new TreeSet<>();
 
     private Documentation documentation = new Documentation();
@@ -36,25 +34,6 @@ public Element getParent() {
     SoftwareSystem() {
     }
 
-    @Deprecated
-    public Location getLocation() {
-        return location;
-    }
-
-    /**
-     * Sets the location of this software system.
-     *
-     * @param location  a Location instance
-     */
-    @Deprecated
-    void setLocation(Location location) {
-        if (location != null) {
-            this.location = location;
-        } else {
-            this.location = Location.Unspecified;
-        }
-    }
-
     void add(Container container) {
         containers.add(container);
     }

structurizr-export/src/main/java/com/structurizr/export/AbstractDiagramExporter.java

@@ -602,9 +602,6 @@ protected void writeRelationships(ModelView view, IndentingWriter writer) {
     protected abstract void writeHeader(ModelView view, IndentingWriter writer);
     protected abstract void writeFooter(ModelView view, IndentingWriter writer);
 
-    protected abstract void startEnterpriseBoundary(ModelView view, String enterpriseName, IndentingWriter writer);
-    protected abstract void endEnterpriseBoundary(ModelView view, IndentingWriter writer);
-
     protected abstract void startGroupBoundary(ModelView view, String group, IndentingWriter writer);
     protected abstract void endGroupBoundary(ModelView view, IndentingWriter writer);
 

structurizr-export/src/main/java/com/structurizr/export/dot/DOTExporter.java

@@ -78,27 +78,6 @@ protected void writeFooter(ModelView view, IndentingWriter writer) {
         writer.writeLine("}");
     }
 
-    @Override
-    protected void startEnterpriseBoundary(ModelView view, String enterpriseName, IndentingWriter writer) {
-        writer.writeLine("subgraph cluster_enterprise {");
-
-        writer.indent();
-        writer.writeLine("margin=" + clusterInternalMargin);
-        writer.writeLine(String.format("label=<<font point-size=\"24\"><br />%s</font><br /><font point-size=\"19\">[Enterprise]</font>>", enterpriseName));
-        writer.writeLine("labelloc=b");
-        writer.writeLine("color=\"#444444\"");
-        writer.writeLine("fontcolor=\"#444444\"");
-        writer.writeLine("fillcolor=\"#ffffff\"");
-        writer.writeLine();
-    }
-
-    @Override
-    protected void endEnterpriseBoundary(ModelView view, IndentingWriter writer) {
-        writer.outdent();
-        writer.writeLine("}");
-        writer.writeLine();
-    }
-
     @Override
     protected void startGroupBoundary(ModelView view, String group, IndentingWriter writer) {
         String color = "#cccccc";

structurizr-export/src/main/java/com/structurizr/export/mermaid/MermaidDiagramExporter.java

@@ -78,21 +78,6 @@ protected void writeFooter(ModelView view, IndentingWriter writer) {
         writer.outdent();
     }
 
-    @Override
-    protected void startEnterpriseBoundary(ModelView view, String enterpriseName, IndentingWriter writer) {
-        writer.writeLine("subgraph enterprise [\"" + enterpriseName + "\"]");
-        writer.indent();
-        writer.writeLine("style enterprise fill:#ffffff,stroke:#444444,color:#444444");
-        writer.writeLine();
-    }
-
-    @Override
-    protected void endEnterpriseBoundary(ModelView view, IndentingWriter writer) {
-        writer.outdent();
-        writer.writeLine("end");
-        writer.writeLine();
-    }
-
     @Override
     protected void startGroupBoundary(ModelView view, String group, IndentingWriter writer) {
         groupId++;

structurizr-export/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java

@@ -270,19 +270,6 @@ protected void writeFooter(ModelView view, IndentingWriter writer) {
         super.writeFooter(view, writer);
     }
 
-    @Override
-    protected void startEnterpriseBoundary(ModelView view, String enterpriseName, IndentingWriter writer) {
-        writer.writeLine(String.format("Enterprise_Boundary(enterprise, \"%s\") {", enterpriseName));
-        writer.indent();
-    }
-
-    @Override
-    protected void endEnterpriseBoundary(ModelView view, IndentingWriter writer) {
-        writer.outdent();
-        writer.writeLine("}");
-        writer.writeLine();
-    }
-
     @Override
     protected void startGroupBoundary(ModelView view, String group, IndentingWriter writer) {
         groupId++;

structurizr-export/src/main/java/com/structurizr/export/plantuml/StructurizrPlantUMLExporter.java

@@ -146,26 +146,6 @@ protected void writeHeader(ModelView view, IndentingWriter writer) {
         writer.writeLine();
     }
 
-    @Override
-    protected void startEnterpriseBoundary(ModelView view, String enterpriseName, IndentingWriter writer) {
-        if (!renderAsSequenceDiagram(view)) {
-            writer.writeLine(String.format("rectangle \"%s\" <<enterprise>> {", enterpriseName));
-            writer.indent();
-            writer.writeLine("skinparam RectangleBorderColor<<enterprise>> #444444");
-            writer.writeLine("skinparam RectangleFontColor<<enterprise>> #444444");
-            writer.writeLine();
-        }
-    }
-
-    @Override
-    protected void endEnterpriseBoundary(ModelView view, IndentingWriter writer) {
-        if (!renderAsSequenceDiagram(view)) {
-            writer.outdent();
-            writer.writeLine("}");
-            writer.writeLine();
-        }
-    }
-
     @Override
     protected void startGroupBoundary(ModelView view, String group, IndentingWriter writer) {
         groupId++;