Skip to content

Commit 125b218

Browse files
simonbrowndotjesimonbrowndotje
committed
Upgrades structurizr-* to 2.1.0.
1 parent f777a11 commit 125b218

File tree

5 files changed

+31
-19
lines changed

5 files changed

+31
-19
lines changed

‎structurizr-onpremises/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ dependencies {
4545

4646
implementation project(':structurizr-onpremises-plugin')
4747

48-
implementation 'com.structurizr:structurizr-dsl:2.0.0'
49-
implementation 'com.structurizr:structurizr-inspection:2.0.0'
50-
implementation 'com.structurizr:structurizr-autolayout:2.0.0'
48+
implementation 'com.structurizr:structurizr-dsl:2.1.0'
49+
implementation 'com.structurizr:structurizr-inspection:2.1.0'
50+
implementation 'com.structurizr:structurizr-autolayout:2.1.0'
5151

5252
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
5353
implementation 'jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0'

‎structurizr-onpremises/src/integrationTest/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentTests.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public void test() throws Exception {
4949
assertEquals(1, workspaceId);
5050

5151
WorkspaceMetaData workspaceMetaData = workspaceComponent.getWorkspaceMetaData(1);
52-
String jsonV1 = String.format("{\"id\":1,\"name\":\"Workspace 0001\",\"description\":\"Description\",\"revision\":1,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"model\":{},\"documentation\":{},\"views\":{\"configuration\":{\"branding\":{},\"styles\":{},\"terminology\":{}}}}", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()));
52+
String jsonV1 = String.format("""
53+
{"configuration":{},"description":"Description","documentation":{},"id":1,"lastModifiedDate":"%s","model":{},"name":"Workspace 0001","revision":1,"views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()));
5354
assertEquals(jsonV1, workspaceComponent.getWorkspace(1, ""));
5455

5556
Collection<WorkspaceMetaData> workspaces = workspaceComponent.getWorkspaces();
@@ -69,7 +70,8 @@ public void test() throws Exception {
6970
workspaceComponent.putWorkspace(1, json);
7071

7172
workspaceMetaData = workspaceComponent.getWorkspaceMetaData(1);
72-
String jsonV2 = String.format("{\"id\":1,\"name\":\"Financial Risk System\",\"description\":\"...\",\"revision\":2,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"model\":{},\"documentation\":{},\"views\":{\"configuration\":{\"branding\":{},\"styles\":{},\"terminology\":{}}}}", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()));
73+
String jsonV2 = String.format("""
74+
{"configuration":{},"description":"...","documentation":{},"id":1,"lastModifiedDate":"%s","model":{},"name":"Financial Risk System","revision":2,"views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()));
7375
assertEquals(jsonV2, workspaceComponent.getWorkspace(1, ""));
7476

7577
workspaceVersions = workspaceComponent.getWorkspaceVersions(1, 10);

‎structurizr-onpremises/src/test/java/com/structurizr/onpremises/component/workspace/WorkspaceComponentImplTests.java

+21-11
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ public void putWorkspace(WorkspaceMetaData workspaceMetaData, String json) {
184184
long workspaceId = workspaceComponent.createWorkspace(null);
185185

186186
assertEquals(1, workspaceId);
187-
assertEquals(String.format("{\"id\":1,\"name\":\"Workspace 0001\",\"description\":\"Description\",\"revision\":1,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"model\":{},\"documentation\":{},\"views\":{\"configuration\":{\"branding\":{},\"styles\":{},\"terminology\":{}}}}", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate())), jsonBuffer.toString());
187+
assertEquals(String.format("""
188+
{"configuration":{},"description":"Description","documentation":{},"id":1,"lastModifiedDate":"%s","model":{},"name":"Workspace 0001","revision":1,"views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate())), jsonBuffer.toString());
188189
}
189190

190191
@Test
@@ -263,7 +264,8 @@ public String getWorkspace(long workspaceId, String version) {
263264

264265
WorkspaceComponent workspaceComponent = new WorkspaceComponentImpl(dao, "password");
265266
String json = workspaceComponent.getWorkspace(1, "");
266-
assertEquals("{\"id\":1,\"name\":\"Name\",\"description\":\"Description\",\"configuration\":{},\"model\":{},\"documentation\":{},\"views\":{\"configuration\":{\"branding\":{},\"styles\":{},\"terminology\":{}}}}", json);
267+
assertEquals("""
268+
{"configuration":{},"description":"Description","documentation":{},"id":1,"model":{},"name":"Name","views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", json);
267269
}
268270

269271
@Test
@@ -312,15 +314,18 @@ public void putWorkspace(WorkspaceMetaData workspaceMetaData, String json) {
312314
}
313315
};
314316

317+
String expectedJson = """
318+
{"configuration":{},"description":"Description","documentation":{},"id":1,"lastModifiedDate":"%s","model":{},"name":"Name","revision":%s,"views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""";
319+
315320
WorkspaceComponent workspaceComponent = new WorkspaceComponentImpl(dao, "");
316321
workspaceComponent.putWorkspace(1, json);
317-
assertEquals(String.format("{\"id\":1,\"name\":\"Name\",\"description\":\"Description\",\"revision\":1,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"model\":{},\"documentation\":{},\"views\":{\"configuration\":{\"branding\":{},\"styles\":{},\"terminology\":{}}}}", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate())), jsonBuffer.toString());
322+
assertEquals(String.format(expectedJson, DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()), "1"), jsonBuffer.toString());
318323

319324
// and again, to increment the revision
320325
json = jsonBuffer.toString();
321326
jsonBuffer.setLength(0);
322327
workspaceComponent.putWorkspace(1, json);
323-
assertEquals(String.format("{\"id\":1,\"name\":\"Name\",\"description\":\"Description\",\"revision\":2,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"model\":{},\"documentation\":{},\"views\":{\"configuration\":{\"branding\":{},\"styles\":{},\"terminology\":{}}}}", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate())), jsonBuffer.toString());
328+
assertEquals(String.format(expectedJson, DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()), "2"), jsonBuffer.toString());
324329
}
325330

