Adds support for element icons being specified as filenames (rather than full URLs) in themes.

Author: simonbrowndotje

structurizr-client/src/com/structurizr/view/ThemeUtils.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.structurizr.Workspace;
 import com.structurizr.io.WorkspaceWriterException;
+import com.structurizr.util.StringUtils;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
@@ -79,6 +80,21 @@ public static void loadThemes(Workspace workspace) throws Exception {
                 objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
                 Theme theme = objectMapper.readValue(json, Theme.class);
+                String baseUrl = url.substring(0, url.lastIndexOf('/') + 1);
+
+                for (ElementStyle elementStyle : theme.getElements()) {
+                    String icon = elementStyle.getIcon();
+                    if (!StringUtils.isNullOrEmpty(icon)) {
+                        if (icon.startsWith("http")) {
+                            // okay, image served over HTTP
+                        } else if (icon.startsWith("data:image")) {
+                            // also okay, data URI
+                        } else {
+                            // convert the relative icon filename into a full URL
+                            elementStyle.setIcon(baseUrl + icon);
+                        }
+                    }
+                }
 
                 workspace.getViews().getConfiguration().getStyles().addStylesFromTheme(theme);
             }

structurizr-client/test/unit/com/structurizr/view/ThemeUtilsTests.java

@@ -39,7 +39,7 @@ void loadThemes_LoadsThemesWhenThemesAreDefined() throws Exception {
         assertNotNull(style);
         assertEquals("#d6242d", style.getStroke());
         assertEquals("#d6242d", style.getColor());
-        assertNotNull(style.getIcon());
+        assertEquals("https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Alexa-For-Business_light-bg@4x.png", style.getIcon());
     }
 
     @Test
@@ -129,4 +129,24 @@ void findRelationshipStyle_WithThemes() {
         assertEquals(Integer.valueOf(100), style.getOpacity());
     }
 
+    @Test
+    void loadThemes_ReplacesRelativeIconReferences() throws Exception {
+        Workspace workspace = new Workspace("Name", "Description");
+        SoftwareSystem softwareSystem = workspace.getModel().addSoftwareSystem("Name");
+        softwareSystem.addTags("Amazon Web Services - Alexa For Business");
+        workspace.getViews().getConfiguration().setThemes("https://raw.githubusercontent.com/structurizr/themes/master/amazon-web-services-2020.04.30/theme.json");
+
+        ThemeUtils.loadThemes(workspace);
+
+        // there should still be zero styles in the workspace
+        assertEquals(0, workspace.getViews().getConfiguration().getStyles().getElements().size());
+
+        // but we should be able to find a style included in the theme
+        ElementStyle style = workspace.getViews().getConfiguration().getStyles().findElementStyle(softwareSystem);
+        assertNotNull(style);
+        assertEquals("#d6242d", style.getStroke());
+        assertEquals("#d6242d", style.getColor());
+        assertEquals("https://raw.githubusercontent.com/structurizr/themes/master/amazon-web-services-2020.04.30/Alexa-For-Business_light-bg@4x.png", style.getIcon());
+    }
+
 }