structurizr-client: Workspace archive file now includes the branch na…

…me in the filename.
structurizr · Sep 20, 2024 · 75d3d13 · 75d3d13
1 parent 6697b08
commit 75d3d13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ subprojects { proj ->
 
     description = 'Structurizr'
     group = 'com.structurizr'
-    version = '3.0.0'
+    version = '3.0.1'
 
     repositories {
         mavenCentral()

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.1 (unreleased)
+
+- structurizr-client: Workspace archive file now includes the branch name in the filename.
+
 ## 3.0.0 (19th September 2024)
 
 - structurizr-client: Adds support to get/put workspace branches on the [cloud service](https://docs.structurizr.com/cloud/workspace-branches) and [on-premises installation](https://docs.structurizr.com/onpremises/workspace-branches).

diff --git a/structurizr-client/src/main/java/com/structurizr/api/WorkspaceApiClient.java b/structurizr-client/src/main/java/com/structurizr/api/WorkspaceApiClient.java
@@ -415,7 +415,7 @@ private void debugArchivedWorkspaceLocation(File archiveFile) {
 
     private String createArchiveFileName(long workspaceId) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-        return "structurizr-" + workspaceId + "-" + sdf.format(new Date()) + ".json";
+        return "structurizr-" + workspaceId + "-" + (StringUtils.isNullOrEmpty(branch) ? "" : (branch + "-")) + sdf.format(new Date()) + ".json";
     }
 
     public void setUser(String user) {