326331
@Test
@@ -344,14 +349,17 @@ public void putWorkspace(WorkspaceMetaData workspaceMetaData, String json) {
344349

345350
WorkspaceComponent workspaceComponent = new WorkspaceComponentImpl(dao, "password");
346351
workspaceComponent.putWorkspace(1, json);
347-
assertTrue(jsonBuffer.toString().startsWith(String.format("{\"id\":1,\"name\":\"Name\",\"description\":\"Description\",\"revision\":1,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"ciphertext\"", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()))));
352+
String pattern = """
353+
"id":1,"lastModifiedDate":"%s","name":"Name","revision":%s}""";
354+
assertTrue(jsonBuffer.toString().startsWith("{\"ciphertext\":\""));
355+
assertTrue(jsonBuffer.toString().endsWith(String.format(pattern, DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()), "1")));
348356

349357
// and again, to increment the revision
350358
json = jsonBuffer.toString();
351359
jsonBuffer.setLength(0);
352360
workspaceComponent.putWorkspace(1, json);
353-
System.out.println(jsonBuffer);
354-
assertTrue(jsonBuffer.toString().startsWith(String.format("{\"id\":1,\"name\":\"Name\",\"description\":\"Description\",\"revision\":2,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"ciphertext\"", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()))));
361+
assertTrue(jsonBuffer.toString().startsWith("{\"ciphertext\":\""));
362+
assertTrue(jsonBuffer.toString().endsWith(String.format(pattern, DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()), "2")));
355363
}
356364

