Adds some code to deal with old workspaces, or those created by third party tooling that are missing view order properties.

Author: simonbrowndotje

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

@@ -48,4 +48,12 @@ void documentation() throws Exception {
                 {"configuration":{},"description":"Description","documentation":{"sections":[{"content":"## Heading 1","format":"Markdown","order":1,"title":""}]},"id":0,"model":{},"name":"Name","views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", WorkspaceUtils.toJson(workspace, false));
     }
 
+    @Test
+    void viewsWithoutOrderProperties() throws Exception {
+        File file = new File(PATH_TO_WORKSPACE_FILES, "views-without-order.json");
+        Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(file);
+
+        assertEquals(2, workspace.getViews().getSystemLandscapeViews().size());
+    }
+
 }

structurizr-client/src/integrationTest/resources/backwardsCompatibility/views-without-order.json

@@ -0,0 +1,27 @@
+{
+  "description" : "Description",
+  "id" : 0,
+  "model" : {
+    "people" : [ {
+      "id" : "1",
+      "name" : "User",
+      "tags" : "Element,Person"
+    } ]
+  },
+  "name" : "Name",
+  "views" : {
+    "systemLandscapeViews" : [ {
+      "elements" : [ {
+        "id" : "1"
+      } ],
+      "enterpriseBoundaryVisible" : true,
+      "key" : "SystemLandscape-001"
+    }, {
+      "elements" : [ {
+        "id" : "1"
+      } ],
+      "enterpriseBoundaryVisible" : true,
+      "key" : "SystemLandscape-002"
+    } ]
+  }
+}

structurizr-core/src/main/java/com/structurizr/view/View.java

@@ -162,7 +162,12 @@ void setProperties(Map<String, String> properties) {
 
     @Override
     public int compareTo(View view) {
-        return getOrder() - view.getOrder();
+        int result = getOrder() - view.getOrder();
+        if (result == 0) {
+            result = getKey().compareToIgnoreCase(view.getKey());
+        }
+
+        return result;
     }
 
 }