Wraps up version information.

structurizr · Dec 2, 2024 · 1a9018c · 1a9018c
1 parent 66e2f25
commit 1a9018c
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 35 deletions.
diff --git a/src/main/java/com/structurizr/cli/VersionCommand.java b/src/main/java/com/structurizr/cli/VersionCommand.java
@@ -1,52 +1,19 @@
 package com.structurizr.cli;
 
 import com.structurizr.Workspace;
-import com.structurizr.dsl.StructurizrDslParser;
-import com.structurizr.export.plantuml.StructurizrPlantUMLExporter;
-import com.structurizr.importer.documentation.DefaultDocumentationImporter;
+import com.structurizr.cli.util.Version;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Properties;
-
 class VersionCommand extends AbstractCommand {
 
     private static final Log log = LogFactory.getLog(VersionCommand.class);
 
     VersionCommand() {
     }
 
-    private static final String BUILD_VERSION_KEY = "build.number";
-    private static final String BUILD_TIMESTAMP_KEY = "build.timestamp";
-    private static final String GIT_COMMIT_KEY = "git.commit";
-
-    private static final String ISO_DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
-
     public void run(String... args) throws Exception {
-        String version = "";
-        String buildTimestamp = "";
-        String gitCommit = "";
-
-        try {
-            Properties buildProperties = new Properties();
-            InputStream in = VersionCommand.class.getClassLoader().getResourceAsStream("build.properties");
-            DateFormat format = new SimpleDateFormat(ISO_DATE_TIME_FORMAT);
-            if (in != null) {
-                buildProperties.load(in);
-                version = buildProperties.getProperty(BUILD_VERSION_KEY);
-                buildTimestamp = buildProperties.getProperty(BUILD_TIMESTAMP_KEY);
-                gitCommit = buildProperties.getProperty(GIT_COMMIT_KEY);
-                in.close();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        log.info("structurizr-cli: " + version);
+        log.info("structurizr-cli: " + new Version().getBuildNumber());
 
         try {
             log.info("structurizr-java: " + Class.forName(Workspace.class.getCanonicalName()).getPackage().getImplementationVersion());

diff --git a/src/main/java/com/structurizr/cli/util/DateUtils.java b/src/main/java/com/structurizr/cli/util/DateUtils.java
@@ -0,0 +1,43 @@
+package com.structurizr.cli.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * Utilities for calculating various points in time.
+ */
+public class DateUtils {
+
+    public static final String UTC_TIME_ZONE = "UTC";
+    public static final String ISO_DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+
+    public static Calendar getCalendar() {
+        return Calendar.getInstance(TimeZone.getTimeZone(UTC_TIME_ZONE));
+    }
+
+    public static Date getNow() {
+        return getCalendar().getTime();
+    }
+
+    public static Date removeMilliseconds(Date date) {
+        Calendar cal = getCalendar();
+        cal.setTime(date);
+        cal.set(Calendar.MILLISECOND, 0);
+
+        return cal.getTime();
+    }
+
+    public static String formatIsoDate(Date d) {
+        if (d != null) {
+            SimpleDateFormat sdf = new SimpleDateFormat(ISO_DATE_TIME_FORMAT);
+            sdf.setTimeZone(TimeZone.getTimeZone(UTC_TIME_ZONE));
+
+            return sdf.format(d);
+        } else {
+            return "";
+        }
+    }
+
+}
diff --git a/src/main/java/com/structurizr/cli/util/Version.java b/src/main/java/com/structurizr/cli/util/Version.java
@@ -0,0 +1,48 @@
+package com.structurizr.cli.util;
+
+import java.io.InputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+
+public class Version {
+
+    private static final String BUILD_VERSION_KEY = "build.number";
+    private static final String BUILD_TIMESTAMP_KEY = "build.timestamp";
+    private static final String GIT_COMMIT_KEY = "git.commit";
+
+    private static String version = "";
+    private static Date buildTimestamp = new Date();
+    private static String gitCommit;
+
+    static {
+        try {
+            Properties buildProperties = new Properties();
+            InputStream in = Version.class.getClassLoader().getResourceAsStream("build.properties");
+            DateFormat format = new SimpleDateFormat(DateUtils.ISO_DATE_TIME_FORMAT);
+            if (in != null) {
+                buildProperties.load(in);
+                version = buildProperties.getProperty(BUILD_VERSION_KEY);
+                buildTimestamp = format.parse(buildProperties.getProperty(BUILD_TIMESTAMP_KEY));
+                gitCommit = buildProperties.getProperty(GIT_COMMIT_KEY);
+                in.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String getBuildNumber() {
+        return version;
+    }
+
+    public Date getBuildTimestamp() {
+        return buildTimestamp;
+    }
+
+    public String getGitCommit() {
+        return gitCommit;
+    }
+
+}