357365
@Test
@@ -380,15 +388,17 @@ public void putWorkspace(WorkspaceMetaData workspaceMetaData, String json) {
380388

381389
WorkspaceComponent workspaceComponent = new WorkspaceComponentImpl(dao, "");
382390
workspaceComponent.putWorkspace(1, json);
383-
assertTrue(jsonBuffer.toString().startsWith(String.format("{\"id\":1,\"name\":\"Name\",\"description\":\"Description\",\"revision\":1,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"ciphertext\"", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()))));
384-
assertTrue(jsonBuffer.toString().endsWith((json.substring(json.indexOf("ciphertext")))));
391+
String pattern = """
392+
"id":1,"lastModifiedDate":"%s","name":"Name","revision":%s}""";
393+
assertTrue(jsonBuffer.toString().startsWith("{\"ciphertext\":\""));
394+
assertTrue(jsonBuffer.toString().endsWith(String.format(pattern, DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()), "1")));
385395

386396
// and again, to increment the revision
387397
json = jsonBuffer.toString();
388398
jsonBuffer.setLength(0);
389399
workspaceComponent.putWorkspace(1, json);
390-
assertTrue(jsonBuffer.toString().startsWith(String.format("{\"id\":1,\"name\":\"Name\",\"description\":\"Description\",\"revision\":2,\"lastModifiedDate\":\"%s\",\"configuration\":{},\"ciphertext\"", DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()))));
391-
assertTrue(jsonBuffer.toString().endsWith((json.substring(json.indexOf("ciphertext")))));
400+
assertTrue(jsonBuffer.toString().startsWith("{\"ciphertext\":\""));
401+
assertTrue(jsonBuffer.toString().endsWith(String.format(pattern, DateUtils.formatIsoDate(workspaceMetaData.getLastModifiedDate()), "2")));
392402
}
393403

394404
@Test

‎structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/api/ApiControllerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public WorkspaceMetaData getWorkspaceMetaData(long workspaceId) {
219219
Workspace workspace = new Workspace("Name", "Description");
220220
String json = WorkspaceUtils.toJson(workspace, false);
221221

222-
request.addHeader(HttpHeaders.AUTHORIZATION, "key:ZDc3MTcxNGJjYmZhNjM4NmE4ODk0MmQ5OGQ1MmIwYzUyMjk3ODVmMDZiNjI1YWFiZTdlMjZmZmYyNmFmN2QzNw==");
222+
request.addHeader(HttpHeaders.AUTHORIZATION, "key:YjUxOTBkNjg5NjI5MjRiMzZjNWQwZmEwYjE3ZmI4OWFmNjY4NmY3MjEzZWRkNGE5ZjJmZTFjMDhjZmU0OGNlZg==");
223223
request.addHeader(HttpHeaders.NONCE, "1234567890");
224224
request.addHeader(HttpHeaders.CONTENT_MD5, Base64.getEncoder().encodeToString(new Md5Digest().generate(json).getBytes()));
225225

‎structurizr-onpremises/src/test/java/com/structurizr/onpremises/web/workspace/JsonControllerTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public String getWorkspace(long workspaceId, String version) throws WorkspaceCom
8686
String view = controller.showPublicJson(1, "version", model);
8787
assertEquals("json", view);
8888
assertEquals("""
89-
{"id":0,"name":"Name","description":"Description","configuration":{},"model":{},"documentation":{},"views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", model.getAttribute("json"));
89+
{"configuration":{},"description":"Description","documentation":{},"id":0,"model":{},"name":"Name","views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", model.getAttribute("json"));
9090
}
9191

9292
@Test
@@ -160,7 +160,7 @@ public String getWorkspace(long workspaceId, String version) throws WorkspaceCom
160160
String view = controller.showSharedJson(1, "version", "token", model);
161161
assertEquals("json", view);
162162
assertEquals("""
163-
{"id":0,"name":"Name","description":"Description","configuration":{},"model":{},"documentation":{},"views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", model.getAttribute("json"));
163+
{"configuration":{},"description":"Description","documentation":{},"id":0,"model":{},"name":"Name","views":{"configuration":{"branding":{},"styles":{},"terminology":{}}}}""", model.getAttribute("json"));
164164
}
165165

166166
}

0 commit comments

Comments
 (0)