Allows filenames to be used to specify element style icons (this is really for themes, where the images can be loaded relative to the theme definition).

Author: simonbrowndotje

structurizr-core/src/com/structurizr/util/ImageUtils.java

@@ -69,25 +69,30 @@ public static String getImageAsDataUri(File file) throws IOException {
         return "data:" + contentType + ";base64," + base64Content;
     }
 
-    public static void validateImage(String url) {
-        if (StringUtils.isNullOrEmpty(url)) {
+    public static void validateImage(String imageDescriptor) {
+        if (StringUtils.isNullOrEmpty(imageDescriptor)) {
             return;
         }
 
-        url = url.trim();
+        imageDescriptor = imageDescriptor.trim();
 
-        if (Url.isUrl(url)) {
+        if (Url.isUrl(imageDescriptor)) {
             // all good
             return;
         }
 
-        if (url.startsWith("data:image")) {
-            if (ImageUtils.isSupportedDataUri(url)) {
-                // all good
+        if (imageDescriptor.toLowerCase().endsWith(".png") || imageDescriptor.toLowerCase().endsWith(".jpg") || imageDescriptor.toLowerCase().endsWith(".jpeg") || imageDescriptor.toLowerCase().endsWith(".gif")) {
+            // it's just a filename
+            return;
+        }
+
+        if (imageDescriptor.startsWith("data:image")) {
+            if (ImageUtils.isSupportedDataUri(imageDescriptor)) {
+                // it's a PNG/JPG data URI
                 return;
             } else {
                 // it's a data URI, but not supported
-                throw new IllegalArgumentException("Only PNG and JPG data URIs are supported: " + url);
+                throw new IllegalArgumentException("Only PNG and JPG data URIs are supported: " + imageDescriptor);
             }
         }
 

structurizr-core/test/unit/com/structurizr/util/ImageUtilsTests.java

@@ -159,6 +159,10 @@ void validateImage() {
         ImageUtils.validateImage("https://structurizr.com/image.png");
         ImageUtils.validateImage("data:image/png;base64,iVBORw0KGg");
         ImageUtils.validateImage("data:image/jpeg;base64,iVBORw0KGg");
+        ImageUtils.validateImage("image.png");
+        ImageUtils.validateImage("image.jpg");
+        ImageUtils.validateImage("image.jpeg");
+        ImageUtils.validateImage("image.gif");
 
         //disallowed
         try {